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

兼容内置打包方式

Browse Source
This commit is contained in:
Ai
2023-10-08 20:19:06 +08:00
committed by SuperMonster003
parent 8eb29d9624
commit 225cd59ea3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
View File

@@ -79,6 +79,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
private boolean mIsDefaultIcon = true; private boolean mIsDefaultIcon = true;
private boolean mIsApkTemplateInAssets = false; private boolean mIsApkTemplateInAssets = false;
@SuppressLint("SetTextI18n")
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -89,7 +90,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
mSourcePath = binding.sourcePath; mSourcePath = binding.sourcePath;
mSourcePathContainer = binding.sourcePathContainer; mSourcePathContainer = binding.sourcePathContainer;
mTemplatePathContainer = binding.templatePathContainer; mTemplatePathContainer = binding.templatePathContainer;
mTemplatePath=binding.templatePath; mTemplatePath = binding.templatePath;
mOutputPath = binding.outputPath; mOutputPath = binding.outputPath;
mAppName = binding.appName; mAppName = binding.appName;
mPackageName = binding.packageName; mPackageName = binding.packageName;
@@ -112,8 +113,8 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
setupWithSourceFile(new ScriptFile(mSource)); setupWithSourceFile(new ScriptFile(mSource));
} }
mIsApkTemplateInAssets = checkApkTemplateInAssets(); mIsApkTemplateInAssets = checkApkTemplateInAssets();
if (!mIsApkTemplateInAssets) { if (mIsApkTemplateInAssets) {
checkApkBuilderPlugin(); mTemplatePath.setText("file:///android_asset/template.apk");
} }
} }
@@ -239,8 +240,9 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
} }
void buildApk() { void buildApk() {
if (!mIsApkTemplateInAssets && !ApkBuilderPluginHelper.isPluginAvailable(this)) { if (mTemplatePath.getText() == null && !ApkBuilderPluginHelper.isPluginAvailable(this)) {
ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable); ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable);
showPluginDownloadDialog();
return; return;
} }
if (!checkInputs()) { if (!checkInputs()) {
@@ -317,9 +319,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
} }
private ApkBuilder callApkBuilder(File tmpDir, File outApk, ApkBuilder.AppConfig appConfig) throws Exception { private ApkBuilder callApkBuilder(File tmpDir, File outApk, ApkBuilder.AppConfig appConfig) throws Exception {
InputStream templateApk = mIsApkTemplateInAssets InputStream templateApk = mTemplatePath.getText() != null ? (mTemplatePath.getText().toString().equals("file:///android_asset/template.apk") ? getAssets().open("template.apk") : new java.io.FileInputStream(mTemplatePath.getText().toString())) : ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
? getAssets().open(TEMPLATE_APK_PATH)
: ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
return new ApkBuilder(templateApk, outApk, tmpDir.getPath()) return new ApkBuilder(templateApk, outApk, tmpDir.getPath())
.setProgressCallback(BuildActivity.this) .setProgressCallback(BuildActivity.this)
.prepare() .prepare()