1.show error log message(full StackTrace print in console)

2.fix bug

Author: wukaicheng

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

@@ -8,14 +8,14 @@ object ApkObf {
 
     suspend fun run(inputBean: InputBean, logCallback: (log: String) -> Unit) {
         val workDir = File(File(inputBean.output).parentFile, "temp")
+        val targetApk = File(inputBean.output)
         try {
             val originApk = File(inputBean.input)
             if (!originApk.exists()) {
                 logCallback.invoke("Apk not Exists")
                 return
             }
 
-            val targetApk = File(inputBean.output)
             if (targetApk.exists()) {
                 targetApk.delete()
             }
@@ -38,9 +38,13 @@ object ApkObf {
 
             zip(workDir.absolutePath, originApk, targetApk)
 
+            logCallback.invoke("Please Sign APK!!!")
+
         } catch (e: Exception) {
+            e.printStackTrace()
             logCallback.invoke("Error!!!")
             logCallback.invoke(e.message.toString())
+            targetApk.delete()
         } finally {
             removeFile(workDir)
         }

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

@@ -35,8 +35,6 @@ object DexObf {
         flow {
             obfuscatorImpl = IObfuscator(this)
             obfuscatorImpl?.doObfuscator(params.toTypedArray())
-        }.catch {
-            logCallback.invoke("Error")
         }.onCompletion {
             filterFile.delete()
             logCallback.invoke("Finish")

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

@@ -52,7 +52,9 @@ fun MainView(modifier: Modifier, btnClick: (InputBean) -> Unit) {
             trailingIcon = {
                 Icon(Icons.Default.Search, "Menu", modifier = Modifier.clickable {
                     chooseFile {
-                        input = it
+                        if(it.isNotEmpty()){
+                            input = it
+                        }
                     }
                 })
             },
@@ -72,7 +74,9 @@ fun MainView(modifier: Modifier, btnClick: (InputBean) -> Unit) {
             }, trailingIcon = {
                 Icon(Icons.Default.Search, "Menu", modifier = Modifier.clickable {
                     saveFile {
-                        output = it
+                        if(it.isNotEmpty()){
+                            output = it
+                        }
                     }
                 })
             },

common/src/desktopMain/kotlin/cn/kaicity/common/DesktopApp.kt

@@ -1,6 +1,7 @@
 package cn.kaicity.common
 
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
@@ -9,6 +10,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import cn.kaicity.common.bean.InputBean
 import cn.kaicity.common.repository.ApkObf
 import cn.kaicity.common.repository.DexObf
@@ -35,7 +37,7 @@ fun AppMain() {
         log = "$log\n$it"
     }
 
-    Row(modifier = Modifier.fillMaxWidth()) {
+    Row(modifier = Modifier.fillMaxWidth().background(Color.White)) {
         MainView(modifier = Modifier.weight(0.5F)) {
             if (it.input.endsWith(".dex")) {
                 log = "Start Obfuscator Dex"
@@ -54,14 +56,20 @@ fun AppMain() {
 
 
 private fun obfDex(inputBean: InputBean, logCallback: (log: String) -> Unit) {
-    GlobalScope.launch(Dispatchers.IO){
-        DexObf.run(inputBean,logCallback)
+    GlobalScope.launch(Dispatchers.IO) {
+        try {
+
+            DexObf.run(inputBean, logCallback)
+        } catch (e: Throwable) {
+            e.printStackTrace()
+            logCallback.invoke("Obfuscator Dex Fail")
+            logCallback.invoke(e.message ?: "")
+        }
     }
 }
 
 private fun obfApk(inputBean: InputBean, logCallback: (log: String) -> Unit) {
-    GlobalScope.launch(Dispatchers.IO){
-        ApkObf.run(inputBean,logCallback)
-        logCallback.invoke("Please Sign APK!!!")
+    GlobalScope.launch(Dispatchers.IO) {
+        ApkObf.run(inputBean, logCallback)
     }
 }

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

@@ -2,8 +2,10 @@ package cn.kaicity.common.platform
 
 import kotlinx.coroutines.flow.FlowCollector
 import java.io.BufferedReader
+import java.io.File
 import java.io.InputStreamReader
 import java.nio.charset.Charset
+import java.util.concurrent.TimeUnit
 
 
 actual class IObfuscator actual constructor(private var flow: FlowCollector<String>) {
@@ -14,11 +16,13 @@ actual class IObfuscator actual constructor(private var flow: FlowCollector<Stri
         val param = args.joinToString(" ")
 
         val rawPath = "./dex-tools/black-obfuscator"
+        val absolutePath = File(rawPath).absolutePath
+        println(absolutePath)
 
         val shell = if (os.contains("windows")) {
-            "$rawPath.bat d2j-black-obfuscator $param \n"
+            "$absolutePath.bat d2j-black-obfuscator $param \n"
         } else {
-            "$rawPath.sh d2j-black-obfuscator $param \n"
+            "$absolutePath.sh d2j-black-obfuscator $param \n"
         }
 
         val process = Runtime.getRuntime().exec(shell)