修复打包BUG

wilinz · Aug 13, 2022 · 2a1e5c0 · 2a1e5c0
1 parent af54fd8
commit 2a1e5c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...autojs/autoxjs/autojs/build/ApkBuilder.kt → ...va/org/autojs/autoxjs/build/ApkBuilder.kt b/...autojs/autoxjs/autojs/build/ApkBuilder.kt → ...va/org/autojs/autoxjs/build/ApkBuilder.kt
@@ -1,4 +1,4 @@
-package org.autojs.autoxjs.autojs.build
+package org.autojs.autoxjs.build
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -19,8 +19,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
-import org.autojs.autoxjs.build.ApkSigner
-import org.autojs.autoxjs.build.DefaultSign
 import org.autojs.autoxjs.tool.copyTo
 import org.autojs.autoxjs.tool.parseUriOrNull
 import org.autojs.autoxjs.tool.unzip
@@ -193,7 +191,7 @@ class ApkBuilder(
             if (form.startsWith(Constant.Protocol.ASSETS)) {
                 val path = form.replace(Constant.Protocol.ASSETS + "/", "")
                 PFiles.copyAssetDir(GlobalAppContext.get().assets, path, to.path, null)
-                return
+                return@forEach
             }
 
             val file = File(form)

diff --git a/app/src/main/java/org/autojs/autoxjs/ui/build/BuildViewModel.kt b/app/src/main/java/org/autojs/autoxjs/ui/build/BuildViewModel.kt
@@ -25,7 +25,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.autojs.autoxjs.Pref
 import org.autojs.autoxjs.R
-import org.autojs.autoxjs.autojs.build.ApkBuilder
+import org.autojs.autoxjs.build.ApkBuilder
 import org.autojs.autoxjs.build.ApkBuilderPluginHelper
 import org.autojs.autoxjs.build.ApkKeyStore
 import org.autojs.autoxjs.build.ApkSigner
@@ -109,7 +109,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
     var isHideLauncher by mutableStateOf(false)
     var isStableMode by mutableStateOf(false)
     var isHideLogs by mutableStateOf(false)
-    var isVolumeUpControl by mutableStateOf(true)
+    var isVolumeUpControl by mutableStateOf(false)
     var displaySplash by mutableStateOf(true)//todo
 
     //--特殊权限
@@ -289,7 +289,7 @@ class BuildViewModel(private val app: Application, private var source: String) :
             assetsList.add(
                 Asset(
                     form = Constant.Protocol.ASSETS + "/" + Constant.Assets.OCR_MODELS,
-                    to = "/"
+                    to = "/${Constant.Assets.OCR_MODELS}"
                 )
             )
         }