From 3fe1ea7ff2be7b351b24670db0f9e78d37ee5e06 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 13:20:14 +0800
Subject: [PATCH 01/41] =?UTF-8?q?=E4=BF=AE=E6=94=B9AndroidDemo=E7=B1=BB?=
 =?UTF-8?q?=E5=BA=93=E4=BE=9D=E8=B5=96=E6=96=B9=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androiddemo/build.gradle     | 27 ++++++++++-----------------
 androiddemo/build.properties |  4 ++--
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle
index 8357611..d134caa 100644
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -18,15 +18,8 @@ def genVersionName(def versionName){
 }
 
 android {
-	productFlavors {
-		beta {
-		}
-		stage {
-		}
-	}
-
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
@@ -54,21 +47,21 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // 吐司类库
-    implementation 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.github.getActivity:ToastUtils:10.5'
 
     // Android 类库
     // https://mvnrepository.com/artifact/com.android.support/support-v4
-    implementation 'com.android.support:support-v4:28.0.0'
+    api 'com.android.support:support-v4:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-compat
-    implementation 'com.android.support:support-compat:28.0.0'
+    api 'com.android.support:support-compat:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    implementation 'com.android.support:support-media-compat:28.0.0'
+    api 'com.android.support:support-media-compat:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    implementation 'com.android.support:support-core-utils:28.0.0'
+    api 'com.android.support:support-core-utils:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    implementation 'com.android.support:support-core-ui:28.0.0'
+    api 'com.android.support:support-core-ui:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    implementation 'com.android.support:support-fragment:28.0.0'
+    api 'com.android.support:support-fragment:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    api 'com.android.support:recyclerview-v7:28.0.0'
 }
diff --git a/androiddemo/build.properties b/androiddemo/build.properties
index 4d98e2f..9c7bb10 100644
--- a/androiddemo/build.properties
+++ b/androiddemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 11 18:02:14 GMT 2025
+#Mon Mar 24 05:17:16 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=1.0
 publishVersion=1.0.0
-buildCount=1
+buildCount=2
 baseBetaVersion=1.0.1

From ede6c07deb0c4981733418227b49bd2f01cc6efe Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 13:27:40 +0800
Subject: [PATCH 02/41] =?UTF-8?q?=E6=9B=B4=E6=96=B0AndroidXDemo=E7=B1=BB?=
 =?UTF-8?q?=E5=BA=93=E4=BE=9D=E8=B5=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidxdemo/build.gradle     | 41 +++++++++++++++--------------------
 androidxdemo/build.properties | 10 ++++-----
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/androidxdemo/build.gradle b/androidxdemo/build.gradle
index fcf214f..b3b3c10 100644
--- a/androidxdemo/build.gradle
+++ b/androidxdemo/build.gradle
@@ -18,15 +18,8 @@ def genVersionName(def versionName){
 }
 
 android {
-	productFlavors {
-		beta {
-		}
-		stage {
-		}
-	}
-
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
@@ -36,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.0"
+        versionName "15.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -54,23 +47,23 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // SSH
-    implementation 'com.jcraft:jsch:0.1.55'
+    api 'com.jcraft:jsch:0.1.55'
     // Html 解析
-    implementation 'org.jsoup:jsoup:1.13.1'
+    api 'org.jsoup:jsoup:1.13.1'
     // 二维码类库
-    implementation 'com.google.zxing:core:3.4.1'
-    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
     // 应用介绍页类库
-    implementation 'io.github.medyo:android-about-page:2.0.0'
+    api 'io.github.medyo:android-about-page:2.0.0'
     // 吐司类库
-    implementation 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.github.getActivity:ToastUtils:10.5'
     // 网络连接类库
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
-    // Android 类库
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.viewpager:viewpager:1.0.0'
+    api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    api 'androidx.fragment:fragment:1.1.0'
+    api 'com.google.android.material:material:1.4.0'
 }
diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties
index 8d115d9..e65e382 100644
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 11 18:25:43 GMT 2025
+#Mon Mar 24 05:27:16 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=1.0
-publishVersion=1.0.0
-buildCount=4
-baseBetaVersion=1.0.1
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=1
+baseBetaVersion=15.0.1

From ec6926f629d30af73aa8dccdb7c6fd0ceecf31ca Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 13:31:45 +0800
Subject: [PATCH 03/41] =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8E=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androiddemo/build.gradle     | 2 +-
 androiddemo/build.properties | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle
index d134caa..5ccf9e0 100644
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.0"
+        versionName "15.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
diff --git a/androiddemo/build.properties b/androiddemo/build.properties
index 9c7bb10..b0b41ad 100644
--- a/androiddemo/build.properties
+++ b/androiddemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 05:17:16 GMT 2025
+#Mon Mar 24 05:30:56 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=1.0
-publishVersion=1.0.0
+baseVersion=15.0
+publishVersion=15.0.0
 buildCount=2
-baseBetaVersion=1.0.1
+baseBetaVersion=15.0.1

From 75c2f6304cfce0445b5265ede0854f5a691b7be8 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 13:57:52 +0800
Subject: [PATCH 04/41] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=9F=BA=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androiddemo/build.gradle                      |  3 ++
 androiddemo/build.properties                  |  4 +-
 androiddemo/src/main/AndroidManifest.xml      |  2 +-
 .../{GlobalApplication.java => App.java}      | 12 +++---
 .../studio/androiddemo/MainActivity.java      | 40 ++++++++++++-------
 .../src/main/res/layout/activity_main.xml     | 33 ++++++++++++---
 6 files changed, 64 insertions(+), 30 deletions(-)
 rename androiddemo/src/main/java/cc/winboll/studio/androiddemo/{GlobalApplication.java => App.java} (97%)

diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle
index 5ccf9e0..ac0bdd0 100644
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -64,4 +64,7 @@ dependencies {
     api 'com.android.support:support-fragment:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.8'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }
diff --git a/androiddemo/build.properties b/androiddemo/build.properties
index b0b41ad..baace7d 100644
--- a/androiddemo/build.properties
+++ b/androiddemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 05:30:56 GMT 2025
+#Mon Mar 24 05:56:56 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=2
+buildCount=7
 baseBetaVersion=15.0.1
diff --git a/androiddemo/src/main/AndroidManifest.xml b/androiddemo/src/main/AndroidManifest.xml
index 43eac9a..57a1145 100644
--- a/androiddemo/src/main/AndroidManifest.xml
+++ b/androiddemo/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:resizeableActivity="true"
-        android:name=".GlobalApplication">
+        android:name=".App">
 
         <activity
             android:name=".MainActivity"
diff --git a/androiddemo/src/main/java/cc/winboll/studio/androiddemo/GlobalApplication.java b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/App.java
similarity index 97%
rename from androiddemo/src/main/java/cc/winboll/studio/androiddemo/GlobalApplication.java
rename to androiddemo/src/main/java/cc/winboll/studio/androiddemo/App.java
index e13af9a..54f102f 100644
--- a/androiddemo/src/main/java/cc/winboll/studio/androiddemo/GlobalApplication.java
+++ b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/App.java
@@ -1,7 +1,6 @@
 package cc.winboll.studio.androiddemo;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -22,6 +21,7 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -39,15 +39,15 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class GlobalApplication extends Application {
+public class App extends GlobalApplication {
 
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
     @Override
     public void onCreate() {
         super.onCreate();
-        CrashHandler.getInstance().registerGlobal(this);
-        CrashHandler.getInstance().registerPart(this);
+        //CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerPart(this);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {
@@ -252,7 +252,7 @@ public class GlobalApplication extends Application {
 
             private static String getKernel() {
                 try {
-                    return GlobalApplication.toString(new FileInputStream("/proc/version")).trim();
+                    return App.toString(new FileInputStream("/proc/version")).trim();
                 } catch (Throwable e) {
                     return e.getMessage();
                 }
@@ -331,4 +331,4 @@ public class GlobalApplication extends Application {
             restart();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java
index dcef375..cfde770 100644
--- a/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java
+++ b/androiddemo/src/main/java/cc/winboll/studio/androiddemo/MainActivity.java
@@ -1,15 +1,25 @@
-package cc.winboll.studio.androiddemo;
- 
-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.androiddemo;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.LogView;
+
+public class MainActivity extends Activity {
+
+    LogView mLogView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+}
diff --git a/androiddemo/src/main/res/layout/activity_main.xml b/androiddemo/src/main/res/layout/activity_main.xml
index f8b9a89..40d2031 100644
--- a/androiddemo/src/main/res/layout/activity_main.xml
+++ b/androiddemo/src/main/res/layout/activity_main.xml
@@ -4,13 +4,34 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:gravity="center_vertical|center_horizontal">
+	android:orientation="vertical">
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="Android Demo"
-		android:textAppearance="?android:attr/textAppearanceLarge"/>
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:gravity="center_vertical|center_horizontal"
+		android:layout_weight="1.0">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Android Demo"
+			android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="Text"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
 
 </LinearLayout>
 

From 3a6fb3e17c81df42d1803d82c7605f982ce53009 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 14:04:59 +0800
Subject: [PATCH 05/41] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +-
 libappbase/build.properties                   |  4 +-
 .../src/main/res/drawable/bg_toolbar_log.xml  | 41 +++++++++++++++++++
 libappbase/src/main/res/layout/view_log.xml   |  4 +-
 4 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 libappbase/src/main/res/drawable/bg_toolbar_log.xml

diff --git a/appbase/build.properties b/appbase/build.properties
index 477e694..1869ce9 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:04:35 HKT 2025
+#Mon Mar 24 06:04:07 GMT 2025
 stageCount=9
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.8
-buildCount=0
+buildCount=2
 baseBetaVersion=15.0.9
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 715afc0..1869ce9 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:04:27 HKT 2025
+#Mon Mar 24 06:04:07 GMT 2025
 stageCount=9
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.8
-buildCount=0
+buildCount=2
 baseBetaVersion=15.0.9
diff --git a/libappbase/src/main/res/drawable/bg_toolbar_log.xml b/libappbase/src/main/res/drawable/bg_toolbar_log.xml
new file mode 100644
index 0000000..84fda8a
--- /dev/null
+++ b/libappbase/src/main/res/drawable/bg_toolbar_log.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 阴影部分 --> 
+    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="@color/colorPrimary" 
+                android:startColor="@color/colorPrimary" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+    <!-- 背景部分 --> 
+    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="@color/colorPrimary" 
+                android:startColor="@color/colorPrimary" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>
diff --git a/libappbase/src/main/res/layout/view_log.xml b/libappbase/src/main/res/layout/view_log.xml
index fdf3f3d..f0857d4 100644
--- a/libappbase/src/main/res/layout/view_log.xml
+++ b/libappbase/src/main/res/layout/view_log.xml
@@ -12,7 +12,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
 		android:layout_alignParentTop="true"
-		android:background="@drawable/bg_shadow"
+		android:background="@drawable/bg_toolbar_log"
 		android:id="@+id/viewlogRelativeLayoutToolbar">
 
 		<Button
@@ -72,7 +72,7 @@
 		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 		android:id="@+id/viewlogLinearLayout1"
 		android:gravity="center_vertical"
-		android:background="@drawable/bg_shadow">
+		android:background="@drawable/bg_toolbar_log">
 
 		<CheckBox
 			android:layout_width="wrap_content"

From 00b619ee9998628eb88c0b67cbc295f66a879470 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 14:06:10 +0800
Subject: [PATCH 06/41] <appbase>APK 15.0.9 release Publish.

---
 appbase/build.properties    | 10 +++++-----
 libappbase/build.properties | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 1869ce9..32dc46b 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:04:07 GMT 2025
-stageCount=9
+#Mon Mar 24 14:06:10 HKT 2025
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.0
-publishVersion=15.0.8
-buildCount=2
-baseBetaVersion=15.0.9
+publishVersion=15.0.9
+buildCount=0
+baseBetaVersion=15.0.10
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 1869ce9..32dc46b 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:04:07 GMT 2025
-stageCount=9
+#Mon Mar 24 14:06:10 HKT 2025
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.0
-publishVersion=15.0.8
-buildCount=2
-baseBetaVersion=15.0.9
+publishVersion=15.0.9
+buildCount=0
+baseBetaVersion=15.0.10

From c203557a6a0df664fc5b774278d377ccb9c12730 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 14:06:30 +0800
Subject: [PATCH 07/41] <libappbase>Library Release 15.0.9

---
 appbase/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 32dc46b..8621735 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,5 +1,5 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 14:06:10 HKT 2025
+#Mon Mar 24 14:06:25 HKT 2025
 stageCount=10
 libraryProject=libappbase
 baseVersion=15.0

From dd7600d617d04abc3b67468e427119a21c1989c3 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 14:08:48 +0800
Subject: [PATCH 08/41] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androiddemo/build.gradle     | 2 +-
 androiddemo/build.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle
index ac0bdd0..4ef2484 100644
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -65,6 +65,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
     
-    api 'cc.winboll.studio:libappbase:15.0.8'
+    api 'cc.winboll.studio:libappbase:15.0.9'
     api 'cc.winboll.studio:libapputils:15.0.11'
 }
diff --git a/androiddemo/build.properties b/androiddemo/build.properties
index baace7d..018d60a 100644
--- a/androiddemo/build.properties
+++ b/androiddemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 05:56:56 GMT 2025
+#Mon Mar 24 06:07:49 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=7
+buildCount=9
 baseBetaVersion=15.0.1

From c394a37e0a635a41e90b7c00dd936b6c142e0378 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 14:16:53 +0800
Subject: [PATCH 09/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0WinBoll=E7=B1=BB?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=9B=BF=E6=8D=A2=E5=BA=94=E7=94=A8=E5=9F=BA?=
 =?UTF-8?q?=E7=B1=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidxdemo/build.gradle                           | 13 ++++++++-----
 androidxdemo/build.properties                       |  4 ++--
 androidxdemo/src/main/AndroidManifest.xml           |  6 +++---
 .../{GlobalApplication.java => App.java}            | 12 ++++++------
 androidxdemo/src/main/res/values/styles.xml         |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)
 rename androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/{GlobalApplication.java => App.java} (97%)

diff --git a/androidxdemo/build.gradle b/androidxdemo/build.gradle
index b3b3c10..4b7522e 100644
--- a/androidxdemo/build.gradle
+++ b/androidxdemo/build.gradle
@@ -60,10 +60,13 @@ dependencies {
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.1.0'
-    api 'androidx.viewpager:viewpager:1.0.0'
-    api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    api 'androidx.fragment:fragment:1.1.0'
+    api 'androidx.appcompat:appcompat:1.0.0'
     api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.11'
 }
diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties
index e65e382..91564a0 100644
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 05:27:16 GMT 2025
+#Mon Mar 24 06:15:17 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=1
+buildCount=7
 baseBetaVersion=15.0.1
diff --git a/androidxdemo/src/main/AndroidManifest.xml b/androidxdemo/src/main/AndroidManifest.xml
index 6d0c707..1b70e90 100644
--- a/androidxdemo/src/main/AndroidManifest.xml
+++ b/androidxdemo/src/main/AndroidManifest.xml
@@ -8,9 +8,9 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/MyAppTheme"
         android:resizeableActivity="true"
-        android:name=".GlobalApplication">
+        android:name=".App">
 
         <activity
             android:name=".MainActivity"
@@ -34,4 +34,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/App.java
similarity index 97%
rename from androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java
rename to androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/App.java
index 7abaf88..baa9df1 100644
--- a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java
+++ b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/App.java
@@ -1,7 +1,6 @@
 package cc.winboll.studio.androidxdemo;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -22,6 +21,7 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -39,15 +39,15 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class GlobalApplication extends Application {
+public class App extends GlobalApplication {
 
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
     @Override
     public void onCreate() {
         super.onCreate();
-        CrashHandler.getInstance().registerGlobal(this);
-        CrashHandler.getInstance().registerPart(this);
+        //CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerPart(this);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {
@@ -252,7 +252,7 @@ public class GlobalApplication extends Application {
 
             private static String getKernel() {
                 try {
-                    return GlobalApplication.toString(new FileInputStream("/proc/version")).trim();
+                    return App.toString(new FileInputStream("/proc/version")).trim();
                 } catch (Throwable e) {
                     return e.getMessage();
                 }
@@ -331,4 +331,4 @@ public class GlobalApplication extends Application {
             restart();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/androidxdemo/src/main/res/values/styles.xml b/androidxdemo/src/main/res/values/styles.xml
index 0eb88fe..a70e242 100644
--- a/androidxdemo/src/main/res/values/styles.xml
+++ b/androidxdemo/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From 5e42f21c9aa2c1d2df7eacd5b896a71b2c4cfbd9 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 24 Mar 2025 14:20:40 +0800
Subject: [PATCH 10/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidxdemo/build.properties                 |  4 ++--
 .../studio/androidxdemo/MainActivity.java     | 19 ++++++++++++++-----
 .../src/main/res/layout/activity_main.xml     | 13 +++++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties
index 91564a0..de51361 100644
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:15:17 GMT 2025
+#Mon Mar 24 06:19:57 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=7
+buildCount=8
 baseBetaVersion=15.0.1
diff --git a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/MainActivity.java b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/MainActivity.java
index de5c892..a912358 100644
--- a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/MainActivity.java
+++ b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/MainActivity.java
@@ -3,17 +3,26 @@ package cc.winboll.studio.androidxdemo;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogView;
 
 public class MainActivity extends AppCompatActivity {
-    
+
+    LogView mLogView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-		
+
 		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
-        
+
+        mLogView = findViewById(R.id.logview);
     }
-    
-}
\ No newline at end of file
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+}
diff --git a/androidxdemo/src/main/res/layout/activity_main.xml b/androidxdemo/src/main/res/layout/activity_main.xml
index 034ba40..12fdc32 100644
--- a/androidxdemo/src/main/res/layout/activity_main.xml
+++ b/androidxdemo/src/main/res/layout/activity_main.xml
@@ -34,5 +34,18 @@
 
 	</LinearLayout>
 
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
+
 </LinearLayout>
 

From 64051bb9fe8a33c23a0fd38b4ec6953b12884c72 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Tue, 25 Mar 2025 03:23:45 +0800
Subject: [PATCH 11/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +-
 .../java/cc/winboll/studio/appbase/App.java   |  1 -
 .../winboll/studio/appbase/MainActivity.java  |  4 +-
 libappbase/build.properties                   |  4 +-
 .../studio/libappbase/APPBaseModel.java       | 73 +++++++++++++++++++
 .../studio/libappbase/GlobalApplication.java  | 50 +++++++------
 6 files changed, 108 insertions(+), 28 deletions(-)
 create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/APPBaseModel.java

diff --git a/appbase/build.properties b/appbase/build.properties
index 8621735..3a79877 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 14:06:25 HKT 2025
+#Mon Mar 24 19:22:39 GMT 2025
 stageCount=10
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.9
-buildCount=0
+buildCount=5
 baseBetaVersion=15.0.10
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/App.java b/appbase/src/main/java/cc/winboll/studio/appbase/App.java
index f2098d7..74f9bbc 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/App.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/App.java
@@ -19,7 +19,6 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        GlobalApplication.setIsDebuging(this, BuildConfig.DEBUG);
         mSOSCenterServiceReceiver = new SOSCenterServiceReceiver();
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(SOS.ACTION_SOS);
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 671889c..475b29e 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -17,6 +17,7 @@ import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
+import cc.winboll.studio.libappbase.APPBaseModel;
 
 public class MainActivity extends Activity {
 
@@ -59,7 +60,8 @@ public class MainActivity extends Activity {
     }
 
 	public void onSwitchDebugMode(View view) {
-        GlobalApplication.setIsDebuging(this, ((CheckBox)view).isChecked());
+        boolean isDebuging = ((CheckBox)view).isChecked();
+        GlobalApplication.setIsDebuging(isDebuging);
     }
 
     public void onStartCenter(View view) {
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 32dc46b..3a79877 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 14:06:10 HKT 2025
+#Mon Mar 24 19:22:39 GMT 2025
 stageCount=10
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.9
-buildCount=0
+buildCount=5
 baseBetaVersion=15.0.10
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/APPBaseModel.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/APPBaseModel.java
new file mode 100644
index 0000000..a71f1d1
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/APPBaseModel.java
@@ -0,0 +1,73 @@
+package cc.winboll.studio.libappbase;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 02:52:46
+ * @Describe 基础应用数据模型
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class APPBaseModel extends BaseBean {
+
+    public static final String TAG = "APPBaseModel";
+
+    // 应用是否处于正在调试状态
+    //
+    boolean isDebuging = false;
+
+    public APPBaseModel() {
+        this.isDebuging = false;
+    }
+
+    public APPBaseModel(boolean isDebuging) {
+        this.isDebuging = isDebuging;
+    }
+
+    public void setIsDebuging(boolean isDebuging) {
+        this.isDebuging = isDebuging;
+    }
+
+    public boolean isDebuging() {
+        return isDebuging;
+    }
+
+    @Override
+    public String getName() {
+        return APPBaseModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("isDebuging").value(isDebuging());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isDebuging")) {
+                setIsDebuging(jsonReader.nextBoolean());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}
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 a5d77d1..5cbb967 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -7,7 +7,6 @@ package cc.winboll.studio.libappbase;
  */
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Handler;
@@ -21,22 +20,29 @@ 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 GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     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 void setIsDebuging(boolean isDebuging) {
+        if (_GlobalApplication != null) {
+            GlobalApplication.isDebuging = isDebuging;
+            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging));
+            // 获取SharedPreferences实例
+//        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
+//        // 获取编辑器
+//        SharedPreferences.Editor editor = sharedPreferences.edit();
+//        // 保存数据
+//        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
+//        // 提交更改
+//        editor.apply();
+        }
+    }
+
+    static String getAPPBaseModelFilePath() {
+        return _GlobalApplication.getDataDir().getPath() + "/APPBaseModel.json";
     }
 
     public static boolean isDebuging() {
@@ -55,8 +61,16 @@ public class GlobalApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        //GlobalApplication.isDebuging = true;
-        //GlobalApplication.setIsDebuging(this, true);
+        _GlobalApplication = this;
+
+        // 设置应用调试标志
+        APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
+        if (appBaseModel == null) {
+            setIsDebuging(false);
+        } else {
+            setIsDebuging(appBaseModel.isDebuging());
+        }
+
         LogUtils.init(this);
         //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
         //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
@@ -66,16 +80,8 @@ public class GlobalApplication extends Application {
         // 设置应用异常处理窗口
         CrashHandler.init(this);
 
-        // 设置应用调试状态
-        //SharedPreferences sharedPreferences = getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-        //GlobalApplication.isDebuging = sharedPreferences.getBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
-
         // 初始化 Toast 框架
         ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.toast_custom_view);
-        //ToastUtils.setStyle(new WhiteToastStyle());
-        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
 
     public static String getAppName(Context context) {

From 00a9ec1d66e0f9abd694056012565221182f2503 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Tue, 25 Mar 2025 03:24:44 +0800
Subject: [PATCH 12/41] <appbase>APK 15.0.10 release Publish.

---
 appbase/build.properties    | 10 +++++-----
 libappbase/build.properties | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 3a79877..091b890 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 19:22:39 GMT 2025
-stageCount=10
+#Tue Mar 25 03:24:44 HKT 2025
+stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
-publishVersion=15.0.9
-buildCount=5
-baseBetaVersion=15.0.10
+publishVersion=15.0.10
+buildCount=0
+baseBetaVersion=15.0.11
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 3a79877..091b890 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 19:22:39 GMT 2025
-stageCount=10
+#Tue Mar 25 03:24:44 HKT 2025
+stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
-publishVersion=15.0.9
-buildCount=5
-baseBetaVersion=15.0.10
+publishVersion=15.0.10
+buildCount=0
+baseBetaVersion=15.0.11

From e85cbd803edd791bb156118bfcb659eff0b0d0f6 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Tue, 25 Mar 2025 03:25:08 +0800
Subject: [PATCH 13/41] <libappbase>Library Release 15.0.10

---
 appbase/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 091b890..a81251e 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,5 +1,5 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 25 03:24:44 HKT 2025
+#Tue Mar 25 03:25:01 HKT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0

From 9706a39f414166cea0823671febdcb01be6ed9f0 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Tue, 25 Mar 2025 05:29:51 +0800
Subject: [PATCH 14/41] =?UTF-8?q?WinBollActivityManager=E6=B5=8B=E8=AF=95.?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |   4 +-
 appbase/src/main/AndroidManifest.xml          |  12 +-
 .../winboll/studio/appbase/MainActivity.java  |  25 +-
 .../appbase/activities/NewActivity.java       |  41 +++
 appbase/src/main/res/layout/activity_main.xml |  11 +-
 appbase/src/main/res/layout/activity_new.xml  |  34 ++
 libappbase/build.properties                   |   4 +-
 .../studio/libappbase/GlobalApplication.java  |  18 +
 .../libappbase/winboll/IWinBollActivity.java  |  18 +
 .../winboll/MyActivityLifecycleCallbacks.java | 103 ++++++
 .../winboll/WinBollActivityManager.java       | 318 ++++++++++++++++++
 11 files changed, 576 insertions(+), 12 deletions(-)
 create mode 100644 appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
 create mode 100644 appbase/src/main/res/layout/activity_new.xml
 create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBollActivity.java
 create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
 create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java

diff --git a/appbase/build.properties b/appbase/build.properties
index a81251e..b0c800f 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 25 03:25:01 HKT 2025
+#Mon Mar 24 21:28:41 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=0
+buildCount=12
 baseBetaVersion=15.0.11
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 072134c..19f89ca 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:launchMode="singleInstance"
             android:exported="true">
 
             <intent-filter>
@@ -49,10 +50,12 @@
             android:name=".services.MainService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.appbase.services.TestDemoService"
+        <service
+            android:name="cc.winboll.studio.appbase.services.TestDemoService"
             android:exported="true"/>
 
         <service android:name=".services.AssistantService"/>
@@ -103,6 +106,11 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+        <activity android:name=".activities.NewActivity"
+            android:label="NewActivity"
+            android:launchMode="singleInstance"
+            android:exported="true"/>
+
     </application>
 
 </manifest>
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 475b29e..b2b5842 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.appbase.activities.NewActivity;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
@@ -17,12 +18,24 @@ import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
-import cc.winboll.studio.libappbase.APPBaseModel;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class MainActivity extends Activity {
+public class MainActivity extends Activity implements IWinBollActivity {
 
     public static final String TAG = "MainActivity";
+    
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
 
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    Toolbar mToolbar;
     LogView mLogView;
 
     @Override
@@ -31,8 +44,8 @@ public class MainActivity extends Activity {
         ToastUtils.show("onCreate");
         setContentView(R.layout.activity_main);
 
-        Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
-        setActionBar(toolbar);
+        mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
@@ -142,4 +155,8 @@ public class MainActivity extends Activity {
         Intent intent = new Intent(this, TestDemoBindService.class);
         stopService(intent);
     }
+    
+    public void onTestOpenNewActivity(View view) {
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+    }
 }
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
new file mode 100644
index 0000000..289be86
--- /dev/null
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -0,0 +1,41 @@
+package cc.winboll.studio.appbase.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 05:04:22
+ */
+public class NewActivity extends Activity implements IWinBollActivity {
+
+    public static final String TAG = "NewActivity";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new);
+    }
+
+    public void onCloseThisActivity(View view) {
+        WinBollActivityManager.getInstance(this).finish(this);
+    }
+    
+    public void onCloseAllActivity(View view) {
+        WinBollActivityManager.getInstance(this).finishAll();
+    }
+}
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index cb20da0..0c085fa 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activitymainToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<ScrollView
 		android:layout_width="match_parent"
@@ -181,7 +181,14 @@
 							android:text="TestDemoServiceSOS"
 							android:textAllCaps="false"
 							android:onClick="onTestDemoServiceSOS"/>
-
+                        
+                        <Button
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="TestOpenNewActivity"
+                            android:textAllCaps="false"
+                            android:onClick="onTestOpenNewActivity"/>
+                        
 					</LinearLayout>
 
 				</ScrollView>
diff --git a/appbase/src/main/res/layout/activity_new.xml b/appbase/src/main/res/layout/activity_new.xml
new file mode 100644
index 0000000..a405f12
--- /dev/null
+++ b/appbase/src/main/res/layout/activity_new.xml
@@ -0,0 +1,34 @@
+<?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.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="NewActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="CloseThisActivity"
+        android:textAllCaps="false"
+        android:onClick="onCloseThisActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="CloseAllActivity"
+        android:textAllCaps="false"
+        android:onClick="onCloseAllActivity"/>
+    
+</LinearLayout>
+
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 091b890..b0c800f 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 25 03:24:44 HKT 2025
+#Mon Mar 24 21:28:41 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=0
+buildCount=12
 baseBetaVersion=15.0.11
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 5cbb967..86519ea 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -12,6 +12,8 @@ import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Looper;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.MyActivityLifecycleCallbacks;
 
 public class GlobalApplication extends Application {
 
@@ -25,6 +27,8 @@ public class GlobalApplication extends Application {
     volatile static GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     volatile static boolean isDebuging = false;
+    WinBollActivityManager mWinBollActivityManager;
+    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
 
     public static void setIsDebuging(boolean isDebuging) {
         if (_GlobalApplication != null) {
@@ -82,6 +86,20 @@ public class GlobalApplication extends Application {
 
         // 初始化 Toast 框架
         ToastUtils.init(this);
+
+        mWinBollActivityManager = WinBollActivityManager.getInstance(this);
+        mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        // 注册回调
+        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager);
+        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+    }
+
+
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        // 注销回调（非必须，但建议释放资源）
+        unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
     public static String getAppName(Context context) {
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBollActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBollActivity.java
new file mode 100644
index 0000000..47c8b59
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBollActivity.java
@@ -0,0 +1,18 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 08:23:40
+ * @Describe WinBoll 活动窗口通用接口
+ */
+import android.app.Activity;
+import android.widget.Toolbar;
+
+public interface IWinBollActivity {
+
+    public static final String TAG = "IWinBollActivity";
+
+    // 获取活动窗口
+    abstract public Activity getActivity();
+    abstract public String getTag();
+}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
new file mode 100644
index 0000000..2c3ca1f
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
@@ -0,0 +1,103 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 04:29:19
+ */
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils; 
+
+public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
+
+    public static final String TAG = "MyActivityLifecycleCallbacks";
+    
+    WinBollActivityManager mWinBollActivityManager;
+
+    public String mInfo = "";
+
+    public MyActivityLifecycleCallbacks(WinBollActivityManager winBollActivityManager) {
+        mWinBollActivityManager = winBollActivityManager;
+    }
+
+    void createActivityeInfo(Activity activity) {
+        StringBuilder sb = new StringBuilder();
+        Intent receivedIntent = activity.getIntent();
+        sb.append("\nCallingActivity : \n");
+        if (activity.getCallingActivity() != null) {
+            sb.append(activity.getCallingActivity().getPackageName());
+        }
+        sb.append("\nReceived Intent Package : \n");
+        sb.append(receivedIntent.getPackage());
+
+        Bundle extras = receivedIntent.getExtras();
+        if (extras != null) {
+            for (String key : extras.keySet()) {
+                sb.append("\nIntentInfo");
+                sb.append("\n键: ");
+                sb.append(key);
+                sb.append(", 值: ");
+                sb.append(extras.get(key));
+                //Log.d("IntentInfo", "键: " + key + ", 值: " + extras.get(key));
+            }
+        }
+        mInfo = sb.toString();
+        //Log.d("IntentInfo", "发送Intent的应用包名: " + senderPackage);
+    }
+
+    public void showActivityeInfo() {
+        ToastUtils.show("ActivityeInfo : " + mInfo);
+        LogUtils.d(TAG, "ActivityeInfo : " + mInfo);
+    }
+
+    @Override 
+    public void onActivityCreated(Activity activity, Bundle savedInstanceState) { 
+        // 在这里可以做一些初始化相关的操作，例如记录Activity的创建时间等 
+        //System.out.println(activity.getLocalClassName() + " was created"); 
+        LogUtils.d(TAG, activity.getLocalClassName() + " was created");
+        createActivityeInfo(activity);
+        mWinBollActivityManager.add((IWinBollActivity)activity);
+    } 
+
+    @Override 
+    public void onActivityStarted(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was started");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was started");
+        //createActivityeInfo(activity);
+    } 
+
+    @Override 
+    public void onActivityResumed(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was resumed");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was resumed");
+        //createActivityeInfo(activity);
+    } 
+
+    @Override 
+    public void onActivityPaused(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was paused");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was paused");
+    } 
+
+    @Override 
+    public void onActivityStopped(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was stopped");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was stopped");
+    } 
+
+    @Override 
+    public void onActivitySaveInstanceState(Activity activity, Bundle outState) { 
+        // 可以在这里添加保存状态的自定义逻辑 
+    } 
+
+    @Override 
+    public void onActivityDestroyed(Activity activity) { 
+        //System.out.println(activity.getLocalClassName() + " was destroyed");
+        LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
+        mWinBollActivityManager.registeRemove((IWinBollActivity)activity);
+    } 
+}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
new file mode 100644
index 0000000..3bfacd3
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -0,0 +1,318 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 08:25:43
+ * @Describe 应用活动窗口管理器
+ * 参考 ：
+ * android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label
+ * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
+ */
+import android.app.ActivityManager;
+import android.app.TaskStackBuilder;
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class WinBollActivityManager {
+
+    public static final String TAG = "WinBollActivityManager";
+    public static final String EXTRA_TAG = "EXTRA_TAG";
+
+    public static enum WinBollUI_TYPE {
+        Aplication, // 退出应用后，保持最近任务栏任务记录主窗口
+        Service // 退出应用后，清理所有最近任务栏任务记录窗口
+        };
+
+    // 应用类型标志
+    volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
+
+    Context mContext;
+    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
+    static WinBollActivityManager _mWinBollActivityManager;
+    static Map<String, IWinBollActivity> _mapIWinBollList;
+    IWinBollActivity firstIWinBollActivity;
+
+    public WinBollActivityManager(Context context) {
+        mContext = context;
+        LogUtils.d(TAG, "WinBollActivityManager()");
+        _mapIWinBollList = new HashMap<String, IWinBollActivity>();
+    }
+
+    public static synchronized WinBollActivityManager getInstance(Context context) {
+        LogUtils.d(TAG, "getInstance");
+        if (_mWinBollActivityManager == null) {
+            LogUtils.d(TAG, "_mWinBollActivityManager == null");
+            _mWinBollActivityManager = new WinBollActivityManager(context);
+        }
+        return _mWinBollActivityManager;
+    }
+
+    //
+    // 设置 WinBoll 应用 UI 类型
+    //
+    public synchronized static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
+        _mWinBollUI_TYPE = mWinBollUI_TYPE;
+    }
+
+    //
+    // 获取 WinBoll 应用 UI 类型
+    //
+    public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() {
+        return _mWinBollUI_TYPE;
+    }
+
+    //
+    // 把Activity添加到管理中
+    //
+    public <T extends IWinBollActivity> void add(T iWinBoll) {
+        if (isActive(iWinBoll.getTag())) {
+            LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
+        } else {
+            // 设置起始活动窗口，以便最后退出时提问
+            if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
+                firstIWinBollActivity = iWinBoll;
+            }
+
+            // 添加到活动窗口列表
+            _mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
+            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
+        }
+    }
+
+
+    //
+    // activity: 为 null 时，
+    // intent.putExtra 函数 EXTRA_TAG 参数为 tag
+    // activity: 不为 null 时，
+    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
+    //
+    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
+        try {
+            // 如果窗口已存在就重启窗口
+            String tag = clazz.newInstance().getTag();
+            if (isActive(tag)) {
+                resumeActivity(context, tag);
+                return;
+            }
+
+            // 新建一个任务窗口
+            Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(EXTRA_TAG, tag);
+            mContext.startActivity(intent);
+        } catch (InstantiationException | IllegalAccessException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
+        try {
+            // 如果窗口已存在就重启窗口
+            String tag = clazz.newInstance().getTag();
+            if (isActive(tag)) {
+                resumeActivity(context, tag);
+                return;
+            }
+
+            // 新建一个任务窗口
+            //Intent intent = new Intent(context, clazz);
+            //打开多任务窗口 flags
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(EXTRA_TAG, tag);
+            mContext.startActivity(intent);
+        } catch (InstantiationException | IllegalAccessException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
+        return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
+    }
+
+    //
+    // 判断 tag绑定的 MyActivity是否存在
+    //
+    public boolean isActive(String tag) {
+        //printAvtivityListInfo();
+        IWinBollActivity iWinBoll = getIWinBoll(tag);
+        if (iWinBoll != null) {
+            LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
+            //ToastUtils.show("activity != null tag " + tag);
+            //判断是否为 BaseActivity,如果已经销毁，则移除
+            if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
+                _mapIWinBollList.remove(iWinBoll.getTag());
+                //_mWinBollActivityList.remove(activity);
+                LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
+                return false;
+            } else {
+                LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag));
+                return true;
+            }
+        } else {
+            LogUtils.d(TAG, String.format("isActive(...) activity == null\ntag : %s", tag));
+            return false;
+        }
+    }
+
+    static IWinBollActivity getIWinBoll(String tag) {
+        return _mapIWinBollList.get(tag);
+    }
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
+        LogUtils.d(TAG, "resumeActivty");
+        T iWinBoll = (T)getIWinBoll(tag);
+        //LogUtils.d(TAG, "activity " + activity.getTag());
+        if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+            resumeActivity(context, iWinBoll);
+        }
+    }
+
+    //
+    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
+    //
+    public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
+        ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        //返回启动它的根任务（home 或者 MainActivity）
+        Intent intent = new Intent(context, iWinBoll.getClass());
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
+        stackBuilder.addNextIntentWithParentStack(intent);
+        stackBuilder.startActivities();
+        //moveTaskToFront(YourTaskId, 0);
+        LogUtils.d(TAG, "am.moveTaskToFront");
+        //ToastUtils.show("resumeActivity am.moveTaskToFront");
+        am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+    }
+
+
+    //
+    // 结束所有 Activity
+    //
+    public void finishAll() {
+        try {
+            for (String key : _mapIWinBollList.keySet()) {
+                //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
+                IWinBollActivity iWinBoll = _mapIWinBollList.get(key);
+                //ToastUtils.show("finishAll() activity");
+                if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+                    //ToastUtils.show("activity != null ...");
+                    if (getWinBollUI_TYPE() == WinBollUI_TYPE.Service) {
+                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
+                        iWinBoll.getActivity().finishAndRemoveTask();
+                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
+                    } else if (getWinBollUI_TYPE() == WinBollUI_TYPE.Aplication) {
+                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
+                        iWinBoll.getActivity().finish();
+                        //ToastUtils.show("finishAll() activity.finish();");
+                    } else {
+                        LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
+                        //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    //
+    // 结束指定Activity
+    //
+    public <T extends IWinBollActivity> void finish(T iWinBoll) {
+        try {
+            if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
+                //根据tag 移除 MyActivity
+                //String tag= activity.getTag();
+                //_mWinBollActivityList.remove(tag);
+                //ToastUtils.show("remove");
+                //ToastUtils.show("_mWinBollActivityArrayMap.size() " + Integer.toString(_mWinBollActivityArrayMap.size()));
+
+                // 窗口回调规则：
+                // [] 当前窗口位置 >> 调度出的窗口位置
+                // ★：[0] 1 2 3 4 >> 1
+                // ★：0 1 [2] 3 4 >> 1
+                // ★：0 1 2 [3] 4 >> 2
+                // ★：0 1 2 3 [4] >> 3
+                // ★：[0] >> 直接关闭当前窗口
+                LogUtils.d(TAG, "finish no yet.");
+                IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
+                iWinBoll.getActivity().finish();
+                if (preIWinBoll != null) {
+                    resumeActivity(mContext, preIWinBoll);
+                }
+            }
+
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    }
+
+    //
+    // 获取窗口队列中的前一个窗口
+    //
+    IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) {
+        try {
+            boolean bingo = false;
+            IWinBollActivity preIWinBoll = null;
+            for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
+                if (entity.getKey().equals(iWinBoll.getTag())) {
+                    bingo = true;
+                    LogUtils.d(TAG, "bingo");
+                    break;
+                }
+                preIWinBoll = entity.getValue();
+            }
+
+            if (bingo) {
+                return preIWinBoll;
+            }
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+
+        return null;
+    }
+
+    //
+    // 从管理列表中移除管理项
+    //
+    public <T extends IWinBollActivity> boolean registeRemove(T activity) {
+        IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag());
+        if (iWinBollTest != null) {
+            _mapIWinBollList.remove(activity.getTag());
+            return true;
+        }
+        return false;
+    }
+
+    //
+    // 打印管理列表项列表里的信息
+    //
+    public static void printIWinBollListInfo() {
+        //LogUtils.d(TAG, "printAvtivityListInfo");
+        if (!_mapIWinBollList.isEmpty()) {
+            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
+            Iterator<Map.Entry<String, IWinBollActivity>> iterator = _mapIWinBollList.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<String, IWinBollActivity> entry = iterator.next();
+                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
+                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
+            }
+            sb.append("\nMap entries end.");
+            LogUtils.d(TAG, sb.toString());
+        } else {
+            LogUtils.d(TAG, "The map is empty.");
+        }
+    }
+}

From f3ef7226d8cce318721bd72f47ea6e4d2959b185 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Tue, 25 Mar 2025 20:59:55 +0800
Subject: [PATCH 15/41] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +-
 appbase/src/main/AndroidManifest.xml          |  8 +--
 .../winboll/studio/appbase/MainActivity.java  | 53 +++++++++++++----
 .../appbase/activities/New2Activity.java      | 58 +++++++++++++++++++
 .../appbase/activities/NewActivity.java       | 31 +++++++---
 appbase/src/main/res/layout/activity_main.xml |  7 +--
 appbase/src/main/res/layout/activity_new.xml  |  9 +++
 appbase/src/main/res/layout/activity_new2.xml | 50 ++++++++++++++++
 appbase/src/main/res/menu/toolbar_main.xml    |  9 +++
 libappbase/build.properties                   |  4 +-
 libappbase/src/main/AndroidManifest.xml       |  9 ++-
 .../studio/libappbase/GlobalApplication.java  | 10 ++--
 .../libappbase/winboll/LogActivity.java       | 44 ++++++++++++++
 .../src/main/res/layout/activity_log.xml      | 20 +++----
 14 files changed, 264 insertions(+), 52 deletions(-)
 create mode 100644 appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
 create mode 100644 appbase/src/main/res/layout/activity_new2.xml
 create mode 100644 appbase/src/main/res/menu/toolbar_main.xml
 create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java

diff --git a/appbase/build.properties b/appbase/build.properties
index b0c800f..bbc8b51 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 21:28:41 GMT 2025
+#Tue Mar 25 12:59:12 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=12
+buildCount=41
 baseBetaVersion=15.0.11
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 19f89ca..2e4b180 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:launchMode="singleInstance"
             android:exported="true">
 
             <intent-filter>
@@ -106,10 +105,9 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
-        <activity android:name=".activities.NewActivity"
-            android:label="NewActivity"
-            android:launchMode="singleInstance"
-            android:exported="true"/>
+        <activity android:name=".activities.NewActivity"/>
+
+        <activity android:name=".activities.New2Activity"/>
 
     </application>
 
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 b2b5842..e15b13d 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -19,12 +19,15 @@ import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.LogActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import android.view.Menu;
+import android.view.MenuItem;
 
 public class MainActivity extends Activity implements IWinBollActivity {
 
     public static final String TAG = "MainActivity";
-    
+
     @Override
     public Activity getActivity() {
         return this;
@@ -36,7 +39,7 @@ public class MainActivity extends Activity implements IWinBollActivity {
     }
 
     Toolbar mToolbar;
-    LogView mLogView;
+    //LogView mLogView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,14 +52,32 @@ public class MainActivity extends Activity implements IWinBollActivity {
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
-        mLogView = findViewById(R.id.activitymainLogView1);
+        //mLogView = findViewById(R.id.activitymainLogView1);
 
-        if (GlobalApplication.isDebuging()) {
-            mLogView.start(); 
-            ToastUtils.show("LogView start.");
-        }
+//        if (GlobalApplication.isDebuging()) {
+//            mLogView.start(); 
+//            ToastUtils.show("LogView start.");
+//        }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            onLogActivity();
+            return true;
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+    
+    
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -67,9 +88,9 @@ public class MainActivity extends Activity implements IWinBollActivity {
 
     @Override
     protected void onResume() {
-        LogUtils.d(TAG, "onResume");
+        //LogUtils.d(TAG, "onResume");
         super.onResume();
-        mLogView.start();
+        //mLogView.start();
     }
 
 	public void onSwitchDebugMode(View view) {
@@ -155,8 +176,20 @@ public class MainActivity extends Activity implements IWinBollActivity {
         Intent intent = new Intent(this, TestDemoBindService.class);
         stopService(intent);
     }
-    
+
     public void onTestOpenNewActivity(View view) {
         WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
     }
+
+    public void onLogActivity() {
+        Intent intent = new Intent(MainActivity.this, LogActivity.class);
+        //打开多任务窗口 flags
+//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
+//        startActivity(intent);
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class);
+
+    }
 }
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
new file mode 100644
index 0000000..0df980f
--- /dev/null
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -0,0 +1,58 @@
+package cc.winboll.studio.appbase.activities;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 11:46:40
+ * @Describe 测试窗口2
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+
+public class New2Activity extends Activity implements IWinBollActivity {
+
+    public static final String TAG = "New2Activity";
+
+    //LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new2);
+
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        //mLogView.start();
+    }
+
+    public void onCloseThisActivity(View view) {
+        WinBollActivityManager.getInstance(this).finish(this);
+    }
+
+    public void onCloseAllActivity(View view) {
+        WinBollActivityManager.getInstance(this).finishAll();
+    }
+
+    public void onNewActivity(View view) {
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+    }
+}
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
index 289be86..3a7c370 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -1,20 +1,23 @@
 package cc.winboll.studio.appbase.activities;
 
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-
 /**
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/03/25 05:04:22
  */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+
 public class NewActivity extends Activity implements IWinBollActivity {
 
     public static final String TAG = "NewActivity";
 
+    //LogView mLogView;
+
     @Override
     public Activity getActivity() {
         return this;
@@ -29,13 +32,25 @@ public class NewActivity extends Activity implements IWinBollActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_new);
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        //mLogView.start();
     }
 
     public void onCloseThisActivity(View view) {
         WinBollActivityManager.getInstance(this).finish(this);
     }
-    
+
     public void onCloseAllActivity(View view) {
         WinBollActivityManager.getInstance(this).finishAll();
     }
+
+    public void onNew2Activity(View view) {
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
+    }
 }
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 0c085fa..81cf153 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -198,11 +198,6 @@
 		</LinearLayout>
 
 	</ScrollView>
-
-	<cc.winboll.studio.libappbase.LogView
-		android:layout_height="300dp"
-		android:layout_width="match_parent"
-		android:id="@+id/activitymainLogView1"/>
-
+    
 </LinearLayout>
 
diff --git a/appbase/src/main/res/layout/activity_new.xml b/appbase/src/main/res/layout/activity_new.xml
index a405f12..8a1452a 100644
--- a/appbase/src/main/res/layout/activity_new.xml
+++ b/appbase/src/main/res/layout/activity_new.xml
@@ -29,6 +29,15 @@
         android:text="CloseAllActivity"
         android:textAllCaps="false"
         android:onClick="onCloseAllActivity"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New2Activity"
+        android:textAllCaps="false"
+        android:onClick="onNew2Activity"/>
+
+    
     
 </LinearLayout>
 
diff --git a/appbase/src/main/res/layout/activity_new2.xml b/appbase/src/main/res/layout/activity_new2.xml
new file mode 100644
index 0000000..1a610ed
--- /dev/null
+++ b/appbase/src/main/res/layout/activity_new2.xml
@@ -0,0 +1,50 @@
+<?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.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="New2Activity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseThisActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseThisActivity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseAllActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseAllActivity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="CloseAllActivity"
+		android:textAllCaps="false"
+		android:onClick="onCloseAllActivity"/>
+
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="NewActivity"
+		android:textAllCaps="false"
+		android:onClick="onNewActivity"/>
+
+	
+
+</LinearLayout>
+
diff --git a/appbase/src/main/res/menu/toolbar_main.xml b/appbase/src/main/res/menu/toolbar_main.xml
new file mode 100644
index 0000000..a486c96
--- /dev/null
+++ b/appbase/src/main/res/menu/toolbar_main.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <item
+        android:id="@+id/item_log"
+        android:title="Log"/>
+    
+</menu>
diff --git a/libappbase/build.properties b/libappbase/build.properties
index b0c800f..bbc8b51 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 21:28:41 GMT 2025
+#Tue Mar 25 12:59:12 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=12
+buildCount=41
 baseBetaVersion=15.0.11
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index 69597ba..d5ffb3a 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -21,8 +21,11 @@
             android:label="GlobalCrashActivity"
             android:launchMode="standard"/>
 
-        <activity android:name=".LogActivity"/>
-
+        <activity
+            android:theme="@android:style/Theme.Holo.Light.NoActionBar"
+            android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
+            android:exported="true"/>
+            
         <service
             android:name=".SimpleOperateSignalCenterService"
             android:exported="true">
@@ -87,4 +90,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
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 86519ea..87fc9a3 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -87,11 +87,11 @@ public class GlobalApplication extends Application {
         // 初始化 Toast 框架
         ToastUtils.init(this);
 
-        mWinBollActivityManager = WinBollActivityManager.getInstance(this);
-        mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-        // 注册回调
-        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager);
-        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+//        mWinBollActivityManager = WinBollActivityManager.getInstance(this);
+//        mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+//        // 注册回调
+//        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager);
+//        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
 
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java
new file mode 100644
index 0000000..855b60d
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java
@@ -0,0 +1,44 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 20:34:47
+ * @Describe 应用日志窗口
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.R;
+
+public class LogActivity extends Activity implements IWinBollActivity {
+
+    public static final String TAG = "LogActivity";
+
+    LogView mLogView;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_log);
+        //ToastUtils.show("LogActivity onCreate");
+
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+}
diff --git a/libappbase/src/main/res/layout/activity_log.xml b/libappbase/src/main/res/layout/activity_log.xml
index dfcde4f..a5f2ea2 100644
--- a/libappbase/src/main/res/layout/activity_log.xml
+++ b/libappbase/src/main/res/layout/activity_log.xml
@@ -1,16 +1,14 @@
 <?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">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
-    <cc.winboll.studio.libappbase.LogView
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1.0"
-        android:id="@+id/logview"/>
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/logview"/>
 
 </LinearLayout>
+

From e89873046b18b50ba69e19d18bade5497514f086 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 02:02:49 +0800
Subject: [PATCH 16/41] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E5=B1=8F?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=AE=BE=E5=AE=9A=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          |  5 ++++
 .../winboll/studio/appbase/MainActivity.java  | 24 ++++---------------
 libappbase/build.properties                   |  4 ++--
 libappbase/src/main/AndroidManifest.xml       |  8 ++++++-
 .../libappbase/winboll/LogActivity.java       |  4 ++++
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index bbc8b51..c2ac156 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 25 12:59:12 GMT 2025
+#Tue Mar 25 17:54:33 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=41
+buildCount=76
 baseBetaVersion=15.0.11
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 2e4b180..9f60792 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -13,8 +13,13 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:resizeableActivity="true"
+            android:launchMode="singleInstance"
+            android:taskAffinity="cc.winboll.studio.appbase.task.main"
+            android:configChanges="screenSize|screenLayout|orientation"
             android:exported="true">
 
+            
             <intent-filter>
 
                 <action android:name="android.intent.action.MAIN"/>
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 e15b13d..8624557 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toolbar;
@@ -14,15 +16,12 @@ import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.winboll.LogActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import android.view.Menu;
-import android.view.MenuItem;
 
 public class MainActivity extends Activity implements IWinBollActivity {
 
@@ -68,15 +67,15 @@ public class MainActivity extends Activity implements IWinBollActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
             onLogActivity();
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
         return super.onOptionsItemSelected(item);
     }
-    
-    
+
+
 
     @Override
     protected void onDestroy() {
@@ -86,13 +85,6 @@ public class MainActivity extends Activity implements IWinBollActivity {
         sendBroadcast(intentAPPWidget);
     }
 
-    @Override
-    protected void onResume() {
-        //LogUtils.d(TAG, "onResume");
-        super.onResume();
-        //mLogView.start();
-    }
-
 	public void onSwitchDebugMode(View view) {
         boolean isDebuging = ((CheckBox)view).isChecked();
         GlobalApplication.setIsDebuging(isDebuging);
@@ -183,13 +175,7 @@ public class MainActivity extends Activity implements IWinBollActivity {
 
     public void onLogActivity() {
         Intent intent = new Intent(MainActivity.this, LogActivity.class);
-        //打开多任务窗口 flags
-//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-//        startActivity(intent);
         WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class);
-
     }
 }
diff --git a/libappbase/build.properties b/libappbase/build.properties
index bbc8b51..c2ac156 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 25 12:59:12 GMT 2025
+#Tue Mar 25 17:54:33 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=41
+buildCount=76
 baseBetaVersion=15.0.11
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index d5ffb3a..b189cd6 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -24,7 +24,13 @@
         <activity
             android:theme="@android:style/Theme.Holo.Light.NoActionBar"
             android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
-            android:exported="true"/>
+            android:resizeableActivity="true"
+            android:launchMode="singleInstance"
+            android:taskAffinity="cc.winboll.studio.libappbase.task.log"
+            android:configChanges="screenSize|screenLayout|orientation"
+            android:exported="true">
+            
+            </activity>
             
         <service
             android:name=".SimpleOperateSignalCenterService"
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java
index 855b60d..c739743 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java
@@ -6,9 +6,12 @@ package cc.winboll.studio.libappbase.winboll;
  * @Describe 应用日志窗口
  */
 import android.app.Activity;
+import android.os.Build;
 import android.os.Bundle;
+import android.view.WindowManager;
 import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.R;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 
 public class LogActivity extends Activity implements IWinBollActivity {
 
@@ -41,4 +44,5 @@ public class LogActivity extends Activity implements IWinBollActivity {
         super.onResume();
         mLogView.start();
     }
+
 }

From ac627e53b1076450f3b826483dc6f1d9f8780f52 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 14:39:37 +0800
Subject: [PATCH 17/41] =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=A1=AE=E5=AE=9A=EF=BC=8CLog=E5=88=86?=
 =?UTF-8?q?=E5=B1=8F=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.gradle                             |  1 +
 appbase/build.properties                         |  4 ++--
 appbase/src/main/AndroidManifest.xml             |  9 +++++----
 .../cc/winboll/studio/appbase/MainActivity.java  | 16 +++++++++++++++-
 build.gradle                                     |  2 +-
 libappbase/build.gradle                          |  8 ++++++++
 libappbase/build.properties                      |  4 ++--
 libappbase/src/main/AndroidManifest.xml          |  7 ++++---
 8 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/appbase/build.gradle b/appbase/build.gradle
index 4632155..5a0d1d3 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -18,6 +18,7 @@ def genVersionName(def versionName){
 }
 
 android {
+    
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
diff --git a/appbase/build.properties b/appbase/build.properties
index c2ac156..d0d0416 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 25 17:54:33 GMT 2025
+#Wed Mar 26 06:37:55 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=76
+buildCount=89
 baseBetaVersion=15.0.11
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 9f60792..40fd259 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -16,10 +16,8 @@
             android:resizeableActivity="true"
             android:launchMode="singleInstance"
             android:taskAffinity="cc.winboll.studio.appbase.task.main"
-            android:configChanges="screenSize|screenLayout|orientation"
             android:exported="true">
 
-            
             <intent-filter>
 
                 <action android:name="android.intent.action.MAIN"/>
@@ -38,6 +36,7 @@
 
         <service
             android:name=".MyTileService"
+            android:exported="true"
             android:label="@string/tileservice_name"
             android:icon="@drawable/ic_launcher"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
@@ -64,7 +63,8 @@
 
         <service android:name=".services.AssistantService"/>
 
-        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver">
+        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
+            android:exported="true">
 
             <intent-filter>
 
@@ -94,7 +94,8 @@
 
         </receiver>
 
-        <receiver android:name=".receivers.APPNewsWidgetClickListener">
+        <receiver android:name=".receivers.APPNewsWidgetClickListener"
+            android:exported="true">
 
             <intent-filter>
 
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 8624557..e685848 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -1,8 +1,10 @@
 package cc.winboll.studio.appbase;
 
 import android.app.Activity;
+import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Intent;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -176,6 +178,18 @@ public class MainActivity extends Activity implements IWinBollActivity {
     public void onLogActivity() {
         Intent intent = new Intent(MainActivity.this, LogActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class);
+        // Define the bounds.
+        Rect bounds = new Rect(500, 300, 100, 0);
+
+// Set the bounds as an activity option.
+
+        ActivityOptions options = ActivityOptions.makeBasic();
+
+        options.setLaunchBounds(bounds);
+
+        //Intent intent = new Intent(this, LpgActivity.class);
+
+        startActivity(intent, options.toBundle());
+        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class);
     }
 }
diff --git a/build.gradle b/build.gradle
index 491faab..2af2782 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 92cddde..571b164 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -4,6 +4,7 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
+    
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
@@ -21,4 +22,11 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
 }
diff --git a/libappbase/build.properties b/libappbase/build.properties
index c2ac156..d0d0416 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Mar 25 17:54:33 GMT 2025
+#Wed Mar 26 06:37:55 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=76
+buildCount=89
 baseBetaVersion=15.0.11
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index b189cd6..d2ee0f2 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -27,7 +27,6 @@
             android:resizeableActivity="true"
             android:launchMode="singleInstance"
             android:taskAffinity="cc.winboll.studio.libappbase.task.log"
-            android:configChanges="screenSize|screenLayout|orientation"
             android:exported="true">
             
             </activity>
@@ -42,7 +41,8 @@
             android:name=".services.TestService"
             android:exported="true"/>
 
-        <receiver android:name=".receiver.MyBroadcastReceiver">
+        <receiver android:name=".receiver.MyBroadcastReceiver"
+            android:exported="true">
 
             <intent-filter>
 
@@ -84,7 +84,8 @@
 
         <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
 
-        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver">
+        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
+            android:exported="true">
 
             <intent-filter>
 

From d4e4541bfd3e085ccd04d7ec1f00cd3d1520bf6e Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 15:24:26 +0800
Subject: [PATCH 18/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0AppCompatActivity?=
 =?UTF-8?q?=E7=B1=BB=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androiddemo/build.gradle     | 5 +++--
 androiddemo/build.properties | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle
index 4ef2484..e498523 100644
--- a/androiddemo/build.gradle
+++ b/androiddemo/build.gradle
@@ -50,10 +50,11 @@ dependencies {
     api 'com.github.getActivity:ToastUtils:10.5'
 
     // Android 类库
+    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    // https://mvnrepository.com/artifact/com.android.support/support-compat
+    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
     api 'com.android.support:support-v4:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-compat
-    api 'com.android.support:support-compat:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-media-compat
     api 'com.android.support:support-media-compat:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-core-utils
diff --git a/androiddemo/build.properties b/androiddemo/build.properties
index 018d60a..b67201a 100644
--- a/androiddemo/build.properties
+++ b/androiddemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:07:49 GMT 2025
+#Wed Mar 26 07:23:51 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=9
+buildCount=11
 baseBetaVersion=15.0.1

From b3439aa36ae958653faa8a6d1b6c1cd6b9372f47 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 15:34:52 +0800
Subject: [PATCH 19/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Support=E5=BA=93?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.gradle                          | 17 +++++++++++++
 appbase/build.properties                      |  4 ++--
 .../winboll/studio/appbase/MainActivity.java  |  9 ++++---
 appbase/src/main/res/layout/activity_main.xml |  2 +-
 libappbase/build.gradle                       | 24 +++++++++++++------
 libappbase/build.properties                   |  4 ++--
 libappbase/src/main/res/values/styles.xml     |  2 +-
 7 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/appbase/build.gradle b/appbase/build.gradle
index 5a0d1d3..694a91a 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -47,4 +47,21 @@ android {
 dependencies {
     api project(':libappbase')
     api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // Android 类库
+    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    // https://mvnrepository.com/artifact/com.android.support/support-compat
+    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    // https://mvnrepository.com/artifact/com.android.support/support-v4
+    api 'com.android.support:support-v4:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
+    api 'com.android.support:support-media-compat:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
+    api 'com.android.support:support-core-utils:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
+    api 'com.android.support:support-core-ui:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-fragment
+    api 'com.android.support:support-fragment:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
+    api 'com.android.support:recyclerview-v7:28.0.0'
 }
diff --git a/appbase/build.properties b/appbase/build.properties
index d0d0416..50787f7 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 06:37:55 GMT 2025
+#Wed Mar 26 07:32:40 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=89
+buildCount=97
 baseBetaVersion=15.0.11
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 e685848..cf0133e 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -6,11 +6,11 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.appbase.activities.NewActivity;
 import cc.winboll.studio.appbase.services.MainService;
@@ -24,8 +24,9 @@ import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.winboll.LogActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import android.support.v7.widget.Toolbar;
 
-public class MainActivity extends Activity implements IWinBollActivity {
+public class MainActivity extends AppCompatActivity implements IWinBollActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -49,7 +50,7 @@ public class MainActivity extends Activity implements IWinBollActivity {
         setContentView(R.layout.activity_main);
 
         mToolbar = findViewById(R.id.toolbar);
-        setActionBar(mToolbar);
+        setSupportActionBar(mToolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
@@ -176,6 +177,8 @@ public class MainActivity extends Activity implements IWinBollActivity {
     }
 
     public void onLogActivity() {
+        
+        
         Intent intent = new Intent(MainActivity.this, LogActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
         // Define the bounds.
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 81cf153..b86b6d4 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
+	<android.support.v7.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 571b164..8b65344 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -22,11 +22,21 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'com.google.android.material:material:1.4.0'
-    //api 'androidx.viewpager:viewpager:1.0.0'
-    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
+    
+    // Android 类库
+    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    // https://mvnrepository.com/artifact/com.android.support/support-compat
+    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    // https://mvnrepository.com/artifact/com.android.support/support-v4
+    api 'com.android.support:support-v4:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
+    api 'com.android.support:support-media-compat:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
+    api 'com.android.support:support-core-utils:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
+    api 'com.android.support:support-core-ui:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-fragment
+    api 'com.android.support:support-fragment:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
+    api 'com.android.support:recyclerview-v7:28.0.0'
 }
diff --git a/libappbase/build.properties b/libappbase/build.properties
index d0d0416..50787f7 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 06:37:55 GMT 2025
+#Wed Mar 26 07:32:40 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=89
+buildCount=97
 baseBetaVersion=15.0.11
diff --git a/libappbase/src/main/res/values/styles.xml b/libappbase/src/main/res/values/styles.xml
index da69f41..13f26cd 100644
--- a/libappbase/src/main/res/values/styles.xml
+++ b/libappbase/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?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>
 

From 529f420668e138963c7a45290213a0bc9d272a3d Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 15:36:49 +0800
Subject: [PATCH 20/41] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.gradle        | 17 -----------------
 appbase/build.properties    |  4 ++--
 libappbase/build.properties |  4 ++--
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/appbase/build.gradle b/appbase/build.gradle
index 694a91a..5a0d1d3 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -47,21 +47,4 @@ android {
 dependencies {
     api project(':libappbase')
     api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
-    // https://mvnrepository.com/artifact/com.android.support/support-compat
-    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
-    // https://mvnrepository.com/artifact/com.android.support/support-v4
-    api 'com.android.support:support-v4:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    api 'com.android.support:support-media-compat:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    api 'com.android.support:support-core-utils:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    api 'com.android.support:support-core-ui:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    api 'com.android.support:support-fragment:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    api 'com.android.support:recyclerview-v7:28.0.0'
 }
diff --git a/appbase/build.properties b/appbase/build.properties
index 50787f7..5cce835 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:32:40 GMT 2025
+#Wed Mar 26 07:35:36 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=97
+buildCount=98
 baseBetaVersion=15.0.11
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 50787f7..5cce835 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:32:40 GMT 2025
+#Wed Mar 26 07:35:36 GMT 2025
 stageCount=11
 libraryProject=libappbase
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=97
+buildCount=98
 baseBetaVersion=15.0.11

From d4986c6ba49cfc1f10335893a176991c1fd90665 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 15:39:37 +0800
Subject: [PATCH 21/41] =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E4=BD=BF=E7=94=A8Suppo?=
 =?UTF-8?q?rt=20V7=20=E7=89=88=E5=AE=89=E5=8D=93=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=89=88=E6=9C=AC=E5=8F=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.gradle        |  2 +-
 appbase/build.properties    | 12 ++++++------
 libappbase/build.properties | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/appbase/build.gradle b/appbase/build.gradle
index 5a0d1d3..85ff4b5 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -30,7 +30,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
+        versionName "15.1"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
diff --git a/appbase/build.properties b/appbase/build.properties
index 5cce835..52ccd85 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:35:36 GMT 2025
-stageCount=11
+#Wed Mar 26 07:38:00 GMT 2025
+stageCount=0
 libraryProject=libappbase
-baseVersion=15.0
-publishVersion=15.0.10
-buildCount=98
-baseBetaVersion=15.0.11
+baseVersion=15.1
+publishVersion=15.1.0
+buildCount=1
+baseBetaVersion=15.1.10
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 5cce835..52ccd85 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:35:36 GMT 2025
-stageCount=11
+#Wed Mar 26 07:38:00 GMT 2025
+stageCount=0
 libraryProject=libappbase
-baseVersion=15.0
-publishVersion=15.0.10
-buildCount=98
-baseBetaVersion=15.0.11
+baseVersion=15.1
+publishVersion=15.1.0
+buildCount=1
+baseBetaVersion=15.1.10

From 8bdd42ce682d79f00cb01badd65998b8f8ac94e0 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 15:43:05 +0800
Subject: [PATCH 22/41] <appbase>APK 15.1.0 release Publish.

---
 appbase/build.properties    | 8 ++++----
 libappbase/build.properties | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 52ccd85..b15d5c7 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:38:00 GMT 2025
-stageCount=0
+#Wed Mar 26 15:43:05 HKT 2025
+stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=1
-baseBetaVersion=15.1.10
+buildCount=0
+baseBetaVersion=15.1.1
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 52ccd85..b15d5c7 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:38:00 GMT 2025
-stageCount=0
+#Wed Mar 26 15:43:05 HKT 2025
+stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=1
-baseBetaVersion=15.1.10
+buildCount=0
+baseBetaVersion=15.1.1

From 56a13b4a40142fd142cd5f36fdc98b678a3f8442 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 15:43:27 +0800
Subject: [PATCH 23/41] <libappbase>Library Release 15.1.0

---
 appbase/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index b15d5c7..18d898d 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,5 +1,5 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 15:43:05 HKT 2025
+#Wed Mar 26 15:43:21 HKT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1

From 2074f68ef380f3d346f13c7154c6b2c360001912 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Wed, 26 Mar 2025 19:32:21 +0800
Subject: [PATCH 24/41] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +--
 .../winboll/studio/appbase/MainActivity.java  | 22 ++-----------
 appbase/src/main/res/layout/activity_new2.xml |  7 -----
 libappbase/build.properties                   |  4 +--
 .../studio/libappbase/GlobalApplication.java  | 10 +++---
 .../winboll/WinBollActivityManager.java       | 31 ++++++++++++++++++-
 6 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 18d898d..7aa16af 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 15:43:21 HKT 2025
+#Wed Mar 26 11:30:27 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=0
+buildCount=17
 baseBetaVersion=15.1.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 cf0133e..7892864 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            onLogActivity();
+            WinBollActivityManager.getInstance(this).startLogActivity(this);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
@@ -176,23 +176,5 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
     }
 
-    public void onLogActivity() {
-        
-        
-        Intent intent = new Intent(MainActivity.this, LogActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-        // Define the bounds.
-        Rect bounds = new Rect(500, 300, 100, 0);
-
-// Set the bounds as an activity option.
-
-        ActivityOptions options = ActivityOptions.makeBasic();
-
-        options.setLaunchBounds(bounds);
-
-        //Intent intent = new Intent(this, LpgActivity.class);
-
-        startActivity(intent, options.toBundle());
-        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class);
-    }
+    
 }
diff --git a/appbase/src/main/res/layout/activity_new2.xml b/appbase/src/main/res/layout/activity_new2.xml
index 1a610ed..b3352af 100644
--- a/appbase/src/main/res/layout/activity_new2.xml
+++ b/appbase/src/main/res/layout/activity_new2.xml
@@ -30,13 +30,6 @@
 		android:textAllCaps="false"
 		android:onClick="onCloseAllActivity"/>
 
-	<Button
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="CloseAllActivity"
-		android:textAllCaps="false"
-		android:onClick="onCloseAllActivity"/>
-
 	<Button
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/libappbase/build.properties b/libappbase/build.properties
index b15d5c7..7aa16af 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 15:43:05 HKT 2025
+#Wed Mar 26 11:30:27 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=0
+buildCount=17
 baseBetaVersion=15.1.1
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 87fc9a3..86519ea 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -87,11 +87,11 @@ public class GlobalApplication extends Application {
         // 初始化 Toast 框架
         ToastUtils.init(this);
 
-//        mWinBollActivityManager = WinBollActivityManager.getInstance(this);
-//        mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-//        // 注册回调
-//        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager);
-//        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        mWinBollActivityManager = WinBollActivityManager.getInstance(this);
+        mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        // 注册回调
+        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager);
+        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
 
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
index 3bfacd3..e0283c2 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -9,9 +9,11 @@ package cc.winboll.studio.libappbase.winboll;
  * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
  */
 import android.app.ActivityManager;
+import android.app.ActivityOptions;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Rect;
 import cc.winboll.studio.libappbase.LogUtils;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -134,6 +136,33 @@ public class WinBollActivityManager {
         }
     }
 
+    public <T extends IWinBollActivity> void startLogActivity(Context context) {
+        // 如果窗口已存在就重启窗口
+        String tag = LogActivity.TAG;
+        if (isActive(tag)) {
+            resumeActivity(context, tag);
+            return;
+        }
+
+        // 新建一个任务窗口
+        Intent intent = new Intent(context, LogActivity.class);
+        //打开多任务窗口 flags
+        // Define the bounds.
+//        Rect bounds = new Rect(0, 0, 800, 200);
+//        // Set the bounds as an activity option.
+//        ActivityOptions options = ActivityOptions.makeBasic();
+//        options.setLaunchBounds(bounds);
+        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
+        //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        /*intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        
+        intent.putExtra(EXTRA_TAG, tag);
+        */
+        //context.startActivity(intent, options.toBundle());
+        context.startActivity(intent);
+    }
+
     public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
         return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
     }
@@ -142,7 +171,7 @@ public class WinBollActivityManager {
     // 判断 tag绑定的 MyActivity是否存在
     //
     public boolean isActive(String tag) {
-        //printAvtivityListInfo();
+        printIWinBollListInfo();
         IWinBollActivity iWinBoll = getIWinBoll(tag);
         if (iWinBoll != null) {
             LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);

From e2b6fadd433dfba6e432f5d5826808717cc87ec6 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 01:05:52 +0800
Subject: [PATCH 25/41] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E5=B1=8F?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E5=88=87=E6=8D=A2=E5=A4=B1=E6=95=88=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=89=8B=E5=8A=A8=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=87=BA=E4=BB=BB=E5=8A=A1=E6=A0=8F=E8=A7=86=E5=9B=BE=E5=86=8D?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E5=88=86=E5=B1=8F=E4=BB=BB=E5=8A=A1=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=BF=99=E6=97=B6=E5=B0=B1=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=AF=94=E4=BE=8B=E3=80=82=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E5=BA=94=E7=94=A8=E8=B0=83=E5=87=BA=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=BC=B9=E5=87=BA=E6=97=B6=E4=B8=8D=E5=9C=A8?=
 =?UTF-8?q?=E5=8E=9F=E5=BA=94=E7=94=A8=E7=AA=97=E5=8F=A3=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                       |  4 ++--
 appbase/src/main/AndroidManifest.xml           | 18 +++++++++++-------
 .../appbase/activities/New2Activity.java       |  4 ++--
 .../studio/appbase/activities/NewActivity.java |  4 ++--
 libappbase/build.properties                    |  4 ++--
 libappbase/src/main/AndroidManifest.xml        | 10 ++++------
 .../winboll/WinBollActivityManager.java        | 16 ++++++++--------
 7 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 7aa16af..9acc40d 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 11:30:27 GMT 2025
+#Wed Mar 26 16:59:16 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=17
+buildCount=42
 baseBetaVersion=15.1.1
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 40fd259..26bddb9 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -13,10 +13,9 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:exported="true"
             android:resizeableActivity="true"
-            android:launchMode="singleInstance"
-            android:taskAffinity="cc.winboll.studio.appbase.task.main"
-            android:exported="true">
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
 
             <intent-filter>
 
@@ -32,7 +31,15 @@
 
         </activity>
 
-        <activity android:name=".GlobalApplication$CrashActivity"/>
+        <activity android:name=".activities.NewActivity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+
+        <activity android:name=".activities.New2Activity"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
 
         <service
             android:name=".MyTileService"
@@ -111,9 +118,6 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
-        <activity android:name=".activities.NewActivity"/>
-
-        <activity android:name=".activities.New2Activity"/>
 
     </application>
 
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
index 0df980f..a322390 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -7,13 +7,13 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class New2Activity extends Activity implements IWinBollActivity {
+public class New2Activity extends AppCompatActivity implements IWinBollActivity {
 
     public static final String TAG = "New2Activity";
 
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
index 3a7c370..d44f864 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -6,13 +6,13 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class NewActivity extends Activity implements IWinBollActivity {
+public class NewActivity extends AppCompatActivity implements IWinBollActivity {
 
     public static final String TAG = "NewActivity";
 
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 7aa16af..9acc40d 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 11:30:27 GMT 2025
+#Wed Mar 26 16:59:16 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=17
+buildCount=42
 baseBetaVersion=15.1.1
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index d2ee0f2..2ce8228 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -22,15 +22,13 @@
             android:launchMode="standard"/>
 
         <activity
-            android:theme="@android:style/Theme.Holo.Light.NoActionBar"
             android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
             android:resizeableActivity="true"
-            android:launchMode="singleInstance"
-            android:taskAffinity="cc.winboll.studio.libappbase.task.log"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true">
-            
-            </activity>
-            
+
+        </activity>
+
         <service
             android:name=".SimpleOperateSignalCenterService"
             android:exported="true">
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
index e0283c2..2857d56 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -9,12 +9,11 @@ package cc.winboll.studio.libappbase.winboll;
  * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
  */
 import android.app.ActivityManager;
-import android.app.ActivityOptions;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Rect;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -100,6 +99,7 @@ public class WinBollActivityManager {
                 resumeActivity(context, tag);
                 return;
             }
+            ToastUtils.show("startWinBollActivity(Context context, Class<T> clazz)");
 
             // 新建一个任务窗口
             Intent intent = new Intent(context, clazz);
@@ -108,7 +108,7 @@ public class WinBollActivityManager {
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(EXTRA_TAG, tag);
-            mContext.startActivity(intent);
+            context.startActivity(intent);
         } catch (InstantiationException | IllegalAccessException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
@@ -130,7 +130,7 @@ public class WinBollActivityManager {
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(EXTRA_TAG, tag);
-            mContext.startActivity(intent);
+            context.startActivity(intent);
         } catch (InstantiationException | IllegalAccessException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
@@ -153,12 +153,12 @@ public class WinBollActivityManager {
 //        ActivityOptions options = ActivityOptions.makeBasic();
 //        options.setLaunchBounds(bounds);
         intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-        //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        /*intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
         intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-        
+
         intent.putExtra(EXTRA_TAG, tag);
-        */
+
         //context.startActivity(intent, options.toBundle());
         context.startActivity(intent);
     }

From 08f990de651b5b00b17c5df6112bfadf897b2291 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 10:42:58 +0800
Subject: [PATCH 26/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=A0=87=E7=AD=BE=E6=9F=A5=E6=89=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |   4 +-
 libappbase/build.properties                   |   4 +-
 .../cc/winboll/studio/libappbase/LogView.java | 122 +++++++++++++++++-
 .../libappbase/views/HorizontalListView.java  |  84 ++++++++++--
 libappbase/src/main/res/layout/view_log.xml   |  10 +-
 5 files changed, 208 insertions(+), 16 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 9acc40d..5f18ea0 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 16:59:16 GMT 2025
+#Thu Mar 27 02:41:16 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=42
+buildCount=91
 baseBetaVersion=15.1.1
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 9acc40d..5f18ea0 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 16:59:16 GMT 2025
+#Thu Mar 27 02:41:16 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=42
+buildCount=91
 baseBetaVersion=15.1.1
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
index 9b8721d..85a0194 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
@@ -10,6 +10,7 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,6 +19,7 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
+import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Spinner;
@@ -31,6 +33,9 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import android.text.Editable;
+import android.widget.HorizontalScrollView;
 
 public class LogView extends RelativeLayout {
 
@@ -42,6 +47,7 @@ public class LogView extends RelativeLayout {
     Context mContext;
     ScrollView mScrollView;
     TextView mTextView;
+    EditText metTagSearch;
     CheckBox mSelectableCheckBox;
     CheckBox mSelectAllTAGCheckBox;
     TAGListAdapter mTAGListAdapter;
@@ -107,9 +113,41 @@ public class LogView extends RelativeLayout {
         //
         mScrollView = findViewById(cc.winboll.studio.libappbase.R.id.viewlogScrollViewLog);
         mTextView = findViewById(cc.winboll.studio.libappbase.R.id.viewlogTextViewLog);
+        metTagSearch = findViewById(cc.winboll.studio.libappbase.R.id.tagsearch_et);
         // 获取Log Level spinner实例
         mLogLevelSpinner = findViewById(cc.winboll.studio.libappbase.R.id.viewlogSpinner1);
 
+        metTagSearch.addTextChangedListener(new TextWatcher() {
+
+                @Override
+                public void afterTextChanged(Editable editable) {
+                }
+
+                @Override
+                public void beforeTextChanged(CharSequence charSequence, int p, int p1, int p2) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    LogUtils.d(TAG, s.toString());
+                    if (s.length() > 0) {
+                        scrollToTag(s.toString());
+                    } else {
+                        HorizontalScrollView hsRoot = findViewById(R.id.viewlogHorizontalScrollView1);
+                        hsRoot.smoothScrollTo(0, 0);
+                        mListViewTags.resetScrollToStart();
+                    }
+//                    mListViewTags.postDelayed(new Runnable() {
+//                            @Override
+//                            public void run() {
+//                                mListViewTags.scrollToItem(5);
+//                            }
+//                        }, 100);
+                }
+                // 其他方法留空或按需实现
+            });
+
+
         (findViewById(cc.winboll.studio.libappbase.R.id.viewlogButtonClean)).setOnClickListener(new View.OnClickListener(){
 
                 @Override
@@ -233,6 +271,60 @@ public class LogView extends RelativeLayout {
         scrollLogUp();
     }
 
+    public void scrollToTag(final String prefix) {
+        if (mTAGListAdapter == null || prefix == null || prefix.length() == 0) {
+            LogUtils.d(TAG, "参数为空，无法滚动");
+            return;
+        }
+
+        final List<TAGItemModel> itemList = mTAGListAdapter.getItemList();
+        
+        mListViewTags.post(new Runnable() {
+                @Override
+                public void run() {
+                    // 查找匹配的标签位置
+                    int targetPosition = -1;
+                    
+                    for (int i = 0; i < itemList.size(); i++) {
+                        String tag = itemList.get(i).getTag();
+                        if (tag != null && tag.toLowerCase().startsWith(prefix.toLowerCase())) {
+                            targetPosition = i;
+                            
+                            break;
+                        }
+                    }
+
+                    if (targetPosition != -1) {
+                        // 优化滚动逻辑
+                        //mListViewTags.setSelection(targetPosition);
+                        //mListViewTags.invalidateViews(); // 强制刷新所有可见项
+
+                        // 单独刷新目标视图
+//                        View targetView = mListViewTags.getChildAt(targetPosition);
+//                        if (targetView != null) {
+//                            targetView.requestLayout();
+//                            targetView.requestFocus();
+//                        }
+                        
+                        final int scrollPosition = targetPosition;
+
+                        // 延迟滚动确保布局完成
+                        mListViewTags.postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    LogUtils.d(TAG, String.format("scrollPosition %d", scrollPosition));
+                                    mListViewTags.scrollToItem(scrollPosition);
+                                }
+                            }, 100);
+                    } else {
+                        LogUtils.d(TAG, "未找到匹配的标签前缀：" + prefix);
+                    }
+                }
+            });
+    }
+    
+
+
     class LogViewHandler extends Handler {
 
         final static int MSG_LOGVIEW_UPDATE = 0;
@@ -300,6 +392,30 @@ public class LogView extends RelativeLayout {
         public void setChecked(boolean checked) {
             isChecked = checked;
         }
+
+        // getter/setter...
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            TAGItemModel that = (TAGItemModel) o;
+            // 手动处理空值比较（Java 6 不支持 Objects.equals）
+            if (tag == null) {
+                return that.tag == null;
+            } else {
+                return tag.equals(that.tag);
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return tag == null ? 0 : tag.hashCode(); // 手动处理空值
+        }
     }
 
 
@@ -315,6 +431,10 @@ public class LogView extends RelativeLayout {
             loadMap(mapOrigin);
         }
         
+        public List<TAGItemModel> getItemList() {
+            return itemList;
+        }
+
         @Override
         public int getCount() {
             return itemList.size();
@@ -344,7 +464,7 @@ public class LogView extends RelativeLayout {
             loadMap(mapOrigin);
             super.notifyDataSetChanged();
         }
-        
+
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             ViewHolder holder;
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java
index 782d8fa..083b3a4 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java
@@ -9,23 +9,34 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ListView;
+import android.widget.Scroller;
 import cc.winboll.studio.libappbase.LogUtils;
 
 public class HorizontalListView extends ListView {
-
     public static final String TAG = "HorizontalListView";
-    int verticalOffset = 0;
+    private int verticalOffset = 0;
+    private Scroller scroller;
+    private int totalWidth;
 
     public HorizontalListView(Context context) {
         super(context);
+        init();
     }
 
     public HorizontalListView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        init();
     }
 
     public HorizontalListView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        scroller = new Scroller(getContext());
+        setHorizontalScrollBarEnabled(true);
+        setVerticalScrollBarEnabled(false);
     }
 
     public void setVerticalOffset(int verticalOffset) {
@@ -38,28 +49,81 @@ public class HorizontalListView extends ListView {
         int childCount = getChildCount();
         int left = getPaddingLeft();
         int viewHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
-        LogUtils.d(TAG, String.format("HorizontalListView的高度 %d", viewHeight));
-        
+        totalWidth = left;
+
         for (int i = 0; i < childCount; i++) {
             View child = getChildAt(i);
-            // 计算每个子视图的宽度和高度
             int width = child.getMeasuredWidth();
             int height = child.getMeasuredHeight();
-            //LogUtils.d(TAG, String.format("child : width %d , height %d", width, height));
-            // 设置子视图的位置，实现水平布局
-
             child.layout(left, verticalOffset, left + width, verticalOffset + height);
             left += width;
         }
+        totalWidth = left + getPaddingRight();
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
-        //super.onMeasure(widthMeasureSpec, newHeightMeasureSpec);
         int newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
-        //LogUtils.d(TAG, String.format("newWidthMeasureSpec %d, newHeightMeasureSpec %d", newWidthMeasureSpec, newHeightMeasureSpec));
         super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec);
     }
+
+    @Override
+    public void computeScroll() {
+        if (scroller.computeScrollOffset()) {
+            scrollTo(scroller.getCurrX(), scroller.getCurrY());
+            postInvalidate();
+        }
+    }
+
+    public void smoothScrollTo(int x, int y) {
+        int dx = x - getScrollX();
+        int dy = y - getScrollY();
+        scroller.startScroll(getScrollX(), getScrollY(), dx, dy, 300); // 300ms平滑动画
+        invalidate();
+    }
+
+    @Override
+    public int computeHorizontalScrollRange() {
+        return totalWidth;
+    }
+
+    @Override
+    public int computeHorizontalScrollOffset() {
+        return getScrollX();
+    }
+
+    @Override
+    public int computeHorizontalScrollExtent() {
+        return getWidth();
+    }
+
+    public void scrollToItem(int position) {
+        if (position < 0 || position >= getChildCount()) {
+            LogUtils.d(TAG, "无效的position: " + position);
+            return;
+        }
+
+        View targetView = getChildAt(position);
+        int targetLeft = targetView.getLeft();
+        int scrollX = targetLeft - getPaddingLeft();
+
+        // 修正最大滚动范围计算
+        int maxScrollX = totalWidth;
+        scrollX = Math.max(0, Math.min(scrollX, maxScrollX));
+
+        // 强制重新布局和绘制
+        requestLayout();
+        invalidateViews();
+        smoothScrollTo(scrollX, 0);
+        LogUtils.d(TAG, String.format("滚动到position: %d, scrollX: %d computeHorizontalScrollRange() %d", position, scrollX, computeHorizontalScrollRange()));
+    }
+    
+    public void resetScrollToStart() {
+        // 强制重新布局和绘制
+        requestLayout();
+        invalidateViews();
+        smoothScrollTo(0, 0);
+    }
 }
 
diff --git a/libappbase/src/main/res/layout/view_log.xml b/libappbase/src/main/res/layout/view_log.xml
index f0857d4..cb03dba 100644
--- a/libappbase/src/main/res/layout/view_log.xml
+++ b/libappbase/src/main/res/layout/view_log.xml
@@ -83,13 +83,21 @@
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>
 
+		<EditText
+			android:layout_width="50dp"
+			android:ems="10"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:id="@+id/tagsearch_et"/>
+
 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:background="@drawable/bg_border"
 			android:scrollbars="none"
 			android:padding="5dp"
-			android:layout_weight="1.0">
+			android:layout_weight="1.0"
+			android:id="@+id/viewlogHorizontalScrollView1">
 
 			<cc.winboll.studio.libappbase.views.HorizontalListView
 				android:layout_width="wrap_content"

From bc0eb69edfcbef4c95ad17f422c27500ee8206b5 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 11:44:58 +0800
Subject: [PATCH 27/41] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E7=B3=BB=E7=BB=9F=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.gradle    | 2 +-
 libappbase/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appbase/build.gradle b/appbase/build.gradle
index 85ff4b5..366a201 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -24,7 +24,7 @@ android {
 
     defaultConfig {
         applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 8b65344..d1573fd 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -9,7 +9,7 @@ android {
     buildToolsVersion "32.0.0"
 
     defaultConfig {
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
     }
     buildTypes {

From 31bad8a279bd03607eb671d1f9a2b78c58fc894b Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 11:45:40 +0800
Subject: [PATCH 28/41] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../studio/libappbase/winboll/WinBollActivityManager.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
index 2857d56..5e65b97 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -274,7 +274,7 @@ public class WinBollActivityManager {
                 // ★：0 1 2 [3] 4 >> 2
                 // ★：0 1 2 3 [4] >> 3
                 // ★：[0] >> 直接关闭当前窗口
-                LogUtils.d(TAG, "finish no yet.");
+                //LogUtils.d(TAG, "finish no yet.");
                 IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
                 iWinBoll.getActivity().finish();
                 if (preIWinBoll != null) {
@@ -297,7 +297,7 @@ public class WinBollActivityManager {
             for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
                 if (entity.getKey().equals(iWinBoll.getTag())) {
                     bingo = true;
-                    LogUtils.d(TAG, "bingo");
+                    //LogUtils.d(TAG, "bingo");
                     break;
                 }
                 preIWinBoll = entity.getValue();

From 211eef723291914baaceb67cbf72984f80484e5a Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 11:46:11 +0800
Subject: [PATCH 29/41] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


From 92a9bbb455797b11c133a413aac45af190cce7a1 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 11:46:36 +0800
Subject: [PATCH 30/41] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/winboll/studio/libappbase/LogView.java   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
index 85a0194..345489f 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
@@ -10,6 +10,7 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
+import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -20,6 +21,7 @@ import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.HorizontalScrollView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Spinner;
@@ -33,9 +35,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import android.text.Editable;
-import android.widget.HorizontalScrollView;
 
 public class LogView extends RelativeLayout {
 
@@ -278,18 +277,18 @@ public class LogView extends RelativeLayout {
         }
 
         final List<TAGItemModel> itemList = mTAGListAdapter.getItemList();
-        
+
         mListViewTags.post(new Runnable() {
                 @Override
                 public void run() {
                     // 查找匹配的标签位置
                     int targetPosition = -1;
-                    
+
                     for (int i = 0; i < itemList.size(); i++) {
                         String tag = itemList.get(i).getTag();
                         if (tag != null && tag.toLowerCase().startsWith(prefix.toLowerCase())) {
                             targetPosition = i;
-                            
+
                             break;
                         }
                     }
@@ -305,7 +304,7 @@ public class LogView extends RelativeLayout {
 //                            targetView.requestLayout();
 //                            targetView.requestFocus();
 //                        }
-                        
+
                         final int scrollPosition = targetPosition;
 
                         // 延迟滚动确保布局完成
@@ -322,7 +321,7 @@ public class LogView extends RelativeLayout {
                 }
             });
     }
-    
+
 
 
     class LogViewHandler extends Handler {
@@ -430,7 +429,7 @@ public class LogView extends RelativeLayout {
             mapOrigin = map;
             loadMap(mapOrigin);
         }
-        
+
         public List<TAGItemModel> getItemList() {
             return itemList;
         }

From ada664f4aba02c853a86d7bfaf15273fcca4d37e Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 12:32:24 +0800
Subject: [PATCH 31/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Base=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +-
 .../winboll/studio/appbase/MainActivity.java  |  1 +
 appbase/src/main/res/menu/toolbar_main.xml    |  3 --
 libappbase/build.properties                   |  4 +-
 .../src/main/res/drawable/bg_shadow.xml       |  4 +-
 .../main/res/drawable/ic_dev_connected.xml    | 11 +++++
 .../main/res/drawable/ic_dev_disconnected.xml | 11 +++++
 libappbase/src/main/res/drawable/ic_email.xml | 11 +++++
 .../src/main/res/drawable/ic_email_alert.xml  | 11 +++++
 .../src/main/res/drawable/ic_launcher.xml     | 12 ++---
 .../res/drawable/ic_launcher_background.xml   |  2 +-
 .../src/main/res/drawable/ic_winboll.xml      | 13 +++++
 .../src/main/res/drawable/ic_winboll_help.xml | 27 +++++++++++
 .../src/main/res/drawable/ic_winboll_log.xml  | 41 ++++++++++++++++
 .../src/main/res/drawable/ic_winboll_logo.xml | 48 +++++++++++++++++++
 .../main/res/drawable/ic_winboll_point.xml    | 20 ++++++++
 .../src/main/res/drawable/ic_winbollbeta.xml  | 11 +++++
 .../src/main/res/drawable/shape_gradient.xml  | 10 ++++
 .../src/main/res/drawable/view_border.xml     |  8 ++++
 .../src/main/res/menu/toolbar_appbase.xml     | 25 ++++++++++
 20 files changed, 261 insertions(+), 16 deletions(-)
 create mode 100644 libappbase/src/main/res/drawable/ic_dev_connected.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_dev_disconnected.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_email.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_email_alert.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_winboll.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_winboll_help.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_winboll_log.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_winboll_logo.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_winboll_point.xml
 create mode 100644 libappbase/src/main/res/drawable/ic_winbollbeta.xml
 create mode 100644 libappbase/src/main/res/drawable/shape_gradient.xml
 create mode 100644 libappbase/src/main/res/drawable/view_border.xml
 create mode 100644 libappbase/src/main/res/menu/toolbar_appbase.xml

diff --git a/appbase/build.properties b/appbase/build.properties
index 5f18ea0..2e5f008 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 02:41:16 GMT 2025
+#Thu Mar 27 04:31:35 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=91
+buildCount=103
 baseBetaVersion=15.1.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 7892864..e870ea3 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -65,6 +65,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
diff --git a/appbase/src/main/res/menu/toolbar_main.xml b/appbase/src/main/res/menu/toolbar_main.xml
index a486c96..a5662ee 100644
--- a/appbase/src/main/res/menu/toolbar_main.xml
+++ b/appbase/src/main/res/menu/toolbar_main.xml
@@ -2,8 +2,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
     
-    <item
-        android:id="@+id/item_log"
-        android:title="Log"/>
     
 </menu>
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 5f18ea0..2e5f008 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 02:41:16 GMT 2025
+#Thu Mar 27 04:31:35 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=91
+buildCount=103
 baseBetaVersion=15.1.1
diff --git a/libappbase/src/main/res/drawable/bg_shadow.xml b/libappbase/src/main/res/drawable/bg_shadow.xml
index f4d1bd7..6d3d898 100644
--- a/libappbase/src/main/res/drawable/bg_shadow.xml
+++ b/libappbase/src/main/res/drawable/bg_shadow.xml
@@ -10,8 +10,8 @@
         <shape android:shape="rectangle" > 
             <gradient 
                 android:angle="270" 
-                android:endColor="@color/colorAccent" 
-                android:startColor="@color/colorAccent" /> 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
             <corners 
                 android:bottomLeftRadius="6dip" 
                 android:bottomRightRadius="6dip" 
diff --git a/libappbase/src/main/res/drawable/ic_dev_connected.xml b/libappbase/src/main/res/drawable/ic_dev_connected.xml
new file mode 100644
index 0000000..1fb2f26
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_dev_connected.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,12V14H5V12H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3,15V17H5V15H3M14,15H20V19H14V15M3,18V20H5V18H3M6,18V20H8V18H6M9,18V20H11V18H9Z"/>
+
+</vector>
\ No newline at end of file
diff --git a/libappbase/src/main/res/drawable/ic_dev_disconnected.xml b/libappbase/src/main/res/drawable/ic_dev_disconnected.xml
new file mode 100644
index 0000000..4267975
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_dev_disconnected.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3.88,13.46L2.46,14.88L4.59,17L2.46,19.12L3.88,20.54L6,18.41L8.12,20.54L9.54,19.12L7.41,17L9.54,14.88L8.12,13.46L6,15.59L3.88,13.46M14,15H20V19H14V15Z"/>
+
+</vector>
\ No newline at end of file
diff --git a/libappbase/src/main/res/drawable/ic_email.xml b/libappbase/src/main/res/drawable/ic_email.xml
new file mode 100644
index 0000000..d526b26
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_email.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M22,6C22,4.9 21.1,4 20,4H4C2.9,4 2,4.9 2,6V18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V6M20,6L12,11L4,6H20M20,18H4V8L12,13L20,8V18Z"/>
+
+</vector>
diff --git a/libappbase/src/main/res/drawable/ic_email_alert.xml b/libappbase/src/main/res/drawable/ic_email_alert.xml
new file mode 100644
index 0000000..f3ed613
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_email_alert.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M24,7H22V13H24V7M24,15H22V17H24V15M20,6C20,4.9 19.1,4 18,4H2C0.9,4 0,4.9 0,6V18C0,19.1 0.9,20 2,20H18C19.1,20 20,19.1 20,18V6M18,6L10,11L2,6H18M18,18H2V8L10,13L18,8V18Z"/>
+
+</vector>
diff --git a/libappbase/src/main/res/drawable/ic_launcher.xml b/libappbase/src/main/res/drawable/ic_launcher.xml
index 568f996..21f28b1 100644
--- a/libappbase/src/main/res/drawable/ic_launcher.xml
+++ b/libappbase/src/main/res/drawable/ic_launcher.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true"
-    android:layout_width="24dp"
-	android:layout_height="24dp">
-    <item android:drawable="@drawable/ic_launcher_background"/> 
-    <item 
+    android:clickable="true">
+    <item
+        android:width="256dp"
+        android:height="256dp"
         android:left="0dp" 
         android:top="0dp" 
         android:right="0dp" 
         android:bottom="0dp"
-        android:drawable="@drawable/ic_launcher_foreground"/>
+        android:drawable="@drawable/ic_winboll_logo">
+    </item>
 </layer-list>
diff --git a/libappbase/src/main/res/drawable/ic_launcher_background.xml b/libappbase/src/main/res/drawable/ic_launcher_background.xml
index f63ec09..9486190 100644
--- a/libappbase/src/main/res/drawable/ic_launcher_background.xml
+++ b/libappbase/src/main/res/drawable/ic_launcher_background.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#FF005C12"
+        android:fillColor="@color/colorPrimary"
         android:pathData="M0,0h108v108h-108z" />
     <path
         android:fillColor="#00000000"
diff --git a/libappbase/src/main/res/drawable/ic_winboll.xml b/libappbase/src/main/res/drawable/ic_winboll.xml
new file mode 100644
index 0000000..21f28b1
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_winboll.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true">
+    <item
+        android:width="256dp"
+        android:height="256dp"
+        android:left="0dp" 
+        android:top="0dp" 
+        android:right="0dp" 
+        android:bottom="0dp"
+        android:drawable="@drawable/ic_winboll_logo">
+    </item>
+</layer-list>
diff --git a/libappbase/src/main/res/drawable/ic_winboll_help.xml b/libappbase/src/main/res/drawable/ic_winboll_help.xml
new file mode 100644
index 0000000..564175f
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_winboll_help.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FF000000"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="1.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
+</vector>
diff --git a/libappbase/src/main/res/drawable/ic_winboll_log.xml b/libappbase/src/main/res/drawable/ic_winboll_log.xml
new file mode 100644
index 0000000..011f2b2
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_winboll_log.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M151.49 130.96C151.49 130.96 348.53 130.96 348.53 130.96 348.53 130.96 348.53 393.46 348.53 393.46 348.53 393.46 151.49 393.46 151.49 393.46 151.49 393.46 151.49 130.96 151.49 130.96"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M186.28 207.75C186.28 207.75 304.95 207.75 304.95 207.75 304.95 207.75 304.95 205.97 304.95 205.97 304.95 205.97 186.28 205.97 186.28 205.97 186.28 205.97 186.28 207.75 186.28 207.75"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M186.28 263.52C186.28 263.52 304.95 263.52 304.95 263.52 304.95 263.52 304.95 264.41 304.95 264.41 304.95 264.41 186.28 264.41 186.28 264.41 186.28 264.41 186.28 263.52 186.28 263.52"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M186.28 323.62C186.28 323.62 304.95 323.62 304.95 323.62 304.95 323.62 304.95 320.62 304.95 320.62 304.95 320.62 186.28 320.62 186.28 320.62 186.28 320.62 186.28 323.62 186.28 323.62"/>
+</vector>
diff --git a/libappbase/src/main/res/drawable/ic_winboll_logo.xml b/libappbase/src/main/res/drawable/ic_winboll_logo.xml
new file mode 100644
index 0000000..ea28987
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_winboll_logo.xml
@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="1.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M103.77 307.45C103.02 293.07 104.03 271.24 129.24 248.85 135.25 243.52 141.74 239.48 147.89 236.44 160.24 230.34 171.23 228.28 174.15 227.92 174.31 227.9 174.44 227.89 174.55 227.88 174.66 227.87 174.75 227.86 174.81 227.86 176.62 227.85 216.5 230.02 234.65 253.79 253.9 278.99 266.43 314.66 221.67 356.93 184.69 391.85 179.97 411.36 180.15 411.08"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M248.17 309.83C247.43 295.45 248.43 273.62 273.64 251.23 279.65 245.9 286.14 241.86 292.29 238.82 304.65 232.72 315.63 230.65 318.55 230.3 318.71 230.28 318.84 230.27 318.95 230.26 319.06 230.25 319.15 230.24 319.21 230.24 321.02 230.22 360.9 232.4 379.06 256.17 398.3 281.37 410.83 317.04 366.08 359.31 329.09 394.23 324.37 413.74 324.55 413.46"/>
+    <path
+        android:fillColor="#00000000"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="30.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
+</vector>
diff --git a/libappbase/src/main/res/drawable/ic_winboll_point.xml b/libappbase/src/main/res/drawable/ic_winboll_point.xml
new file mode 100644
index 0000000..48028cc
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_winboll_point.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF1E9B54"
+        android:strokeColor="#FFF8E733"
+        android:strokeWidth="20.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:strokeColor="#FFFFFFFF"
+        android:strokeWidth="1.0"
+        android:strokeLineCap="round"
+        android:strokeMiterLimit="10"
+        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
+</vector>
diff --git a/libappbase/src/main/res/drawable/ic_winbollbeta.xml b/libappbase/src/main/res/drawable/ic_winbollbeta.xml
new file mode 100644
index 0000000..06fa725
--- /dev/null
+++ b/libappbase/src/main/res/drawable/ic_winbollbeta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true">
+    <item android:drawable="@drawable/ic_launcher_background"/> 
+    <item 
+        android:left="0dp" 
+        android:top="0dp" 
+        android:right="0dp" 
+        android:bottom="0dp"
+        android:drawable="@drawable/ic_winboll_logo"/>
+</layer-list>
diff --git a/libappbase/src/main/res/drawable/shape_gradient.xml b/libappbase/src/main/res/drawable/shape_gradient.xml
new file mode 100644
index 0000000..c164fe9
--- /dev/null
+++ b/libappbase/src/main/res/drawable/shape_gradient.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="180"
+        android:endColor="#FFFFFFFF"
+        android:startColor="#FFFFFFFF"
+        android:type="linear" />
+
+    <corners android:radius="10dp" />
+</shape>
diff --git a/libappbase/src/main/res/drawable/view_border.xml b/libappbase/src/main/res/drawable/view_border.xml
new file mode 100644
index 0000000..58b374a
--- /dev/null
+++ b/libappbase/src/main/res/drawable/view_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#000000" /> <!-- 这里可调整边框宽度和颜色 -->
+    <solid android:color="@android:color/transparent" />
+</shape>
diff --git a/libappbase/src/main/res/menu/toolbar_appbase.xml b/libappbase/src/main/res/menu/toolbar_appbase.xml
new file mode 100644
index 0000000..b6236e8
--- /dev/null
+++ b/libappbase/src/main/res/menu/toolbar_appbase.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/item_minimal"
+        android:title="MINIMAL"
+        android:icon="@drawable/ic_winboll_point"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/item_about"
+        android:title="ABOUT"
+        android:icon="@drawable/ic_winboll_logo"
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/item_help"
+        android:title="HELP"
+        android:icon="@drawable/ic_winboll_help"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/item_log"
+        android:title="LOG"
+        android:icon="@drawable/ic_winboll_log"
+        app:showAsAction="always"/>
+</menu>

From 9a53d04050553f9b438da404985b7050cb670aca Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 14:39:26 +0800
Subject: [PATCH 32/41] =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=B8=8E=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=85=A5resumeActivity=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +--
 .../winboll/studio/appbase/MainActivity.java  |  2 ++
 .../appbase/activities/New2Activity.java      | 27 +++++++++++++++++++
 .../appbase/activities/NewActivity.java       | 27 +++++++++++++++++++
 appbase/src/main/res/layout/activity_new.xml  |  8 +++---
 appbase/src/main/res/layout/activity_new2.xml |  6 ++---
 libappbase/build.properties                   |  4 +--
 .../studio/libappbase/GlobalApplication.java  | 23 +++++++++++-----
 .../winboll/WinBollActivityManager.java       | 22 +++++++++------
 9 files changed, 97 insertions(+), 26 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 2e5f008..fb4a17b 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 04:31:35 GMT 2025
+#Thu Mar 27 06:34:28 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=103
+buildCount=116
 baseBetaVersion=15.1.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 e870ea3..bb5fd9b 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -74,6 +74,8 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
             WinBollActivityManager.getInstance(this).startLogActivity(this);
             return true;
+        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
+            moveTaskToBack(true);
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
         return super.onOptionsItemSelected(item);
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
index a322390..b7adf3e 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -8,6 +8,9 @@ package cc.winboll.studio.appbase.activities;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
@@ -17,6 +20,7 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
 
     public static final String TAG = "New2Activity";
 
+    Toolbar mToolbar;
     //LogView mLogView;
 
     @Override
@@ -36,6 +40,9 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
 
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        
     }
 
     @Override
@@ -55,4 +62,24 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
     public void onNewActivity(View view) {
         WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
     }
+    
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            return true;
+        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
+            moveTaskToBack(true);
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
index d44f864..f9059cf 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -7,6 +7,9 @@ package cc.winboll.studio.appbase.activities;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
@@ -16,6 +19,7 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
 
     public static final String TAG = "NewActivity";
 
+    Toolbar mToolbar;
     //LogView mLogView;
 
     @Override
@@ -34,6 +38,9 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
         setContentView(R.layout.activity_new);
 //        mLogView = findViewById(R.id.logview);
 //        mLogView.start();
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        
     }
 
     @Override
@@ -53,4 +60,24 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
     public void onNew2Activity(View view) {
         WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
     }
+    
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            return true;
+        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
+            moveTaskToBack(true);
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/appbase/src/main/res/layout/activity_new.xml b/appbase/src/main/res/layout/activity_new.xml
index 8a1452a..0917de8 100644
--- a/appbase/src/main/res/layout/activity_new.xml
+++ b/appbase/src/main/res/layout/activity_new.xml
@@ -6,11 +6,11 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
-
+    
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/appbase/src/main/res/layout/activity_new2.xml b/appbase/src/main/res/layout/activity_new2.xml
index b3352af..38b5906 100644
--- a/appbase/src/main/res/layout/activity_new2.xml
+++ b/appbase/src/main/res/layout/activity_new2.xml
@@ -6,9 +6,9 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
 
 	<TextView
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 2e5f008..fb4a17b 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 04:31:35 GMT 2025
+#Thu Mar 27 06:34:28 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=103
+buildCount=116
 baseBetaVersion=15.1.1
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 86519ea..0301271 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -27,8 +27,8 @@ public class GlobalApplication extends Application {
     volatile static GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     volatile static boolean isDebuging = false;
-    WinBollActivityManager mWinBollActivityManager;
-    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
+    volatile static WinBollActivityManager _WinBollActivityManager;
+    volatile static MyActivityLifecycleCallbacks _MyActivityLifecycleCallbacks;
 
     public static void setIsDebuging(boolean isDebuging) {
         if (_GlobalApplication != null) {
@@ -44,6 +44,14 @@ public class GlobalApplication extends Application {
 //        editor.apply();
         }
     }
+    
+    public static WinBollActivityManager getWinBollActivityManager() {
+        return _WinBollActivityManager;
+    }
+    
+    public static MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
+        return _MyActivityLifecycleCallbacks;
+    }
 
     static String getAPPBaseModelFilePath() {
         return _GlobalApplication.getDataDir().getPath() + "/APPBaseModel.json";
@@ -87,11 +95,12 @@ public class GlobalApplication extends Application {
         // 初始化 Toast 框架
         ToastUtils.init(this);
 
-        mWinBollActivityManager = WinBollActivityManager.getInstance(this);
-        mWinBollActivityManager.setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        _WinBollActivityManager = WinBollActivityManager.getInstance(this);
+        
+        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
         // 注册回调
-        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(mWinBollActivityManager);
-        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        _MyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(getWinBollActivityManager());
+        registerActivityLifecycleCallbacks(getMyActivityLifecycleCallbacks());
     }
 
 
@@ -99,7 +108,7 @@ public class GlobalApplication extends Application {
     public void onTerminate() {
         super.onTerminate();
         // 注销回调（非必须，但建议释放资源）
-        unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        unregisterActivityLifecycleCallbacks(getMyActivityLifecycleCallbacks());
     }
 
     public static String getAppName(Context context) {
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
index 5e65b97..7b24a65 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -70,7 +70,9 @@ public class WinBollActivityManager {
     // 把Activity添加到管理中
     //
     public <T extends IWinBollActivity> void add(T iWinBoll) {
-        if (isActive(iWinBoll.getTag())) {
+        String tag = ((IWinBollActivity)iWinBoll).getTag();
+        LogUtils.d(TAG, String.format("add(T iWinBoll) tag is %s", tag));
+        if (isActive(tag)) {
             LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
         } else {
             // 设置起始活动窗口，以便最后退出时提问
@@ -94,7 +96,8 @@ public class WinBollActivityManager {
     public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
         try {
             // 如果窗口已存在就重启窗口
-            String tag = clazz.newInstance().getTag();
+            String tag = ((IWinBollActivity)clazz.newInstance()).getTag();
+            LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Class<T> clazz) tag is %s", tag));
             if (isActive(tag)) {
                 resumeActivity(context, tag);
                 return;
@@ -117,7 +120,8 @@ public class WinBollActivityManager {
     public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
         try {
             // 如果窗口已存在就重启窗口
-            String tag = clazz.newInstance().getTag();
+            String tag = ((IWinBollActivity)clazz.newInstance()).getTag();
+            LogUtils.d(TAG, String.format("startWinBollActivity(Context context, Intent intent, Class<T> clazz) tag is %s", tag));
             if (isActive(tag)) {
                 resumeActivity(context, tag);
                 return;
@@ -171,10 +175,11 @@ public class WinBollActivityManager {
     // 判断 tag绑定的 MyActivity是否存在
     //
     public boolean isActive(String tag) {
-        printIWinBollListInfo();
+        LogUtils.d(TAG, String.format("isActive(String tag) tag is %s", tag));
+        //printIWinBollListInfo();
         IWinBollActivity iWinBoll = getIWinBoll(tag);
         if (iWinBoll != null) {
-            LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
+            //LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
             //ToastUtils.show("activity != null tag " + tag);
             //判断是否为 BaseActivity,如果已经销毁，则移除
             if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
@@ -187,12 +192,13 @@ public class WinBollActivityManager {
                 return true;
             }
         } else {
-            LogUtils.d(TAG, String.format("isActive(...) activity == null\ntag : %s", tag));
+            LogUtils.d(TAG, String.format("isActive(...) iWinBoll is null tag by %s", tag));
             return false;
         }
     }
 
     static IWinBollActivity getIWinBoll(String tag) {
+        LogUtils.d(TAG, String.format("getIWinBoll(String tag) %s", tag));
         return _mapIWinBollList.get(tag);
     }
 
@@ -200,7 +206,7 @@ public class WinBollActivityManager {
     // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
     //
     public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
-        LogUtils.d(TAG, "resumeActivty");
+        LogUtils.d(TAG, "resumeActivity(Context context, String tag)");
         T iWinBoll = (T)getIWinBoll(tag);
         //LogUtils.d(TAG, "activity " + activity.getTag());
         if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
@@ -212,6 +218,7 @@ public class WinBollActivityManager {
     // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
     //
     public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
+        LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)");
         ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
         //返回启动它的根任务（home 或者 MainActivity）
         Intent intent = new Intent(context, iWinBoll.getClass());
@@ -219,7 +226,6 @@ public class WinBollActivityManager {
         stackBuilder.addNextIntentWithParentStack(intent);
         stackBuilder.startActivities();
         //moveTaskToFront(YourTaskId, 0);
-        LogUtils.d(TAG, "am.moveTaskToFront");
         //ToastUtils.show("resumeActivity am.moveTaskToFront");
         am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
     }

From d83d46034281bf693e233c8924c6dc31c178db46 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Thu, 27 Mar 2025 19:06:51 +0800
Subject: [PATCH 33/41] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=88=B0=20=5FGlobalAp?=
 =?UTF-8?q?plication=20=E5=AE=9E=E4=BE=8B=E5=8C=96=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8E=E7=8E=B0=E6=9C=89=E5=AE=9E=E4=BE=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +-
 appbase/src/main/AndroidManifest.xml          |  3 +-
 libappbase/build.properties                   |  4 +-
 libappbase/src/main/AndroidManifest.xml       |  7 +++-
 .../studio/libappbase/GlobalApplication.java  | 41 +++++++++++--------
 .../winboll/MyActivityLifecycleCallbacks.java | 20 +++++----
 .../winboll/WinBollActivityManager.java       | 15 ++++---
 7 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index fb4a17b..4469af4 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 06:34:28 GMT 2025
+#Thu Mar 27 10:59:31 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=116
+buildCount=130
 baseBetaVersion=15.1.1
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 26bddb9..a0b2202 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
-        android:resizeableActivity="true">
+        android:resizeableActivity="true"
+        android:process=":App">
 
         <activity
             android:name=".MainActivity"
diff --git a/libappbase/build.properties b/libappbase/build.properties
index fb4a17b..4469af4 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 06:34:28 GMT 2025
+#Thu Mar 27 10:59:31 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=116
+buildCount=130
 baseBetaVersion=15.1.1
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index 2ce8228..3e1fb2d 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -19,13 +19,16 @@
         <activity
             android:name=".GlobalCrashActivity"
             android:label="GlobalCrashActivity"
-            android:launchMode="standard"/>
+            android:launchMode="singleInstance"
+            android:process=":GlobalCrashActivity"/>
 
         <activity
             android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleInstance"
+            android:process=":LogActivity">
 
         </activity>
 
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 0301271..c084d46 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -27,8 +27,7 @@ public class GlobalApplication extends Application {
     volatile static GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     volatile static boolean isDebuging = false;
-    volatile static WinBollActivityManager _WinBollActivityManager;
-    volatile static MyActivityLifecycleCallbacks _MyActivityLifecycleCallbacks;
+    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
 
     public static void setIsDebuging(boolean isDebuging) {
         if (_GlobalApplication != null) {
@@ -44,13 +43,9 @@ public class GlobalApplication extends Application {
 //        editor.apply();
         }
     }
-    
-    public static WinBollActivityManager getWinBollActivityManager() {
-        return _WinBollActivityManager;
-    }
-    
-    public static MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
-        return _MyActivityLifecycleCallbacks;
+
+    public static GlobalApplication getInstance() {
+        return _GlobalApplication;
     }
 
     static String getAPPBaseModelFilePath() {
@@ -73,7 +68,17 @@ public class GlobalApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        _GlobalApplication = this;
+
+        // _GlobalApplication 取值调试部分
+        //
+        boolean is_GlobalApplicationNull = false;
+        if (_GlobalApplication == null) {
+            is_GlobalApplicationNull = true;
+            _GlobalApplication = this;
+        } else {
+            is_GlobalApplicationNull = false;
+            _GlobalApplication = this;
+        }
 
         // 设置应用调试标志
         APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
@@ -95,20 +100,24 @@ public class GlobalApplication extends Application {
         // 初始化 Toast 框架
         ToastUtils.init(this);
 
-        _WinBollActivityManager = WinBollActivityManager.getInstance(this);
-        
-        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        // _GlobalApplication 取值调试部分
+        //
+        LogUtils.d(TAG, String.format("is_GlobalApplicationNull is %s", is_GlobalApplicationNull));
+
+        WinBollActivityManager.getInstance(_GlobalApplication);
+        WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
         // 注册回调
-        _MyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(getWinBollActivityManager());
-        registerActivityLifecycleCallbacks(getMyActivityLifecycleCallbacks());
+        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
+        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
 
     @Override
     public void onTerminate() {
         super.onTerminate();
+        _GlobalApplication = null;
         // 注销回调（非必须，但建议释放资源）
-        unregisterActivityLifecycleCallbacks(getMyActivityLifecycleCallbacks());
+        unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
     public static String getAppName(Context context) {
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
index 2c3ca1f..d634d08 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
@@ -6,22 +6,26 @@ package cc.winboll.studio.libappbase.winboll;
  */
 import android.app.Activity;
 import android.app.Application;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils; 
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity; 
 
 public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
 
     public static final String TAG = "MyActivityLifecycleCallbacks";
     
-    WinBollActivityManager mWinBollActivityManager;
-
+    
     public String mInfo = "";
 
-    public MyActivityLifecycleCallbacks(WinBollActivityManager winBollActivityManager) {
-        mWinBollActivityManager = winBollActivityManager;
+    public MyActivityLifecycleCallbacks() {
+        
+    }
+    
+    WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
     }
 
     void createActivityeInfo(Activity activity) {
@@ -60,7 +64,7 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
         //System.out.println(activity.getLocalClassName() + " was created"); 
         LogUtils.d(TAG, activity.getLocalClassName() + " was created");
         createActivityeInfo(activity);
-        mWinBollActivityManager.add((IWinBollActivity)activity);
+        getWinBollActivityManager().add((IWinBollActivity)activity);
     } 
 
     @Override 
@@ -98,6 +102,6 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
     public void onActivityDestroyed(Activity activity) { 
         //System.out.println(activity.getLocalClassName() + " was destroyed");
         LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-        mWinBollActivityManager.registeRemove((IWinBollActivity)activity);
+        getWinBollActivityManager().registeRemove((IWinBollActivity)activity);
     } 
 }
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
index 7b24a65..fc86be1 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -33,9 +33,9 @@ public class WinBollActivityManager {
 
     Context mContext;
     MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-    static WinBollActivityManager _mWinBollActivityManager;
-    static Map<String, IWinBollActivity> _mapIWinBollList;
-    IWinBollActivity firstIWinBollActivity;
+    static volatile WinBollActivityManager _mWinBollActivityManager;
+    static volatile Map<String, IWinBollActivity> _mapIWinBollList;
+    static volatile IWinBollActivity firstIWinBollActivity;
 
     public WinBollActivityManager(Context context) {
         mContext = context;
@@ -208,6 +208,7 @@ public class WinBollActivityManager {
     public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
         LogUtils.d(TAG, "resumeActivity(Context context, String tag)");
         T iWinBoll = (T)getIWinBoll(tag);
+        LogUtils.d(TAG, String.format("iWinBoll.getTag() %s", iWinBoll.getTag()));
         //LogUtils.d(TAG, "activity " + activity.getTag());
         if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
             resumeActivity(context, iWinBoll);
@@ -219,15 +220,17 @@ public class WinBollActivityManager {
     //
     public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
         LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)");
-        ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager am = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
         //返回启动它的根任务（home 或者 MainActivity）
-        Intent intent = new Intent(context, iWinBoll.getClass());
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
+        Intent intent = new Intent(mContext, iWinBoll.getClass());
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
         stackBuilder.addNextIntentWithParentStack(intent);
         stackBuilder.startActivities();
         //moveTaskToFront(YourTaskId, 0);
         //ToastUtils.show("resumeActivity am.moveTaskToFront");
+        LogUtils.d(TAG, String.format("iWinBoll.getActivity().getTaskId() %d", iWinBoll.getActivity().getTaskId()));
         am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
+        LogUtils.d(TAG, "am.moveTaskToFront");
     }
 
 

From 6ca7b210a6f1b7a88ab19c76a3f11f6c69dce680 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 12:17:48 +0800
Subject: [PATCH 34/41] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libappbase/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index d1573fd..136e634 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     // Android 类库
     api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
     // https://mvnrepository.com/artifact/com.android.support/support-compat
-    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    /*api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
     api 'com.android.support:support-v4:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-media-compat
@@ -39,4 +39,5 @@ dependencies {
     api 'com.android.support:support-fragment:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
+    */
 }

From 6a9434b194353ada79f87a95a53025a46a3881c7 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 13:18:35 +0800
Subject: [PATCH 35/41] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=B4=A9=E6=BA=83=E8=B0=83=E8=AF=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |   4 +-
 .../winboll/studio/appbase/MainActivity.java  |  18 ++--
 .../appbase/activities/New2Activity.java      |   9 +-
 .../appbase/activities/NewActivity.java       |   9 +-
 appbase/src/main/res/layout/activity_main.xml | 102 ++++++++++--------
 libappbase/build.properties                   |   4 +-
 libappbase/src/main/AndroidManifest.xml       |   3 +-
 .../studio/libappbase/CrashHandler.java       |   1 +
 .../studio/libappbase/GlobalApplication.java  |  78 ++++----------
 .../libappbase/GlobalCrashActivity.java       |  30 +-----
 .../winboll/WinBollActivityManager.java       |  42 ++++----
 11 files changed, 133 insertions(+), 167 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 4469af4..6dae496 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
+#Fri Mar 28 05:17:15 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=130
+buildCount=143
 baseBetaVersion=15.1.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 bb5fd9b..2aa8dbe 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -1,12 +1,11 @@
 package cc.winboll.studio.appbase;
 
 import android.app.Activity;
-import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -16,15 +15,14 @@ import cc.winboll.studio.appbase.activities.NewActivity;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
+import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.LogActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import android.support.v7.widget.Toolbar;
 
 public class MainActivity extends AppCompatActivity implements IWinBollActivity {
 
@@ -72,7 +70,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
             return true;
         } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
             moveTaskToBack(true);
@@ -95,6 +93,12 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         boolean isDebuging = ((CheckBox)view).isChecked();
         GlobalApplication.setIsDebuging(isDebuging);
     }
+   
+    public void onPreviewGlobalCrashActivity(View view) {
+        Intent intent = new Intent(this, GlobalCrashActivity.class);
+        intent.putExtra(CrashHandler.EXTRA_CRASH_INFO, "Demo log...");
+        startActivity(intent);
+    }
 
     public void onStartCenter(View view) {
         MainService.startMainService(this);
@@ -176,7 +180,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
     }
 
     public void onTestOpenNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
     }
 
     
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
index b7adf3e..c6f01fa 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -13,6 +13,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
@@ -52,15 +53,15 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
     }
 
     public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBollActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBollActivityManager().finishAll();
     }
 
     public void onNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
     }
     
 
@@ -74,7 +75,7 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
             return true;
         } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
             moveTaskToBack(true);
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
index f9059cf..a2e71ba 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -12,6 +12,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
@@ -50,15 +51,15 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
     }
 
     public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBollActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBollActivityManager().finishAll();
     }
 
     public void onNew2Activity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, New2Activity.class);
     }
     
 
@@ -72,7 +73,7 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
             return true;
         } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
             moveTaskToBack(true);
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index b86b6d4..2f64b56 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -39,28 +39,40 @@
 					android:layout_height="wrap_content"
 					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
 
-				<LinearLayout
-					android:orientation="horizontal"
+				<HorizontalScrollView
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="right|center_vertical">
+					android:layout_height="wrap_content">
 
-					<CheckBox
-						android:layout_width="wrap_content"
+					<LinearLayout
+						android:orientation="horizontal"
 						android:layout_height="wrap_content"
-						android:text="Debug Mode"
-						android:layout_weight="1.0"
-						android:onClick="onSwitchDebugMode"
-						android:id="@+id/activitymainCheckBox1"/>
+						android:gravity="right|center_vertical"
+						android:layout_width="wrap_content">
 
-					<Button
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:text="Test Application CrashReport"
-						android:textAllCaps="false"
-						android:onClick="onTestApplicationCrashReport"/>
+						<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"/>
 
-				</LinearLayout>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Test Application CrashReport"
+							android:textAllCaps="false"
+							android:onClick="onTestApplicationCrashReport"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="PreviewGlobalCrashActivity"
+							android:onClick="onPreviewGlobalCrashActivity"/>
+
+					</LinearLayout>
+
+				</HorizontalScrollView>
 
 				<ScrollView
 					android:layout_width="match_parent"
@@ -72,26 +84,27 @@
 						android:layout_height="wrap_content"
 						android:gravity="right">
 
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+						<LinearLayout
+							android:orientation="horizontal"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content">
 
-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StartCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStartCenter"/>
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StartCenter"
+								android:textAllCaps="false"
+								android:onClick="onStartCenter"/>
+
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StopCenter"
+								android:textAllCaps="false"
+								android:onClick="onStopCenter"/>
+
+						</LinearLayout>
 
-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StopCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStopCenter"/>
-                        </LinearLayout>
-                        
 						<HorizontalScrollView
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
@@ -160,7 +173,6 @@
 
 						</HorizontalScrollView>
 
-
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -181,14 +193,14 @@
 							android:text="TestDemoServiceSOS"
 							android:textAllCaps="false"
 							android:onClick="onTestDemoServiceSOS"/>
-                        
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="TestOpenNewActivity"
-                            android:textAllCaps="false"
-                            android:onClick="onTestOpenNewActivity"/>
-                        
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestOpenNewActivity"
+							android:textAllCaps="false"
+							android:onClick="onTestOpenNewActivity"/>
+
 					</LinearLayout>
 
 				</ScrollView>
@@ -198,6 +210,6 @@
 		</LinearLayout>
 
 	</ScrollView>
-    
+
 </LinearLayout>
 
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 4469af4..6dae496 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
+#Fri Mar 28 05:17:15 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=130
+buildCount=143
 baseBetaVersion=15.1.1
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index 3e1fb2d..535f497 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         <activity
             android:name=".CrashHandler$CrashActivity"
             android:label="CrashActivity"
-            android:launchMode="standard"/>
+            android:launchMode="singleInstance"
+            android:process=":CrashActivity"/>
 
         <activity
             android:name=".GlobalCrashActivity"
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 50564f0..5bfb740 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
@@ -339,6 +339,7 @@ public final class CrashHandler {
                     int padding = dp2px(16);
                     message.setPadding(padding, padding, padding, padding);
                     message.setText(mLog);
+                    message.setTextColor(Color.BLACK);
                     message.setTextIsSelectable(true);
                 }
                 hw.addView(message);
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 c084d46..cc01fbd 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -19,11 +19,6 @@ public class GlobalApplication extends Application {
 
     public static final String TAG = "GlobalApplication";
 
-    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 GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     volatile static boolean isDebuging = false;
@@ -33,14 +28,6 @@ public class GlobalApplication extends Application {
         if (_GlobalApplication != null) {
             GlobalApplication.isDebuging = isDebuging;
             APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging));
-            // 获取SharedPreferences实例
-//        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-//        // 获取编辑器
-//        SharedPreferences.Editor editor = sharedPreferences.edit();
-//        // 保存数据
-//        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
-//        // 提交更改
-//        editor.apply();
         }
     }
 
@@ -56,66 +43,47 @@ public class GlobalApplication extends Application {
         return isDebuging;
     }
 
-    @Override
-    public Context getApplicationContext() {
-        return super.getApplicationContext();
-    }
-
-    public Application getApplication() {
-        return this;
+    public static WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(_GlobalApplication);
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
+        // 保存初始实例
+        _GlobalApplication = this;
+        
+        setIsDebuging(true);
+        // 添加日志模块
+        LogUtils.init(this);
+        //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
+        //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
+        //LogUtils.setALlTAGListEnable(true);
+        //LogUtils.d(TAG, "LogUtils init");
+        // 设置应用异常处理窗口
+        CrashHandler.init(this);
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
 
-        // _GlobalApplication 取值调试部分
-        //
-        boolean is_GlobalApplicationNull = false;
-        if (_GlobalApplication == null) {
-            is_GlobalApplicationNull = true;
-            _GlobalApplication = this;
-        } else {
-            is_GlobalApplicationNull = false;
-            _GlobalApplication = this;
-        }
-
-        // 设置应用调试标志
+        // 应用保存的调试标志
         APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
         if (appBaseModel == null) {
             setIsDebuging(false);
         } else {
             setIsDebuging(appBaseModel.isDebuging());
         }
-
-        LogUtils.init(this);
-        //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
-        //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
-        //LogUtils.setALlTAGListEnable(true);
-        //LogUtils.d(TAG, "LogUtils init");
-
-        // 设置应用异常处理窗口
-        CrashHandler.init(this);
-
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-
-        // _GlobalApplication 取值调试部分
-        //
-        LogUtils.d(TAG, String.format("is_GlobalApplicationNull is %s", is_GlobalApplicationNull));
-
-        WinBollActivityManager.getInstance(_GlobalApplication);
-        WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-        // 注册回调
-        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
-        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        
+//        WinBollActivityManager.getInstance(_GlobalApplication);
+//        WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+//        // 注册回调
+//        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
+//        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
 
     @Override
     public void onTerminate() {
         super.onTerminate();
-        _GlobalApplication = null;
         // 注销回调（非必须，但建议释放资源）
         unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
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 8163acf..f494755 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
@@ -4,26 +4,20 @@ package cc.winboll.studio.libappbase;
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/02/11 00:14:05
  */
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.R;
 
-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;
@@ -47,8 +41,8 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
         mGlobalCrashReportView.setReport(mLog);
         setActionBar(mGlobalCrashReportView.getToolbar());
         
-        getActionBar().setTitle(CrashHandler.TITTLE);
-        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+        getSupportActionBar().setTitle(CrashHandler.TITTLE);
+        getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
     }
 
     @Override
@@ -98,20 +92,4 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
         mGlobalCrashReportView.updateMenuStyle();
         return true;
     }
-
-    void joinQQGroup(String key) {
-        // 创建Intent
-        Intent intent = new Intent();
-        // 设置动作
-        intent.setAction("android.intent.action.VIEW");
-        // 设置数据为网址的URI
-        Uri content_url = Uri.parse("https://www.winboll.cc");
-        intent.setData(content_url);
-        // 添加标志
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        // 设置类名和活动名
-        intent.setClassName("com.android.browser", "com.android.browser.BrowserActivity");
-        // 启动Activity
-        startActivity(intent);
-    }
 }
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
index fc86be1..5876951 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java
@@ -12,6 +12,7 @@ import android.app.ActivityManager;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.HashMap;
@@ -29,27 +30,25 @@ public class WinBollActivityManager {
         };
 
     // 应用类型标志
-    volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
+    static volatile WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
 
-    Context mContext;
-    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-    static volatile WinBollActivityManager _mWinBollActivityManager;
+    GlobalApplication mGlobalApplication;
+    static volatile WinBollActivityManager _Instance;
     static volatile Map<String, IWinBollActivity> _mapIWinBollList;
-    static volatile IWinBollActivity firstIWinBollActivity;
+    volatile IWinBollActivity mFirstIWinBollActivity;
 
-    public WinBollActivityManager(Context context) {
-        mContext = context;
-        LogUtils.d(TAG, "WinBollActivityManager()");
+    WinBollActivityManager(GlobalApplication application) {
+        mGlobalApplication = application;
         _mapIWinBollList = new HashMap<String, IWinBollActivity>();
     }
 
-    public static synchronized WinBollActivityManager getInstance(Context context) {
+    public static synchronized WinBollActivityManager getInstance(GlobalApplication application) {
         LogUtils.d(TAG, "getInstance");
-        if (_mWinBollActivityManager == null) {
-            LogUtils.d(TAG, "_mWinBollActivityManager == null");
-            _mWinBollActivityManager = new WinBollActivityManager(context);
+        if (_Instance == null) {
+            LogUtils.d(TAG, "_Instance == null");
+            _Instance = new WinBollActivityManager(application);
         }
-        return _mWinBollActivityManager;
+        return _Instance;
     }
 
     //
@@ -73,11 +72,12 @@ public class WinBollActivityManager {
         String tag = ((IWinBollActivity)iWinBoll).getTag();
         LogUtils.d(TAG, String.format("add(T iWinBoll) tag is %s", tag));
         if (isActive(tag)) {
-            LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
+            LogUtils.d(TAG, String.format("isActive(tag) is true, tag : %s.", tag));
         } else {
             // 设置起始活动窗口，以便最后退出时提问
-            if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
-                firstIWinBollActivity = iWinBoll;
+            if (mFirstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
+                LogUtils.d(TAG, "Set firstIWinBollActivity, iWinBoll.getTag() is %s" + iWinBoll.getTag());
+                mFirstIWinBollActivity = iWinBoll;
             }
 
             // 添加到活动窗口列表
@@ -168,7 +168,7 @@ public class WinBollActivityManager {
     }
 
     public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
-        return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
+        return mFirstIWinBollActivity != null && mFirstIWinBollActivity == iWinBollActivity;
     }
 
     //
@@ -220,10 +220,10 @@ public class WinBollActivityManager {
     //
     public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
         LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)");
-        ActivityManager am = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager am = (ActivityManager) mGlobalApplication.getSystemService(Context.ACTIVITY_SERVICE);
         //返回启动它的根任务（home 或者 MainActivity）
-        Intent intent = new Intent(mContext, iWinBoll.getClass());
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
+        Intent intent = new Intent(mGlobalApplication, iWinBoll.getClass());
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mGlobalApplication);
         stackBuilder.addNextIntentWithParentStack(intent);
         stackBuilder.startActivities();
         //moveTaskToFront(YourTaskId, 0);
@@ -287,7 +287,7 @@ public class WinBollActivityManager {
                 IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
                 iWinBoll.getActivity().finish();
                 if (preIWinBoll != null) {
-                    resumeActivity(mContext, preIWinBoll);
+                    resumeActivity(mGlobalApplication, preIWinBoll);
                 }
             }
 

From ce05d691324394d2eea2619fe64f952091942b8d Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 13:27:03 +0800
Subject: [PATCH 36/41] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSupport=E9=A3=8E?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84=E5=BA=94=E7=94=A8=E5=B4=A9=E6=BA=83=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                                    | 4 ++--
 libappbase/build.properties                                 | 4 ++--
 .../cc/winboll/studio/libappbase/GlobalCrashActivity.java   | 2 +-
 .../cc/winboll/studio/libappbase/GlobalCrashReportView.java | 2 +-
 libappbase/src/main/res/layout/view_globalcrashreport.xml   | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 6dae496..a11a2d6 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:17:15 GMT 2025
+#Fri Mar 28 05:25:32 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=143
+buildCount=145
 baseBetaVersion=15.1.1
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 6dae496..a11a2d6 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:17:15 GMT 2025
+#Fri Mar 28 05:25:32 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=143
+buildCount=145
 baseBetaVersion=15.1.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 f494755..dbf8c8a 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
@@ -39,7 +39,7 @@ public final class GlobalCrashActivity extends AppCompatActivity implements Menu
         setContentView(R.layout.activity_globalcrash);
         mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
         mGlobalCrashReportView.setReport(mLog);
-        setActionBar(mGlobalCrashReportView.getToolbar());
+        setSupportActionBar(mGlobalCrashReportView.getToolbar());
         
         getSupportActionBar().setTitle(CrashHandler.TITTLE);
         getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
index efdfb3a..533e5da 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
@@ -8,6 +8,7 @@ package cc.winboll.studio.libappbase;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.support.v7.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
@@ -16,7 +17,6 @@ import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import cc.winboll.studio.libappbase.R;
-import android.widget.Toolbar;
 
 public class GlobalCrashReportView extends LinearLayout {
 
diff --git a/libappbase/src/main/res/layout/view_globalcrashreport.xml b/libappbase/src/main/res/layout/view_globalcrashreport.xml
index 1aff5e5..cda2c96 100644
--- a/libappbase/src/main/res/layout/view_globalcrashreport.xml
+++ b/libappbase/src/main/res/layout/view_globalcrashreport.xml
@@ -7,9 +7,9 @@
 	android:layout_height="match_parent"
 	android:id="@+id/viewglobalcrashreportLinearLayout1">
 
-	<android.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		android:id="@+id/viewglobalcrashreportToolbar1"/>
 
 	<ScrollView

From b3075f778d18ef38abe15db6d8c2004e0dc3ef38 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 13:45:45 +0800
Subject: [PATCH 37/41] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 +-
 .../winboll/studio/appbase/MainActivity.java  |  4 +-
 .../appbase/activities/New2Activity.java      |  5 +--
 .../appbase/activities/NewActivity.java       |  5 +--
 libappbase/build.properties                   |  4 +-
 libappbase/src/main/AndroidManifest.xml       | 11 +++--
 .../studio/libappbase/GlobalApplication.java  |  9 ++--
 .../winboll/MyActivityLifecycleCallbacks.java | 15 ++-----
 .../winboll/WinBollActivityBase.java          | 42 +++++++++++++++++++
 9 files changed, 67 insertions(+), 32 deletions(-)
 create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java

diff --git a/appbase/build.properties b/appbase/build.properties
index a11a2d6..71cdb43 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:25:32 GMT 2025
+#Fri Mar 28 05:43:39 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=145
+buildCount=152
 baseBetaVersion=15.1.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 2aa8dbe..ae2bee2 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -23,8 +22,9 @@ import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;
 
-public class MainActivity extends AppCompatActivity implements IWinBollActivity {
+public class MainActivity extends WinBollActivityBase implements IWinBollActivity {
 
     public static final String TAG = "MainActivity";
 
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
index c6f01fa..fbb9b72 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java
@@ -7,7 +7,6 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -15,9 +14,9 @@ import android.view.View;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;
 
-public class New2Activity extends AppCompatActivity implements IWinBollActivity {
+public class New2Activity extends WinBollActivityBase implements IWinBollActivity {
 
     public static final String TAG = "New2Activity";
 
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
index a2e71ba..9bc8286 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java
@@ -6,7 +6,6 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -14,9 +13,9 @@ import android.view.View;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityBase;
 
-public class NewActivity extends AppCompatActivity implements IWinBollActivity {
+public class NewActivity extends WinBollActivityBase implements IWinBollActivity {
 
     public static final String TAG = "NewActivity";
 
diff --git a/libappbase/build.properties b/libappbase/build.properties
index a11a2d6..71cdb43 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:25:32 GMT 2025
+#Fri Mar 28 05:43:39 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=145
+buildCount=152
 baseBetaVersion=15.1.1
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index 535f497..af4418c 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -9,6 +9,9 @@
     <!-- 发送持久广播 -->
     <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
 
+    <!-- 对正在运行的应用重新排序 -->
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
     <application>
 
         <activity
@@ -43,7 +46,8 @@
             android:name=".services.TestService"
             android:exported="true"/>
 
-        <receiver android:name=".receiver.MyBroadcastReceiver"
+        <receiver
+            android:name=".receiver.MyBroadcastReceiver"
             android:exported="true">
 
             <intent-filter>
@@ -86,7 +90,8 @@
 
         <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
 
-        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
+        <receiver
+            android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
             android:exported="true">
 
             <intent-filter>
@@ -99,4 +104,4 @@
 
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
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 cc01fbd..240c13f 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -73,11 +73,10 @@ public class GlobalApplication extends Application {
             setIsDebuging(appBaseModel.isDebuging());
         }
         
-//        WinBollActivityManager.getInstance(_GlobalApplication);
-//        WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-//        // 注册回调
-//        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
-//        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        // 注册窗口回调监听
+        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
+        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
 
 
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
index d634d08..dfe768e 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java
@@ -8,24 +8,17 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
 import android.os.Bundle;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity; 
+import cc.winboll.studio.libappbase.utils.ToastUtils; 
 
 public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
 
     public static final String TAG = "MyActivityLifecycleCallbacks";
-    
-    
+
     public String mInfo = "";
 
     public MyActivityLifecycleCallbacks() {
-        
-    }
-    
-    WinBollActivityManager getWinBollActivityManager() {
-        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+
     }
 
     void createActivityeInfo(Activity activity) {
@@ -64,7 +57,6 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
         //System.out.println(activity.getLocalClassName() + " was created"); 
         LogUtils.d(TAG, activity.getLocalClassName() + " was created");
         createActivityeInfo(activity);
-        getWinBollActivityManager().add((IWinBollActivity)activity);
     } 
 
     @Override 
@@ -102,6 +94,5 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
     public void onActivityDestroyed(Activity activity) { 
         //System.out.println(activity.getLocalClassName() + " was destroyed");
         LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-        getWinBollActivityManager().registeRemove((IWinBollActivity)activity);
     } 
 }
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java
new file mode 100644
index 0000000..d15c352
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java
@@ -0,0 +1,42 @@
+package cc.winboll.studio.libappbase.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 13:35:28
+ * @Describe WinBoll应用窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+
+public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
+
+    public static final String TAG = "WinBollActivityBase";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWinBollActivityManager().add(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getWinBollActivityManager().registeRemove(this);
+    }
+}

From be5ed936dfed4a715e46726b74d98b183bebc86c Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 13:57:26 +0800
Subject: [PATCH 38/41] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=8F=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                              |  4 ++--
 appbase/src/main/AndroidManifest.xml                  |  5 ++++-
 libappbase/build.properties                           |  4 ++--
 libappbase/src/main/AndroidManifest.xml               |  5 +++--
 .../libappbase/winboll/WinBollActivityBase.java       | 11 +++++++++++
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 71cdb43..70f0d31 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:43:39 GMT 2025
+#Fri Mar 28 05:56:15 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=152
+buildCount=153
 baseBetaVersion=15.1.1
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index a0b2202..3ff9087 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -32,12 +32,15 @@
 
         </activity>
 
-        <activity android:name=".activities.NewActivity"
+        <activity
+            android:name=".activities.NewActivity"
+            android:label="NewActivity"
             android:exported="true"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
 
         <activity android:name=".activities.New2Activity"
+            android:label="New2Activity"
             android:exported="true"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 71cdb43..70f0d31 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:43:39 GMT 2025
+#Fri Mar 28 05:56:15 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=152
+buildCount=153
 baseBetaVersion=15.1.1
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index af4418c..dee879c 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -27,7 +27,8 @@
             android:process=":GlobalCrashActivity"/>
 
         <activity
-            android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
+            android:name=".winboll.LogActivity"
+            android:label="LogActivity"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
@@ -104,4 +105,4 @@
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java
index d15c352..1268360 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java
@@ -6,9 +6,13 @@ package cc.winboll.studio.libappbase.winboll;
  * @Describe WinBoll应用窗口基类
  */
 import android.app.Activity;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.R;
 
 public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
 
@@ -34,6 +38,13 @@ public class WinBollActivityBase extends AppCompatActivity implements IWinBollAc
         getWinBollActivityManager().add(this);
     }
 
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+    }
+
+
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

From 80767ca5b5f4407de08c76714e665a462b969e2b Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 14:25:26 +0800
Subject: [PATCH 39/41] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      | 4 ++--
 appbase/src/main/res/layout/activity_main.xml | 1 +
 libappbase/build.gradle                       | 8 +++++---
 libappbase/build.properties                   | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 70f0d31..c509935 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:56:15 GMT 2025
+#Fri Mar 28 06:24:38 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=153
+buildCount=166
 baseBetaVersion=15.1.1
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 2f64b56..193d0cc 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -68,6 +68,7 @@
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:text="PreviewGlobalCrashActivity"
+							android:textAllCaps="false"
 							android:onClick="onPreviewGlobalCrashActivity"/>
 
 					</LinearLayout>
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 136e634..3970a30 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -24,9 +24,12 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    //api 'com.android.support:appcompat-v7:28.0.0'
+    api('com.android.support:appcompat-v7:28.0.0'){
+        exclude group: "com.android.support", module: "support-vector-drawable"
+    }
     // https://mvnrepository.com/artifact/com.android.support/support-compat
-    /*api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
     api 'com.android.support:support-v4:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-media-compat
@@ -39,5 +42,4 @@ dependencies {
     api 'com.android.support:support-fragment:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
-    */
 }
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 70f0d31..c509935 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:56:15 GMT 2025
+#Fri Mar 28 06:24:38 GMT 2025
 stageCount=1
 libraryProject=libappbase
 baseVersion=15.1
 publishVersion=15.1.0
-buildCount=153
+buildCount=166
 baseBetaVersion=15.1.1

From ae680b5b487b47662e7520a8bdabc5460eaa049a Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 14:53:11 +0800
Subject: [PATCH 40/41] <appbase>APK 15.1.1 release Publish.

---
 appbase/build.properties    | 10 +++++-----
 libappbase/build.properties | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index c509935..4f21673 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 06:24:38 GMT 2025
-stageCount=1
+#Fri Mar 28 14:53:11 HKT 2025
+stageCount=2
 libraryProject=libappbase
 baseVersion=15.1
-publishVersion=15.1.0
-buildCount=166
-baseBetaVersion=15.1.1
+publishVersion=15.1.1
+buildCount=0
+baseBetaVersion=15.1.2
diff --git a/libappbase/build.properties b/libappbase/build.properties
index c509935..4f21673 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 06:24:38 GMT 2025
-stageCount=1
+#Fri Mar 28 14:53:11 HKT 2025
+stageCount=2
 libraryProject=libappbase
 baseVersion=15.1
-publishVersion=15.1.0
-buildCount=166
-baseBetaVersion=15.1.1
+publishVersion=15.1.1
+buildCount=0
+baseBetaVersion=15.1.2

From 4ea48a051d3c0a15791e36261d9530551f062b4c Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Fri, 28 Mar 2025 14:53:36 +0800
Subject: [PATCH 41/41] <libappbase>Library Release 15.1.1

---
 appbase/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appbase/build.properties b/appbase/build.properties
index 4f21673..260550b 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,5 +1,5 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 14:53:11 HKT 2025
+#Fri Mar 28 14:53:30 HKT 2025
 stageCount=2
 libraryProject=libappbase
 baseVersion=15.1