From 6e481a3841cf15e4d1e29b8a642577e36f5509db Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Fri, 13 Jul 2018 14:29:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=8F=E6=AC=A1?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E9=83=BD=E4=BC=9A=E5=A2=9E=E5=8A=A0project.j?=
 =?UTF-8?q?son=E7=9A=84assets=E6=9D=A1=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/caches/build_file_checksums.ser          | Bin 733 -> 733 bytes
 .../autojs/autojs/build/AutoJsApkBuilder.java  |  10 +++++++---
 .../stardust/autojs/project/ProjectConfig.java |  17 +++++++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 5ad99a9c681db5117321269bb19c25a2f942a5b2..398f8f7d493c9f7899554f9b90567160385a11d1 100644
GIT binary patch
delta 98
zcmV-o0G<Ec1>FUZm;{dy7`>64cMu3RB<lIGYT)M2NuNBBdyA7J0hAEkV!1BLQ>o_L
zjPfRp6JofN#{qc|(?GG}j>(=SBE90{q%m=$lTZR45NDaJIHs0(Xvl&C!s|r4GLwD+
EUl#Q*4*&oF

delta 98
zcmV-o0G<Ec1>FUZm;{KtQrVH5cMyS1$t?d4ZQ%ruEe!O*RU?xl0hADGR$^Rwntfn5
zjHH&5+;#|)#{qc|z*m9*T8^o%-Pn(JPkk`7lTZR45M(|1;UfcioIbOn8x{I#^^<-A
EUu!rkTL1t6

diff --git a/app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java b/app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java
index 4e2ce061..d541f1f5 100644
--- a/app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java
+++ b/app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java
@@ -1,6 +1,7 @@
 package org.autojs.autojs.autojs.build;
 
 import android.graphics.Bitmap;
+import android.text.TextUtils;
 
 import com.stardust.app.GlobalAppContext;
 import com.stardust.autojs.apkbuilder.ApkBuilder;
@@ -8,6 +9,7 @@ import com.stardust.autojs.apkbuilder.ManifestEditor;
 import com.stardust.autojs.apkbuilder.util.StreamUtils;
 import com.stardust.autojs.project.ProjectConfig;
 import com.stardust.pio.PFiles;
+
 import org.autojs.autojs.App;
 
 import java.io.File;
@@ -156,8 +158,10 @@ public class AutoJsApkBuilder extends ApkBuilder {
         projectConfig.setName(config.appName)
                 .setPackageName(config.packageName)
                 .setVersionCode(config.versionCode)
-                .setVersionName(config.versionName)
-                .setMainScriptFile("main.js");
+                .setVersionName(config.versionName);
+        if (TextUtils.isEmpty(projectConfig.getMainScriptFile())) {
+            projectConfig.setMainScriptFile("main.js");
+        }
         updateProjectConfigAssets(projectConfig, config.jsPath, config.jsPath);
         PFiles.write(ProjectConfig.configFileOfDir(config.jsPath), projectConfig.toJson());
     }
@@ -173,7 +177,7 @@ public class AutoJsApkBuilder extends ApkBuilder {
                 continue;
             }
             String relative = new File(projectDir).toURI().relativize(file.toURI()).getPath();
-            config.getAssets().add(relative);
+            config.addAsset(relative);
         }
     }
 
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 28e06833..c5731e30 100644
--- a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java
+++ b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java
@@ -8,6 +8,7 @@ import com.google.gson.annotations.SerializedName;
 import com.stardust.pio.PFiles;
 import com.stardust.pio.UncheckedIOException;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -80,7 +81,6 @@ public class ProjectConfig {
     }
 
 
-
     public String getName() {
         return mName;
     }
@@ -128,11 +128,24 @@ public class ProjectConfig {
 
     public List<String> getAssets() {
         if (mAssets == null) {
-            mAssets = new ArrayList<>();
+            mAssets = Collections.emptyList();
         }
         return mAssets;
     }
 
+    public boolean addAsset(String assetRelativePath) {
+        if (mAssets == null) {
+            mAssets = new ArrayList<>();
+        }
+        for (String asset : mAssets) {
+            if (new File(asset).equals(new File(assetRelativePath))) {
+                return false;
+            }
+        }
+        mAssets.add(assetRelativePath);
+        return true;
+    }
+
     public void setAssets(List<String> assets) {
         mAssets = assets;
     }

From 31922af8f2dcd2cc5c53f5c27d1a51e03d502605 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Fri, 13 Jul 2018 14:40:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E9=80=80version.json=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=97=A7=E7=89=88=E6=9C=AC=E5=B4=A9=E6=BA=83=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 version.json | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/version.json b/version.json
index 82c6fc7c..16f5d970 100644
--- a/version.json
+++ b/version.json
@@ -1,12 +1,15 @@
 {
-  "versionCode": 404,
-  "versionName": "4.0.1 Beta",
-	"releaseNotes": "* 全新的文档、界面\n* 更丰富的功能\n期待您的体验~",
-	"downloadUrl": "http://i.autojs.org/autojs/release-4.0.1Beta.apk",
+  "versionCode": 163,
+  "versionName": "2.0.16 Beta2",
+  "releaseNotes": "* 优化root录制，录制脚本接近完美，可自行录制游戏脚本\n* 提高部分脚本的运行速度\n* 新增 按键事件、通知事件监听\n*修复 一些问题",
   "downloads" : [
 	{
-	  "name": "酷安",
-	  "url": "https://www.coolapk.com/apk/188448"
+	  "name": "应用宝",
+	  "url": "http://a.app.qq.com/o/simple.jsp?pkgname=org.autojs.autojs"
+	},
+	{
+	  "name": "百度手机助手",
+	  "url": "http://shouji.baidu.com/software/22060055.html"
 	}
   ],
   "oldVersions": [