修复外部崩溃与内部崩溃的保险丝恢复逻辑

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Feb 09 03:32:31 GMT 2025
+#Sun Feb 09 03:38:10 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=1.2
 publishVersion=1.2.0
-buildCount=334
+buildCount=338
 baseBetaVersion=1.2.1

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Feb 09 03:32:31 GMT 2025
+#Sun Feb 09 03:38:10 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=1.2
 publishVersion=1.2.0
-buildCount=334
+buildCount=338
 baseBetaVersion=1.2.1

libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java

@@ -12,13 +12,15 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
@@ -26,6 +28,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
 import android.widget.HorizontalScrollView;
+import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -43,8 +46,6 @@ import java.lang.Thread.UncaughtExceptionHandler;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
-import android.widget.LinearLayout;
-import android.content.pm.ApplicationInfo;
 
 public final class CrashHandler {
 
@@ -129,7 +130,7 @@ public final class CrashHandler {
                         LogUtils.d(TAG, "gotoCrashActiviy: ");
                         if (AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
                             LogUtils.d(TAG, "gotoCrashActiviy: isAppCrashSafetyWireOK");
-                            //AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(app);
+                            AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(app);
                             intent.setClass(app, GlobalCrashActiviy.class);
                             intent.putExtra(EXTRA_CRASH_INFO, errorLog);
                             // 如果发生了 CrashHandler 内部崩溃， 就调用基础的应用崩溃显示类
@@ -137,14 +138,14 @@ public final class CrashHandler {
 //                            intent.putExtra(GlobalCrashActiviy.EXTRA_CRASH_INFO, errorLog);
                         } else {
                             LogUtils.d(TAG, "gotoCrashActiviy: else");
-
-                            AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
                             // 正常状态调用进阶的应用崩溃显示页
                             intent.setClass(app, CrashActiviy.class);
                             intent.putExtra(EXTRA_CRASH_INFO, errorLog);
+                            AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
                         }
 
                         
+
 //                        intent.setClass(app, CrashActiviy.class);
 //                        intent.putExtra(CrashActiviy.EXTRA_CRASH_INFO, errorLog);
 
@@ -325,31 +326,24 @@ public final class CrashHandler {
         }
 
         // 调用函数以启用持续崩溃保险，从而调用 CrashHandler 内部崩溃处理窗口
-//        boolean postResumeCrashSafetyWireHandler(final Context context) {
+        void postResumeCrashSafetyWireHandler(final Context context) {
-//            LogUtils.d(TAG, "postCrashSafetyWire()");
+            new Handler(Looper.getMainLooper()).postDelayed(new Runnable(){
-//            if (AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
+                    @Override
-//                // 保险丝在工作连接状态
+                    public void run() {
-//                // 设置内部崩溃处理模块失效
+                        // 进程持续运行时，恢复保险丝熔断值
-//                new Handler(Looper.getMainLooper()).postDelayed(new Runnable(){
+                        //Resume to maximum
-//                        @Override
+                        resumeToMaximumImmediately();
-//                        public void run() {
+//                            LogUtils.d(TAG, "postCrashSafetyWire Resume to maximum");
-//                            // 进程持续运行时，恢复保险丝熔断值
+//                            while (resumeToMaximum(currentSafetyLevel + 1)) {
-//                            //Resume to maximum
+//                                try {
-//                            resumeToMaximumImmediately();
+//                                    Thread.sleep(1000);
-////                            LogUtils.d(TAG, "postCrashSafetyWire Resume to maximum");
+//                                } catch (InterruptedException e) {
-////                            while (resumeToMaximum(currentSafetyLevel + 1)) {
+//                                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-////                                try {
-////                                    Thread.sleep(1000);
-////                                } catch (InterruptedException e) {
-////                                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-////                                }
-////                            }
 //                                }
-//                    }, 1000);
-//                return true;
-//            }
-//            return false;
 //                            }
+                    }
+                }, 1000);
+        }
 
     }