去除无用代码

easybangumiorg · Jun 1, 2024 · 3a0b85a · 3a0b85a
1 parent d0fb39e
commit 3a0b85a
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 59 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -204,7 +204,7 @@ dependencies {
     implementation(project(":easy-i18n"))
     implementation(project(":injekt"))
     implementation(project(":lib_upnp"))
-    implementation(project(":lib_signal"))
+    //implementation(project(":lib_signal"))
 
     implementation(libs.zip4j)
 

diff --git a/app/src/main/java/com/heyanle/easybangumi4/Scheduler.kt b/app/src/main/java/com/heyanle/easybangumi4/Scheduler.kt
@@ -17,7 +17,6 @@ import com.heyanle.easybangumi4.exo.MediaModule
 import com.heyanle.easybangumi4.extension.ExtensionController
 import com.heyanle.easybangumi4.extension.ExtensionModule
 import com.heyanle.easybangumi4.case.CaseModule
-import com.heyanle.easybangumi4.crash.NativeHandler
 import com.heyanle.easybangumi4.crash.SourceCrashController
 import com.heyanle.easybangumi4.dlna.DlnaModule
 import com.heyanle.easybangumi4.setting.SettingModule
@@ -106,10 +105,10 @@ object Scheduler {
      */
     private fun initCrasher(application: Application) {
         Thread.setDefaultUncaughtExceptionHandler(CrashHandler(application))
-        SignalController.initSignal(intArrayOf(
-            SignalConst.SIGQUIT,
-            SignalConst.SIGABRT,
-            SignalConst.SIGSEGV),application, NativeHandler())
+//        SignalController.initSignal(intArrayOf(
+//            SignalConst.SIGQUIT,
+//            SignalConst.SIGABRT,
+//            SignalConst.SIGSEGV),application, NativeHandler())
     }
 
     /**

diff --git a/app/src/main/java/com/heyanle/easybangumi4/crash/NativeHandler.kt b/app/src/main/java/com/heyanle/easybangumi4/crash/NativeHandler.kt
@@ -1,23 +1,23 @@
-package com.heyanle.easybangumi4.crash
-
-import android.content.Context
-import com.pika.lib_signal.CallOnCatchSignal
-
-/**
- * Created by heyanle on 2024/5/31.
- * https://github.com/heyanLE
- */
-class NativeHandler: CallOnCatchSignal {
-
-    override fun checkIsAnr(): Boolean {
-        return false
-    }
-
-    override fun handleAnr(context: Context, logcat: String) {
-
-    }
-
-    override fun handleCrash(context: Context, signal: Int, logcat: String) {
-        SourceCrashController.onNativeCrash(signal, logcat)
-    }
-}
+//package com.heyanle.easybangumi4.crash
+//
+//import android.content.Context
+//import com.pika.lib_signal.CallOnCatchSignal
+//
+///**
+// * Created by heyanle on 2024/5/31.
+// * https://github.com/heyanLE
+// */
+//class NativeHandler: CallOnCatchSignal {
+//
+//    override fun checkIsAnr(): Boolean {
+//        return false
+//    }
+//
+//    override fun handleAnr(context: Context, logcat: String) {
+//
+//    }
+//
+//    override fun handleCrash(context: Context, signal: Int, logcat: String) {
+//        SourceCrashController.onNativeCrash(signal, logcat)
+//    }
+//}
diff --git a/app/src/main/java/com/heyanle/easybangumi4/crash/SourceCrashController.kt b/app/src/main/java/com/heyanle/easybangumi4/crash/SourceCrashController.kt
@@ -54,42 +54,42 @@ object SourceCrashController {
 
 
     fun appendComponentAction(key: String, action: String){
-        scope.launch {
-            try {
-                if (!actionListFile.exists()){
-                    folder.mkdirs()
-                    actionListFile.createNewFile()
-                }
-
-                val actionString = "open;${key};${action};"
-                actionList.add("${key};${action}")
-                actionListFile.appendText(actionString + "\n")
-            }catch (e: Throwable){
-                e.printStackTrace()
-            }
-
-        }
+//        scope.launch {
+//            try {
+//                if (!actionListFile.exists()){
+//                    folder.mkdirs()
+//                    actionListFile.createNewFile()
+//                }
+//
+//                val actionString = "open;${key};${action};"
+//                actionList.add("${key};${action}")
+//                actionListFile.appendText(actionString + "\n")
+//            }catch (e: Throwable){
+//                e.printStackTrace()
+//            }
+//
+//        }
     }
 
     fun appendComponentAction(component: Component, method: Method){
         appendComponentAction(component.source.key, "${component.javaClass.name}#${method.name}")
     }
 
     fun closeComponentAction(key: String, action: String){
-        scope.launch {
-            try {
-                if (!actionListFile.exists()) {
-                    folder.mkdirs()
-                    actionListFile.createNewFile()
-                }
-                val actionString =
-                    "close;${key};${action};"
-                actionList.remove("${key};${action};")
-                actionListFile.appendText(actionString + "\n")
-            }catch (e: Throwable){
-                e.printStackTrace()
-            }
-        }
+//        scope.launch {
+//            try {
+//                if (!actionListFile.exists()) {
+//                    folder.mkdirs()
+//                    actionListFile.createNewFile()
+//                }
+//                val actionString =
+//                    "close;${key};${action};"
+//                actionList.remove("${key};${action};")
+//                actionListFile.appendText(actionString + "\n")
+//            }catch (e: Throwable){
+//                e.printStackTrace()
+//            }
+//        }
     }
 
     fun closeComponentAction(component: Component, method: Method){
@@ -116,7 +116,7 @@ object SourceCrashController {
                 }
                 sb.append(it).append("\n")
             }
-            jumpToCrashPage("源操作记录（已关闭相关源）：\n${sb.toString()}\n${stringWriter.toString()}")
+            jumpToCrashPage("${stringWriter.toString()}")
         }
     }
 

diff --git a/app/src/main/java/com/heyanle/easybangumi4/source/SourceController.kt b/app/src/main/java/com/heyanle/easybangumi4/source/SourceController.kt
@@ -139,6 +139,7 @@ class SourceController(
 
 //            // 加载 So 咯
             if (source is NativeSupportedSource){
+                return SourceInfo.Error(source, extension, "暂时不支持动态链接 so 库")
                 val soList = source.dependSoName()
 //                if (soList.any { !it.startsWith("lib_" + extension.pkgName) }){
 //                    return SourceInfo.Error(source, extension, "加载错误, so 文件必须以lib_[包名] 开头", )