From 301a4286e5dc4e7c7d4e577ca143911b1902adc7 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Wed, 26 Sep 2018 23:43:13 +0800 Subject: [PATCH] fix: img.h not working; --- .../java/org/autojs/autojs/ui/common/ScriptOperations.java | 6 +++++- .../com/stardust/autojs/core/ui/widget/JsImageView.java | 2 +- .../java/com/stardust/autojs/project/ProjectConfig.java | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java index cf18a459..5d82198b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java @@ -122,7 +122,11 @@ public class ScriptOperations { } private void notifyFileCreated(ScriptFile directory, ScriptFile scriptFile) { - mExplorer.notifyItemCreated(new ExplorerFileItem(scriptFile, mExplorerPage)); + if (scriptFile.isDirectory()) { + mExplorer.notifyItemCreated(new ExplorerDirPage(scriptFile, mExplorerPage)); + } else { + mExplorer.notifyItemCreated(new ExplorerFileItem(scriptFile, mExplorerPage)); + } } public void newFile() { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java index f37dcedf..a7317b39 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java +++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java @@ -51,7 +51,7 @@ public class JsImageView extends RoundedImageView { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); - setMeasuredDimension(getMeasuredWidth(), getMeasuredWidth()); + setMeasuredDimension(getMeasuredWidth(), getMeasuredHeight()); if (mCircle) { setCornerRadius(getMeasuredWidth() / 2); } diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java index b7d08797..a2ac8061 100644 --- a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java +++ b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java @@ -88,7 +88,6 @@ public class ProjectConfig { try { return fromJson(PFiles.read(context.getAssets().open(path))); } catch (Exception e) { - e.printStackTrace(); return null; } } @@ -97,7 +96,6 @@ public class ProjectConfig { try { return fromJson(PFiles.read(path)); } catch (Exception e) { - e.printStackTrace(); return null; } }