From 13510f45cfbfd4c7a52da91191cb65711009206b Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 12 Feb 2025 13:27:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=A3=8E=E6=A0=BC=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |   4 +-
 appbase/src/main/AndroidManifest.xml          |   2 +-
 .../winboll/studio/appbase/MainActivity.java  |   8 +-
 appbase/src/main/res/layout/activity_main.xml |  50 ++++---
 appbase/src/main/res/values/colors.xml        |   7 +-
 appbase/src/main/res/values/styles.xml        |  10 +-
 libappbase/build.gradle                       |   2 +
 libappbase/build.properties                   |   4 +-
 .../libappbase/GlobalCrashActivity.java       |  54 ++-----
 .../libappbase/GlobalCrashReportView.java     | 138 ++++++++++++++++++
 .../main/res/layout/activity_globalcrash.xml  |  31 +---
 .../res/layout/view_globalcrashreport.xml     |  35 +++++
 libappbase/src/main/res/values/attrs.xml      |   5 +-
 libappbase/src/main/res/values/styles.xml     |   8 +-
 14 files changed, 260 insertions(+), 98 deletions(-)
 create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
 create mode 100644 libappbase/src/main/res/layout/view_globalcrashreport.xml

diff --git a/appbase/build.properties b/appbase/build.properties
index b71adcf..85eb7b0 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 11 13:11:28 HKT 2025
+#Wed Feb 12 05:28:02 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=1.3
 publishVersion=1.3.0
-buildCount=0
+buildCount=41
 baseBetaVersion=1.3.1
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index a5392b6..e75d69b 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
         android:name=".App"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MyAppTheme"
         android:resizeableActivity="true">
 
         <activity
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 03ca5c7..98721d9 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -1,18 +1,22 @@
 package cc.winboll.studio.appbase;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.CheckBox;
+import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import androidx.appcompat.widget.Toolbar;
 
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
+        setSupportActionBar(toolbar);
+        
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
     }
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 04374bf..42c38fa 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -7,31 +7,45 @@
 	android:orientation="vertical"
 	android:gravity="center">
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="Hello, WinBoll!"/>
-
-	<LinearLayout
-		android:orientation="horizontal"
+	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="right|center_vertical">
+		android:id="@+id/activitymainToolbar1"/>
 
-		<CheckBox
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:gravity="center_horizontal">
+
+		<TextView
 			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"/>
+			android:text="Hello, WinBoll!"/>
 
-		<Button
-			android:layout_width="wrap_content"
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="Test Application CrashReport"
-			android:textAllCaps="false"
-			android:onClick="onTestApplicationCrashReport"/>
+			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/appbase/src/main/res/values/colors.xml b/appbase/src/main/res/values/colors.xml
index f2c2d2d..18d6383 100644
--- a/appbase/src/main/res/values/colors.xml
+++ b/appbase/src/main/res/values/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorTextColor">#006D26C0</color>
-    <color name="colorPrimary">#001BDCC0</color>
-    <color name="colorPrimaryDark">#0028C025</color>
-    <color name="colorAccent">#002985CC</color>
+    <color name="colorPrimary">#005800FF</color>
+    <color name="colorPrimaryDark">#005800FF</color>
+    <color name="colorAccent">#005800FF</color>
 </resources>
diff --git a/appbase/src/main/res/values/styles.xml b/appbase/src/main/res/values/styles.xml
index 309de0b..d0af5ef 100644
--- a/appbase/src/main/res/values/styles.xml
+++ b/appbase/src/main/res/values/styles.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+    <style name="MyAppTheme" parent="APPBaseTheme">
+        <item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme">
+        <item name="colorTittle">#FFFFFFFF</item>
+        <item name="colorTittleBackgound">#FF00A4B3</item>
+        <item name="colorText">#FFFFFFFF</item>
+        <item name="colorTextBackgound">#FF000000</item>
 	</style>
 </resources>
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 535c115..0b48f94 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -26,5 +26,7 @@ android {
 }
 
 dependencies {
+    api 'androidx.appcompat:appcompat:1.0.0'
+    
     api fileTree(dir: 'libs', include: ['*.jar'])
 }
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 8a88f4f..85eb7b0 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 11 13:11:17 HKT 2025
+#Wed Feb 12 05:28:02 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=1.3
 publishVersion=1.3.0
-buildCount=0
+buildCount=41
 baseBetaVersion=1.3.1
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
index a9690d0..626149e 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
@@ -21,19 +21,18 @@ import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libappbase.R;
+import androidx.appcompat.app.AppCompatActivity;
 
-public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
+public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener {
 
     private static final int MENUITEM_COPY = 0;
     private static final int MENUITEM_RESTART = 1;
 
+    GlobalCrashReportView mGlobalCrashReportView;
     String mLog;
-    int colorTittle;
-    int colorTittleBackground;
-    int colorText;
-    int colorTextBackground;
+    
 
     public static final String TAG = "GlobalCrashActivity";
 
@@ -44,31 +43,14 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
 
         mLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_INFO);
         //setTheme(android.R.style.Theme_Holo_Light_NoActionBar);
-        setTheme(R.style.APPBaseTheme);
+        //setTheme(R.style.APPBaseTheme);
         setContentView(R.layout.activity_globalcrash);
-
-        TypedArray a = obtainStyledAttributes(R.styleable.GlobalCrashActivity);
-        colorTittle = a.getColor(R.styleable.GlobalCrashActivity_colorTittle, Color.WHITE);
-        colorTittleBackground = a.getColor(R.styleable.GlobalCrashActivity_colorTittleBackgound, Color.BLACK);
-        colorText = a.getColor(R.styleable.GlobalCrashActivity_colorText, Color.RED);
-        colorTextBackground = a.getColor(R.styleable.GlobalCrashActivity_colorTextBackgound, Color.RED);
-        // 返回一个绑定资源结束的信号给资源
-        a.recycle();
-
-        LinearLayout llMain = findViewById(R.id.activityglobalcrashLinearLayout1);
-        llMain.setBackgroundColor(colorTextBackground);
-        Toolbar toolbar = findViewById(R.id.activityglobalcrashToolbar1);
-        toolbar.setBackgroundColor(colorTittleBackground);
-        toolbar.setTitleTextColor(colorTittle);
-        toolbar.setSubtitleTextColor(colorTittle);
-        setActionBar(toolbar);
-        TextView tvLog = findViewById(R.id.activityglobalcrashTextView1);
-        tvLog.setText(mLog);
-        tvLog.setTextColor(colorText);
-        tvLog.setBackgroundColor(colorTextBackground);
-
-        getActionBar().setTitle(CrashHandler.TITTLE);
-        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+        mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
+        mGlobalCrashReportView.setReport(mLog);
+        setSupportActionBar(mGlobalCrashReportView.getToolbar());
+        
+        getSupportActionBar().setTitle(CrashHandler.TITTLE);
+        getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
     }
 
     @Override
@@ -113,15 +95,9 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         menu.add(0, MENUITEM_RESTART, 0, "Restart").setOnMenuItemClickListener(this)
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-
-        // 设置菜单文本颜色
-        for (int i = 0; i < menu.size(); i++) {
-            MenuItem item = menu.getItem(i);
-            SpannableString spanString = new SpannableString(item.getTitle().toString());
-            spanString.setSpan(new ForegroundColorSpan(colorTittle), 0, spanString.length(), 0);
-            item.setTitle(spanString);
-        }
+        
+        // 更新菜单文字风格
+        mGlobalCrashReportView.updateMenuStyle();
         return true;
     }
 
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
new file mode 100644
index 0000000..e72dd74
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
@@ -0,0 +1,138 @@
+package cc.winboll.studio.libappbase;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/11 20:18:30
+ * @Describe 应用崩溃报告视图
+ */
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.util.AttributeSet;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.R;
+
+public class GlobalCrashReportView extends LinearLayout {
+
+    public static final String TAG = "GlobalCrashReportView";
+
+    Context mContext;
+    Toolbar mToolbar;
+    int colorTittle;
+    int colorTittleBackground;
+    int colorText;
+    int colorTextBackground;
+    TextView mtvReport;
+
+    public GlobalCrashReportView(Context context) {
+        super(context);
+        mContext = context;
+        //initView();
+    }
+
+    public GlobalCrashReportView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+        initView(attrs);
+    }
+
+    public GlobalCrashReportView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContext = context;
+        //initView();
+    }
+
+    public GlobalCrashReportView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        mContext = context;
+        //initView();
+    }
+
+    public void setColorTittle(int colorTittle) {
+        this.colorTittle = colorTittle;
+    }
+
+    public int getColorTittle() {
+        return colorTittle;
+    }
+
+    public void setColorTittleBackground(int colorTittleBackground) {
+        this.colorTittleBackground = colorTittleBackground;
+    }
+
+    public int getColorTittleBackground() {
+        return colorTittleBackground;
+    }
+
+    public void setColorText(int colorText) {
+        this.colorText = colorText;
+    }
+
+    public int getColorText() {
+        return colorText;
+    }
+
+    public void setColorTextBackground(int colorTextBackground) {
+        this.colorTextBackground = colorTextBackground;
+    }
+
+    public int getColorTextBackground() {
+        return colorTextBackground;
+    }
+
+    void initView(AttributeSet attrs) {
+        TypedArray a = mContext.obtainStyledAttributes(attrs, R.styleable.GlobalCrashActivity, R.attr.themeGlobalCrashActivity, 0);
+        this.colorTittle = a.getColor(R.styleable.GlobalCrashActivity_colorTittle, Color.WHITE);
+        this.colorTittleBackground = a.getColor(R.styleable.GlobalCrashActivity_colorTittleBackgound, Color.BLACK);
+        this.colorText = a.getColor(R.styleable.GlobalCrashActivity_colorText, Color.BLACK);
+        this.colorTextBackground = a.getColor(R.styleable.GlobalCrashActivity_colorTextBackgound, Color.WHITE);
+        // 返回一个绑定资源结束的信号给资源
+        a.recycle();
+
+        /*this.colorTittle = Color.WHITE;
+        this.colorTittleBackground = Color.BLACK;
+        this.colorText = Color.BLACK;
+        this.colorTextBackground = Color.WHITE;
+        */
+        
+        inflate(mContext, R.layout.view_globalcrashreport, this);
+
+        LinearLayout llMain = findViewById(R.id.viewglobalcrashreportLinearLayout1);
+        llMain.setBackgroundColor(this.colorTextBackground);
+        mToolbar = findViewById(R.id.viewglobalcrashreportToolbar1);
+        mToolbar.setBackgroundColor(this.colorTittleBackground);
+        mToolbar.setTitleTextColor(this.colorTittle);
+        mToolbar.setSubtitleTextColor(this.colorTittle);
+        mtvReport = findViewById(R.id.viewglobalcrashreportTextView1);
+        mtvReport.setTextColor(this.colorText);
+        mtvReport.setBackgroundColor(this.colorTextBackground);
+    }
+
+    public void setReport(String report) {
+        mtvReport.setText(report);
+    }
+
+    public Toolbar getToolbar() {
+        return mToolbar;
+    }
+
+    //
+    // 更新菜单文字风格
+    //
+    public void updateMenuStyle() {
+        // 设置菜单文本颜色
+        Menu menu = mToolbar.getMenu();
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            SpannableString spanString = new SpannableString(item.getTitle().toString());
+            spanString.setSpan(new ForegroundColorSpan(this.colorTittle), 0, spanString.length(), 0);
+            item.setTitle(spanString);
+        }
+    }
+}
diff --git a/libappbase/src/main/res/layout/activity_globalcrash.xml b/libappbase/src/main/res/layout/activity_globalcrash.xml
index 23d05d9..92e847d 100644
--- a/libappbase/src/main/res/layout/activity_globalcrash.xml
+++ b/libappbase/src/main/res/layout/activity_globalcrash.xml
@@ -2,35 +2,14 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical"
+    android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:id="@+id/activityglobalcrashLinearLayout1"
-	style="@style/APPBaseTheme">
+	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<cc.winboll.studio.libappbase.GlobalCrashReportView
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/activityglobalcrashToolbar1"/>
-
-	<ScrollView
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<HorizontalScrollView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent">
-
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:id="@+id/activityglobalcrashTextView1"
-				android:background="#FFFFFFFF"/>
-
-		</HorizontalScrollView>
-
-	</ScrollView>
+		android:layout_height="match_parent"
+		android:id="@+id/activityglobalcrashGlobalCrashReportView1"/>
 
 </LinearLayout>
 
diff --git a/libappbase/src/main/res/layout/view_globalcrashreport.xml b/libappbase/src/main/res/layout/view_globalcrashreport.xml
new file mode 100644
index 0000000..405d0b4
--- /dev/null
+++ b/libappbase/src/main/res/layout/view_globalcrashreport.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:id="@+id/viewglobalcrashreportLinearLayout1">
+
+	<androidx.appcompat.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/viewglobalcrashreportToolbar1"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<HorizontalScrollView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="#FFFFFFFF"
+				android:id="@+id/viewglobalcrashreportTextView1"/>
+
+		</HorizontalScrollView>
+
+	</ScrollView>
+
+</LinearLayout>
+
diff --git a/libappbase/src/main/res/values/attrs.xml b/libappbase/src/main/res/values/attrs.xml
index a221b8f..5a4ca3c 100644
--- a/libappbase/src/main/res/values/attrs.xml
+++ b/libappbase/src/main/res/values/attrs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
-    <attr name="globalCrashActivity" format="reference"/>
+
+    <attr name="themeGlobalCrashActivity" format="reference"/>
 
     <declare-styleable name="GlobalCrashActivity">
         <attr name="colorTittle" format="color" />
@@ -9,4 +9,5 @@
         <attr name="colorText" format="color" />
         <attr name="colorTextBackgound" format="color" />
     </declare-styleable>
+
 </resources>
diff --git a/libappbase/src/main/res/values/styles.xml b/libappbase/src/main/res/values/styles.xml
index 3272ca0..13f26cd 100644
--- a/libappbase/src/main/res/values/styles.xml
+++ b/libappbase/src/main/res/values/styles.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="APPBaseTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
+
+    <style name="APPBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
         <item name="colorTittle">#FFFFF600</item>
         <item name="colorTittleBackgound">#FF00B322</item>
         <item name="colorText">#FF00B322</item>
         <item name="colorTextBackgound">#FF000000</item>
 	</style>
+
 </resources>