代码优化

Author: teble

app/src/main/cpp/DexKit

@@ -144,10 +144,10 @@ class MainActivity : ComponentActivity() {
         }
 
         fun peekUserService(): Boolean {
-            runCatching {
+            try {
                 return Shizuku.peekUserService(userServiceArgs, userServiceConnection)
-            }.onFailure {
-                Log.e("XALog", it.stackTraceToString())
+            } catch (e: Throwable) {
+                Log.e("XALog", e.stackTraceToString())
             }
             return false
         }

app/src/main/java/me/teble/xposed/autodaily/activity/common/MainActivity.kt

@@ -98,7 +98,11 @@ class MainHook : IXposedHookLoadPackage, IXposedHookZygoteInit {
                         ProxyManager.init
                         asyncHook()
                     }
-                }.onFailure { Log.e("XALog", it.stackTraceToString()) }
+                }.onFailure {
+                    moduleLoadInit = true
+                    ToastUtil.send(it.stackTraceToString(), true)
+                    Log.e("XALog", it.stackTraceToString())
+                }
             }
             // TODO 分进程处理
             if (loadPackageParam.processName == loadPackageParam.packageName) {
@@ -170,7 +174,7 @@ class MainHook : IXposedHookLoadPackage, IXposedHookZygoteInit {
             //初始化hook
             LogUtil.d("initHook")
             initHook()
-            moduleLoadSuccess = true
+            moduleLoadInit = true
             TaskExecutor.startCorn()
         }
     }
@@ -184,7 +188,7 @@ class MainHook : IXposedHookLoadPackage, IXposedHookZygoteInit {
                 }
                 hookIsInit = true
                 // 等待hook执行完毕
-                while (!moduleLoadSuccess) {
+                while (!moduleLoadInit) {
                     Thread.sleep(100)
                 }
             }.onFailure {

app/src/main/java/me/teble/xposed/autodaily/hook/MainHook.kt

@@ -8,4 +8,4 @@ lateinit var modulePath: String
 lateinit var moduleRes: XModuleResources
 
 val moduleClassLoader: ClassLoader = MainHook::class.java.classLoader!!
-var moduleLoadSuccess = false
+var moduleLoadInit = false

app/src/main/java/me/teble/xposed/autodaily/hook/base/ModuleInfo.kt

@@ -6,7 +6,7 @@ import android.os.Message
 import android.os.PowerManager
 import cn.hutool.core.thread.ThreadUtil
 import kotlinx.coroutines.*
-import me.teble.xposed.autodaily.hook.base.moduleLoadSuccess
+import me.teble.xposed.autodaily.hook.base.moduleLoadInit
 import me.teble.xposed.autodaily.hook.notification.XANotification
 import me.teble.xposed.autodaily.hook.utils.ToastUtil
 import me.teble.xposed.autodaily.task.cron.CronUtil
@@ -52,7 +52,7 @@ object TaskExecutor {
 
     fun runTasks(userExec: Boolean) {
         scope.launch(Dispatchers.IO) {
-            while (!moduleLoadSuccess) {
+            while (!moduleLoadInit) {
                 LogUtil.d("等待初始化完毕")
                 delay(500)
             }