From 2b92da3e01a2a6b8e4025a2c4c5e7cedc05bbc3f Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 6 Feb 2025 07:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.gradle                          |  2 +-
 appbase/build.properties                      | 12 ++--
 .../winboll/studio/appbase/MainActivity.java  | 38 ++++++++-----
 appbase/src/main/res/layout/activity_main.xml | 27 ++++++++-
 libappbase/build.properties                   | 12 ++--
 .../studio/libappbase/CrashHandler.java       | 16 +++---
 .../studio/libappbase/GlobalApplication.java  | 57 ++++++++++---------
 7 files changed, 99 insertions(+), 65 deletions(-)

diff --git a/appbase/build.gradle b/appbase/build.gradle
index ab7c0c1..6b6346e 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.1" 
+        versionName "1.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
diff --git a/appbase/build.properties b/appbase/build.properties
index 99b40e1..7166408 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 04 08:46:51 HKT 2025
-stageCount=4
+#Wed Feb 05 23:09:41 GMT 2025
+stageCount=0
 libraryProject=libappbase
-baseVersion=1.1
-publishVersion=1.1.3
-buildCount=0
-baseBetaVersion=1.1.4
+baseVersion=1.2
+publishVersion=1.2.0
+buildCount=3
+baseBetaVersion=1.2.1
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
index 6100bcf..03ca5c7 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -1,15 +1,23 @@
-package cc.winboll.studio.appbase;
- 
-import android.app.Activity;
-import android.os.Bundle;
-
-public class MainActivity extends Activity {
-     
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        
-    }
-	
-}
\ No newline at end of file
+package cc.winboll.studio.appbase;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.CheckBox;
+import cc.winboll.studio.libappbase.GlobalApplication;
+
+public class MainActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
+        cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
+    }
+
+	public void onSwitchDebugMode(View view) {
+        GlobalApplication.setIsDebuging(this, ((CheckBox)view).isChecked());
+    }
+}
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 177c979..04374bf 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -4,13 +4,36 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:orientation="vertical"
 	android:gravity="center">
 
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="Hello, WinBoll!"
-		android:onClick="onHello"/>
+		android:text="Hello, WinBoll!"/>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="right|center_vertical">
+
+		<CheckBox
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Debug Mode"
+			android:layout_weight="1.0"
+			android:onClick="onSwitchDebugMode"
+			android:id="@+id/activitymainCheckBox1"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Test Application CrashReport"
+			android:textAllCaps="false"
+			android:onClick="onTestApplicationCrashReport"/>
+
+	</LinearLayout>
 
 </LinearLayout>
 
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 0a5e568..7166408 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 04 08:46:36 HKT 2025
-stageCount=4
+#Wed Feb 05 23:09:41 GMT 2025
+stageCount=0
 libraryProject=libappbase
-baseVersion=1.1
-publishVersion=1.1.3
-buildCount=0
-baseBetaVersion=1.1.4
+baseVersion=1.2
+publishVersion=1.2.0
+buildCount=3
+baseBetaVersion=1.2.1
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
index b923a86..2fce15d 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
@@ -82,13 +82,14 @@ public final class CrashHandler {
 
                     StringBuilder sb = new StringBuilder();
                     sb.append("************* Crash Head ****************\n");
-                    sb.append("Time Of Crash      : ").append(time).append("\n");
-                    sb.append("Device Manufacturer: ").append(Build.MANUFACTURER).append("\n");
-                    sb.append("Device Model       : ").append(Build.MODEL).append("\n");
-                    sb.append("Android Version    : ").append(Build.VERSION.RELEASE).append("\n");
-                    sb.append("Android SDK        : ").append(Build.VERSION.SDK_INT).append("\n");
-                    sb.append("App VersionName    : ").append(versionName).append("\n");
-                    sb.append("App VersionCode    : ").append(versionCode).append("\n");
+                    sb.append("Time Of Crash                        : ").append(time).append("\n");
+                    sb.append("Device Manufacturer                  : ").append(Build.MANUFACTURER).append("\n");
+                    sb.append("Device Model                         : ").append(Build.MODEL).append("\n");
+                    sb.append("Android Version                      : ").append(Build.VERSION.RELEASE).append("\n");
+                    sb.append("Android SDK                          : ").append(Build.VERSION.SDK_INT).append("\n");
+                    sb.append("App VersionName                      : ").append(versionName).append("\n");
+                    sb.append("App VersionCode                      : ").append(versionCode).append("\n");
+                    sb.append("AppBase GlobalApplication Debug Mode : ").append(GlobalApplication.isDebuging).append("\n");
                     sb.append("************* Crash Head ****************\n");
                     sb.append("\n").append(fullStackTrace);
 
@@ -115,6 +116,7 @@ public final class CrashHandler {
                                 DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
                         }
                     }
+
                 }
 
                 private void writeFile(File file, String content) throws IOException {
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
index 949e9ec..38c9da4 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -5,51 +5,46 @@ package cc.winboll.studio.libappbase;
  * @Date 2025/01/05 10:10:23
  * @Describe 全局应用类
  */
-import android.app.Activity;
 import android.app.Application;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
+import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import android.content.pm.ApplicationInfo;
-import android.content.res.AssetManager;
 
 public class GlobalApplication extends Application {
 
+    final static String PREFS = GlobalApplication.class.getName() + "PREFS";
+    final static String PREFS_ISDEBUGING = "PREFS_ISDEBUGING";
+
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
+    // 是否处于调试状态
+    volatile static boolean isDebuging = false;
+
+    public static void setIsDebuging(Context context, boolean isDebuging) {
+        GlobalApplication.isDebuging = isDebuging;
+        // 获取SharedPreferences实例
+        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
+        // 获取编辑器
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        // 保存数据
+        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
+        // 提交更改
+        editor.apply();
+    }
+
+    public static boolean isDebuging() {
+        return isDebuging;
+    }
+
     @Override
     public Context getApplicationContext() {
         return super.getApplicationContext();
@@ -62,7 +57,13 @@ public class GlobalApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+
+        // 设置应用异常处理窗口
         CrashHandler.init(this);
+
+        // 设置应用调试状态
+        SharedPreferences sharedPreferences = getSharedPreferences(PREFS, Context.MODE_PRIVATE);
+        GlobalApplication.isDebuging = sharedPreferences.getBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {