update README.md

Author: wukaicheng

README.md

@@ -2,23 +2,36 @@
 
 > BlackObfuscator GUI 工具
 
-需要打包成jar包，然后将BlackObfuscator下载到本地，然后重命名成dex-tools
-> 可直接在release界面下载解压运行
-> 虽然目前只提供了Windows的Release包
-
-
-1.前往BlackObfuscator Release界面下载最新的工具
- > https://github.com/CodingGay/BlackObfuscator/releases
-
-2.解压，并重命名为dex-tools
-
-3.使用Gradle-compose desktop - packageUberJarForCurrentOS 任务生成本地jar包
-
-4.移动dex-tools到jar同一目录
-
+#### 环境说明
+1. JDK11或以上
+2. 前往BlackObfuscator的Release界面下载打包好的工具
+3. 解压到jar同级目录，并重命名为dex-tools
 >dex-tools
 > > lib
 >
 > > bin
 >
 > BlackObfuscator.jar
+
+
+#### 运行说明
+1. 可直接双击clickme.bat(Windows)或者clickme.sh(Macos/Linux)
+2. 可对照BlackObfuscator的参数说明
+
+#### 参数说明
+1. Input 要混淆的apk或者dex的路径，可点击右侧图标跳转选择
+2. Output 输出保存的apk或者dex的路径，可点击右侧图标跳转选择
+3. Depth 混淆深度
+4. Rules 要混淆的包名，可换行输入多行
+
+#### 运行效果
+
+
+
+![](images/image1.png)
+
+![](images/image2.png)
+
+
+
+![](images/image3.png)

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

@@ -24,6 +24,7 @@ import cn.kaicity.common.bean.InputBean
 import cn.kaicity.common.platform.chooseFile
 import cn.kaicity.common.platform.saveFile
 
+
 /**
  * 首页
  *
@@ -52,7 +53,7 @@ fun MainView(modifier: Modifier, btnClick: (InputBean) -> Unit) {
             trailingIcon = {
                 Icon(Icons.Default.Search, "Menu", modifier = Modifier.clickable {
                     chooseFile {
-                        if(it.isNotEmpty()){
+                        if (it.isNotEmpty()) {
                             input = it
                         }
                     }
@@ -74,7 +75,7 @@ fun MainView(modifier: Modifier, btnClick: (InputBean) -> Unit) {
             }, trailingIcon = {
                 Icon(Icons.Default.Search, "Menu", modifier = Modifier.clickable {
                     saveFile {
-                        if(it.isNotEmpty()){
+                        if (it.isNotEmpty()) {
                             output = it
                         }
                     }
@@ -119,7 +120,7 @@ fun MainView(modifier: Modifier, btnClick: (InputBean) -> Unit) {
         }
 
         Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
-            Button(modifier = Modifier.padding(12.dp), onClick = {
+            Button(modifier = Modifier.padding(12.dp),  onClick = {
                 inputIsError = input.isEmpty()
                 outputIsError = output.isEmpty()
                 depthIsError = depth.isEmpty()

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

@@ -1,6 +1,5 @@
 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
@@ -19,14 +18,9 @@ import cn.kaicity.common.widget.MainView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import kotlin.math.log
 
-@Preview
-@Composable
-fun AppPreview() {
-    AppMain()
-}
 
+var enableObfuscator = true
 
 @Composable
 fun AppMain() {
@@ -39,6 +33,12 @@ fun AppMain() {
 
     Row(modifier = Modifier.fillMaxWidth().background(Color.White)) {
         MainView(modifier = Modifier.weight(0.5F)) {
+
+            if (!enableObfuscator) {
+                log += "\nThere are tasks running"
+                return@MainView
+            }
+
             if (it.input.endsWith(".dex")) {
                 log = "Start Obfuscator Dex"
                 obfDex(it, logCallback)
@@ -58,18 +58,28 @@ fun AppMain() {
 private fun obfDex(inputBean: InputBean, logCallback: (log: String) -> Unit) {
     GlobalScope.launch(Dispatchers.IO) {
         try {
-
+            enableObfuscator = false
             DexObf.run(inputBean, logCallback)
         } catch (e: Throwable) {
             e.printStackTrace()
             logCallback.invoke("Obfuscator Dex Fail")
             logCallback.invoke(e.message ?: "")
+        } finally {
+            enableObfuscator = true
         }
     }
 }
 
 private fun obfApk(inputBean: InputBean, logCallback: (log: String) -> Unit) {
     GlobalScope.launch(Dispatchers.IO) {
-        ApkObf.run(inputBean, logCallback)
+        try {
+            enableObfuscator = false
+            ApkObf.run(inputBean, logCallback)
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        } finally {
+            enableObfuscator = true
+
+        }
     }
 }

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

@@ -17,7 +17,6 @@ actual class IObfuscator actual constructor(private var flow: FlowCollector<Stri
 
         val rawPath = "dex-tools/black-obfuscator"
         val absolutePath = File(rawPath).absolutePath
-        println(absolutePath)
 
         val shell = if (os.contains("windows")) {
             "$absolutePath.bat d2j-black-obfuscator $param \n"