tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复每次打包都会增加project.json的assets条目

Browse Source
This commit is contained in:
hyb1996
2018-07-13 14:29:41 +08:00
parent 5251028b0b
commit 6e481a3841
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/autojs/autojs/autojs/build/AutoJsApkBuilder.java
View File

@@ -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);
}
}