fix(app): BuildActivity crash when package.json is illegal

xuhaoyang · May 29, 2018 · aa770b2 · aa770b2
1 parent 0ffb8d1
commit aa770b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java
@@ -55,7 +55,7 @@ public static ProjectConfig fromJson(String json) {
     public static ProjectConfig fromAssets(Context context, String path) {
         try {
             return fromJson(PFiles.read(context.getAssets().open(path)));
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -64,7 +64,7 @@ public static ProjectConfig fromAssets(Context context, String path) {
     public static ProjectConfig fromFile(String path) {
         try {
             return fromJson(PFiles.read(path));
-        } catch (UncheckedIOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }

diff --git a/common/release/output.json b/common/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":263},"path":"commonRelease-4.0.0 Alpha.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":401},"path":"commonRelease-4.0.0 Alpha1.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":263},"path":"commonRelease-4.0.0 Alpha.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":401},"path":"commonRelease-4.0.0 Alpha1.apk","properties":{"packageId":"org.autojs.autojs","split":"","minSdkVersion":"17"}}]