fix bug

Author: wukaicheng

common/src/commonMain/kotlin/cn/kaicity/common/repository/ApkObf.kt

@@ -27,23 +27,16 @@ object ApkObf {
             val dexList = workDir.listFiles { name ->
                 name.extension == "dex"
             }
-
-            val dexOut = File(workDir,"dexDump")
-            dexOut.mkdir()
-
             dexList?.forEach {
                 logCallback.invoke("Start Obfuscator ${it.name}")
                 val dexInputBean =
-                    InputBean(it.absolutePath, dexOut.absolutePath+"/" + it.name, inputBean.depth, inputBean.rule)
+                    InputBean(it.absolutePath, workDir.absolutePath + "/" + it.name, inputBean.depth, inputBean.rule)
                 DexObf.run(dexInputBean, logCallback)
             }
 
-
-            originApk.copyTo(File(inputBean.output))
-
             logCallback.invoke("Start Package Apk")
 
-            zip(dexOut.absolutePath, inputBean.output)
+            zip(workDir.absolutePath, originApk, targetApk)
 
         } catch (e: Exception) {
             logCallback.invoke("Error!!!")
@@ -63,26 +56,23 @@ object ApkObf {
         }
     }
 
-    //todo
-    private fun zip(path: String, apk: String) {
+    private fun zip(path: String, origin: File, targetApk: File) {
         val dexList = File(path).listFiles { name ->
             name.extension == "dex"
         }?.toList()
 
-        ZipFile(apk).use {
+        origin.copyTo(targetApk)
+        ZipFile(targetApk).use {
             it.addFiles(dexList)
         }
 
     }
 
-    //todo
+
     private fun unzip(apk: String, path: String) {
         ZipFile(apk).use {
             it.extractAll(path)
         }
-
     }
 
-
-
 }

common/src/commonMain/kotlin/cn/kaicity/common/widget/MainView.kt

@@ -121,9 +121,11 @@ fun MainView(modifier: Modifier, btnClick: (InputBean) -> Unit) {
                 depthIsError = depth.isEmpty()
                 //pkgIsError do not need check
 
+
                 if (inputIsError || outputIsError || depthIsError) {
                     return@Button
                 }
+
                 btnClick.invoke(InputBean(input, output, depth, rule))
             }) {
                 Text("Obfuscator")

common/src/desktopMain/kotlin/cn/kaicity/common/platform/IFileHelper.kt

@@ -22,4 +22,3 @@ actual fun saveFile(callback:(String)->Unit) {
     }
     return callback(fileDialog.directory + fileDialog.file)
 }
-

desktop/build.gradle.kts

@@ -32,10 +32,8 @@ compose.desktop {
         mainClass = "MainKt"
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "jvm"
+            packageName = "BlackObfuscator"
             packageVersion = "1.0.0"
-
-            appResourcesRootDir.set(project.layout.projectDirectory.dir("lib"))
         }
     }
 }

settings.gradle.kts

@@ -6,12 +6,11 @@ pluginManagement {
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
-    
+
 }
 rootProject.name = "BlackObfuscator-GUI"
 
 
 include(":android")
 include(":desktop")
 include(":common")
-