<aes>APK 15.20.3 release Publish.

恢复 DrawerFragmentActivity 与 ASupportToolbar 显示正常的版本
重构ASupportToolbar自定义控件，支持AES主题切换
2026-05-12 13:11:09 +08:00 · 2026-05-12 13:08:12 +08:00 · 2026-05-12 10:53:18 +08:00 · 2026-05-12 09:52:57 +08:00 · 2026-05-12 09:26:33 +08:00 · 2026-05-12 09:22:37 +08:00
36 changed files with 351 additions and 310 deletions
--- a/aes/build.gradle
+++ b/aes/build.gradle
@@ -24,13 +24,13 @@ android {
 	
    defaultConfig {
        applicationId "cc.winboll.studio.aes"
-        minSdkVersion 21
+        minSdkVersion 26
        targetSdkVersion 30
        versionCode 1
        // versionName 更新后需要手动设置 
        // 项目模块目录的 build.gradle 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.15" 
+        versionName "15.20" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 04:16:42 HKT 2026
-stageCount=10
+#Tue May 12 13:11:09 HKT 2026
+stageCount=4
 libraryProject=libaes
-baseVersion=15.15
-publishVersion=15.15.9
+baseVersion=15.20
+publishVersion=15.20.3
 buildCount=0
-baseBetaVersion=15.15.10
+baseBetaVersion=15.20.4
--- a/aes/src/main/res/values-night/styles.xml
+++ b/aes/src/main/res/values-night/styles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MyAESTheme" parent="AESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+    </style>
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+</resources>
--- a/aes/src/main/res/values/styles.xml
+++ b/aes/src/main/res/values/styles.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <style name="MyAESTheme" parent="AESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
    </style>
-</resources>
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+</resources>
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon May 11 20:29:55 HKT 2026
-stageCount=9
+#Tue May 12 09:17:15 HKT 2026
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.8
+publishVersion=15.20.9
 buildCount=0
-baseBetaVersion=15.20.9
+baseBetaVersion=15.20.10
--- a/appbase/src/main/res/layout-night/activity_main.xml
+++ b/appbase/src/main/res/layout-night/activity_main.xml
@@ -31,7 +31,7 @@
 				android:text="关于应用"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onAboutActivity"
@@ -43,7 +43,7 @@
 				android:text="应用崩溃测试"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onCrashTest"
@@ -55,7 +55,7 @@
 				android:text="应用日志测试"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTest"
@@ -67,7 +67,7 @@
 				android:text="应用日志测试（新窗口）"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTestNewTask"
@@ -79,7 +79,7 @@
 				android:text="应用吐司测试"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onToastUtilsTest"
@@ -93,7 +93,7 @@
 				android:text="多开窗口"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onMultiInstance"
--- a/appbase/src/main/res/layout/activity_crash_test.xml
+++ b/appbase/src/main/res/layout/activity_crash_test.xml
@@ -35,7 +35,7 @@
 				android:text="返回"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onBack"
@@ -47,7 +47,7 @@
 				android:text="测试崩溃"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onTestCrash"
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -31,7 +31,7 @@
 				android:text="关于应用"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onAboutActivity"
@@ -43,7 +43,7 @@
 				android:text="应用崩溃测试"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onCrashTest"
@@ -55,7 +55,7 @@
 				android:text="应用日志测试"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTest"
@@ -67,7 +67,7 @@
 				android:text="应用日志测试（新窗口）"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTestNewTask"
@@ -79,7 +79,7 @@
 				android:text="应用吐司测试"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onToastUtilsTest"
@@ -93,7 +93,7 @@
 				android:text="多开窗口"
 				android:textSize="16sp"
 				android:textColor="?attr/activityTextColor"
-				android:background="?attr/buttonBackgroundColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onMultiInstance"
--- a/appbase/src/main/res/values-night/styles.xml
+++ b/appbase/src/main/res/values-night/styles.xml
@@ -6,8 +6,9 @@

    <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
        <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
-        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
+        <item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
        <item name="colorText">?attr/debugTextColor</item>
        <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
 	</style>
 </resources>
--- a/appbase/src/main/res/values/styles.xml
+++ b/appbase/src/main/res/values/styles.xml
@@ -6,8 +6,9 @@

    <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
        <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
+        <item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
        <item name="colorText">?attr/debugTextColor</item>
        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
 	</style>
 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -93,11 +93,12 @@ allprojects {
    }
    
    subprojects {
-        // 1. 对纯 Java 模块的 JavaCompile 任务配置（强制Java 7）
+        // 1. 对纯 Java 模块的 JavaCompile 任务配置（升级为 Java 11）
        tasks.withType(JavaCompile) {
            options.compilerArgs << "-parameters"
-            sourceCompatibility = JavaVersion.VERSION_1_7
-            targetCompatibility = JavaVersion.VERSION_1_7
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+            // 可选：确保编码一致
            options.encoding = "UTF-8"
        }
 	}
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -9,7 +9,7 @@ android {
    buildToolsVersion "30.0.3"
 	
    defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
        targetSdkVersion 30
    }
 	
@@ -27,8 +27,6 @@ android {
 }

 dependencies {
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    api 'com.github.getActivity:XXPermissions:18.63'
    // 下拉控件
    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
    // 拼音搜索
@@ -63,7 +61,7 @@ dependencies {
    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.15.19'
+    api 'cc.winboll.studio:libappbase:15.20.9'
 	// 备用库 jitpack.io 地址
 	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
 	
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 04:16:30 HKT 2026
-stageCount=10
+#Tue May 12 13:11:09 HKT 2026
+stageCount=4
 libraryProject=libaes
-baseVersion=15.15
-publishVersion=15.15.9
+baseVersion=15.20
+publishVersion=15.20.3
 buildCount=0
-baseBetaVersion=15.15.10
+baseBetaVersion=15.20.4
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java
@@ -12,6 +12,8 @@ import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.views.ASupportToolbar;
+import cc.winboll.studio.libappbase.LogUtils;

 public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity  {

@@ -29,14 +31,17 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
    
    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreate() start");
        AESThemeUtil.applyAppTheme(this);
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_testasupporttoolbar);
+        LogUtils.d(TAG, "setContentView() done");
        Toolbar toolbar = findViewById(R.id.activitytestasupporttoolbarASupportToolbar1);
+        LogUtils.d(TAG, "findViewById() done, toolbar=" + toolbar.getClass().getSimpleName());
        setSupportActionBar(toolbar);
+        LogUtils.d(TAG, "setSupportActionBar() done");
        getSupportActionBar().setTitle(TAG);
-
+        LogUtils.d(TAG, "setTitle() done");
+        LogUtils.d(TAG, "onCreate() end");
    }
-
-    
 }
--- a/libaes/src/main/res/values-night/colors.xml
+++ b/libaes/src/main/res/values-night/colors.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="colorTextColor">#FFFFFFFF</color>
+    <color name="colorPrimary">#FF03AB4E</color>
+    <color name="colorPrimaryDark">#FF027C39</color>
+    <color name="colorAccent">#FF3DDC84</color>
+    <color name="colorText">#FFFFFB8D</color>
+    <color name="colorToastFrame">#FFA9A9A9</color>
+    <color name="colorToastShadow">#FF000000</color>
+    <color name="colorToastBackgroung">#FFFFFFFF</color>
+    <color name="colorAToolbarStartColor">#FF7D3F12</color>
+    <color name="colorAToolbarCenterColor">#FFCC6E2B</color>
+    <color name="colorAToolbarEndColor">#FFF4B98F</color>
+
+    <color name="colorACardShadow">@color/colorPrimaryDark</color>
+    <color name="colorACardFrame">@color/colorPrimary</color>
+    <color name="colorACardBackgroung">@color/colorAccent</color>
+
+    <color name="colorATickProgressBarBackgroung">@color/colorAccent</color>
+    <color name="colorATickProgressBarProgress">@color/colorPrimary</color>
+
+    <color name="colorOHPCTSBackground">@color/colorAccent</color>
+    <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
+    <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
+
+    <color name="toolbarBackgroundColor">#FF03AB4E</color>
+    <color name="toolbarTextColor">#FFFFFFFF</color>
+    <color name="mainWindowBackgroundColor">#FF2C2C2C</color>
+    <color name="mainWindowTextColor">#FFFFFFFF</color>
+    <color name="debugTextColor">#FFFF0000</color>
+
+</resources>
--- a/libaes/src/main/res/values-night/styles.xml
+++ b/libaes/src/main/res/values-night/styles.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AESTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="themeDebug">@style/DebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">@color/mainWindowTextColor</item>
+        <item name="dialogBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">@color/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">@color/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">@color/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+
+        <item name="aToolbar">@style/AESAToolbar</item>
+        <item name="aSupportToolbar">@style/AESASupportToolbar</item>
+    </style>
+
+    <style name="DebugActivityTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+
+    <style name="AESAToolbar">
+        <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarEndColor">@color/colorAccent</item>
+    </style>
+
+    <style name="AESASupportToolbar">
+        <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
+    </style>
+
+    <style name="DepthAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FF0065EC</item>
+        <item name="colorPrimaryDark">#FF004DB4</item>
+        <item name="colorAccent">#FF4A97FF</item>
+    </style>
+
+    <style name="SkyAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FF00A6FF</item>
+        <item name="colorPrimaryDark">#FF007ABB</item>
+        <item name="colorAccent">#FF84D4FF</item>
+    </style>
+
+    <style name="GoldenAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FFF0CA11</item>
+        <item name="colorPrimaryDark">#FFD3AF00</item>
+        <item name="colorAccent">#FFFFE35C</item>
+    </style>
+
+    <style name="BearingAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FF840FFF</item>
+        <item name="colorPrimaryDark">#FF6900D7</item>
+        <item name="colorAccent">#FFBA78FF</item>
+    </style>
+
+    <style name="MemorAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FFFF00F5</item>
+        <item name="colorPrimaryDark">#FFE500DC</item>
+        <item name="colorAccent">#FFFF76FA</item>
+    </style>
+
+    <style name="TaoAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FFACACAC</item>
+        <item name="colorPrimaryDark">#FF898989</item>
+        <item name="colorAccent">#FFD8D8D8</item>
+    </style>
+
+    <style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@style/cornerDialogAnim</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
+    <style name="centerDialogAnim" parent="android:Animation">
+        <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_center</item>
+        <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_center</item>
+    </style>
+
+    <style name="cornerDialogAnim" parent="android:Animation">
+        <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_corner</item>
+        <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
+    </style>
+
+</resources>
--- a/libaes/src/main/res/values/attrs.xml
+++ b/libaes/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
        <attr name="attrASupportToolbarStartColor"/>
        <attr name="attrASupportToolbarCenterColor"/>
        <attr name="attrASupportToolbarEndColor"/>
+        <attr name="android:background"/>
    </declare-styleable>
    
    <declare-styleable name="AButton">
--- a/libaes/src/main/res/values/colors.xml
+++ b/libaes/src/main/res/values/colors.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
-    <!-- 默认方案 -->
+
+    <color name="colorTextColor">#FF000000</color>
    <color name="colorPrimary">#FF03AB4E</color>
    <color name="colorPrimaryDark">#FF027C39</color>
    <color name="colorAccent">#FF3DDC84</color>
-	<color name="colorText">#FFFFFB8D</color>
+    <color name="colorText">#FFFFFB8D</color>
    <color name="colorToastFrame">#FFA9A9A9</color>
    <color name="colorToastShadow">#FF000000</color>
    <color name="colorToastBackgroung">#FFFFFFFF</color>
@@ -24,22 +24,10 @@
    <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
    <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>

-    <!-- -->
+    <color name="toolbarBackgroundColor">#FF03AB4E</color>
+    <color name="toolbarTextColor">#FFFFFFFF</color>
+    <color name="mainWindowBackgroundColor">#FFFFFFFF</color>
+    <color name="mainWindowTextColor">#FF000000</color>
+    <color name="debugTextColor">#FFFF0000</color>

-    <!-- 调试方案 
-    <color name="colorPrimary">#FF727272</color>
-    <color name="colorPrimaryDark">#FF444444</color>
-    <color name="colorAccent">#FF9EA19F</color>
-
-    <color name="colorAToolbarStartColor">#FF4776EB</color>
-    <color name="colorAToolbarCenterColor">#FF0D4BE7</color>
-    <color name="colorAToolbarEndColor">#FF8FA7E3</color>
-
-    <color name="colorACardShadow">#FF22A200</color>
-    <color name="colorACardFrame">#FF3FCC19</color>
-    <color name="colorACardBackgroung">#FF88F16B</color>
-
-    <color name="colorATickProgressBarBackgroung">#FF6DC4E2</color>
-    <color name="colorATickProgressBarProgress">#FF22B0E1</color>
-    -->
-</resources>
+</resources>
--- a/libaes/src/main/res/values/styles.xml
+++ b/libaes/src/main/res/values/styles.xml
@@ -1,255 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
    <style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorTextColor">#FF000000</item>
-        <item name="colorPrimary">#FF18B05C</item>
-        <item name="colorPrimaryDark">#FF008C3F</item>
-        <item name="colorAccent">#FF24DC77</item>
-        <item name="android:textColor">#FF000000</item>
+        <item name="themeDebug">@style/DebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">@color/mainWindowTextColor</item>
+        <item name="dialogBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">@color/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">@color/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">@color/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+
        <item name="aToolbar">@style/AESAToolbar</item>
        <item name="aSupportToolbar">@style/AESASupportToolbar</item>
    </style>

+    <style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+
    <style name="AESAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarEndColor">@color/colorAccent</item>
    </style>

    <style name="AESASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
    </style>

    <style name="DepthAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FF0065EC</item>
        <item name="colorPrimaryDark">#FF004DB4</item>
        <item name="colorAccent">#FF4A97FF</item>
-        <item name="android:textColor">#FF000000</item>
    </style>

    <style name="SkyAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FF00A6FF</item>
        <item name="colorPrimaryDark">#FF007ABB</item>
        <item name="colorAccent">#FF84D4FF</item>
-        <item name="android:textColor">#FF000000</item>
    </style>

    <style name="GoldenAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FFF0CA11</item>
        <item name="colorPrimaryDark">#FFD3AF00</item>
        <item name="colorAccent">#FFFFE35C</item>
-        <item name="android:textColor">#FF000000</item>
    </style>
-	
+
    <style name="BearingAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FF840FFF</item>
        <item name="colorPrimaryDark">#FF6900D7</item>
        <item name="colorAccent">#FFBA78FF</item>
-        <item name="android:textColor">#FF000000</item>
    </style>

    <style name="MemorAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FFFF00F5</item>
        <item name="colorPrimaryDark">#FFE500DC</item>
        <item name="colorAccent">#FFFF76FA</item>
-        <item name="android:textColor">#FF000000</item>
    </style>

    <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FFACACAC</item>
        <item name="colorPrimaryDark">#FF898989</item>
        <item name="colorAccent">#FFD8D8D8</item>
-        <item name="android:textColor">#FF000000</item>
    </style>

-    <!--<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/AESAToolbar</item>
-    <item name="aSupportToolbar">@style/AESASupportToolbar</item>
-    </style>
-
-    <style name="AESAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="AESASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>-->
-
-    <!--<style name="DepthAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF2566FE</item>
-    <item name="colorPrimaryDark">#FF1359FF</item>
-    <item name="colorAccent">#FF8BAEFF</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/DepthAToolbar</item>
-    <item name="aSupportToolbar">@style/DepthASupportToolbar</item>
-    </style>
-
-    <style name="DepthAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="DepthASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="SkyAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF1E98D4</item>
-    <item name="colorPrimaryDark">#FF046A9C</item>
-    <item name="colorAccent">#FF8CD9FF</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/SkyAToolbar</item>
-    <item name="aSupportToolbar">@style/SkyASupportToolbar</item>
-    </style>
-
-    <style name="SkyAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="SkyASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="GoldenAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FFFFE22A</item>
-    <item name="colorPrimaryDark">#FFAE9600</item>
-    <item name="colorAccent">#FFFFED78</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/GoldenAToolbar</item>
-    <item name="aSupportToolbar">@style/GoldenASupportToolbar</item>
-    </style>
-
-    <style name="GoldenAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="GoldenASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="MemorAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FFCE1ED4</item>
-    <item name="colorPrimaryDark">#FFB500BC</item>
-    <item name="colorAccent">#FFE653EB</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/MemorAToolbar</item>
-    <item name="aSupportToolbar">@style/MemorASupportToolbar</item>
-    </style>
-
-    <style name="MemorAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="MemorASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="TaoAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF9F9F9F</item>
-    <item name="colorPrimaryDark">#FF5E5E5E</item>
-    <item name="colorAccent">#FFD9D9D9</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/TaoAToolbar</item>
-    <item name="aSupportToolbar">@style/TaoASupportToolbar</item>
-    </style>
-
-    <style name="TaoAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="TaoASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>-->
-
-    <!--<style name="AToolbar">
-    <item name="attrAToolbarTitleTextColor">#FF2DDA27</item>
-    <item name="attrAToolbarStartColor">#FF2DDA27</item>
-    <item name="attrAToolbarCenterColor">#FF2DDA27</item>
-    <item name="attrAToolbarEndColor">#FF2DDA27</item>
-    </style>-->
-
-    <!--对话框的样式-->
-    <style name="NormalDialogStyle">
-        <!--对话框背景 -->
+    <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
        <item name="android:windowBackground">@android:color/transparent</item>
-        <!--边框 -->
        <item name="android:windowFrame">@null</item>
-        <!--没有标题 -->
        <item name="android:windowNoTitle">true</item>
-        <!-- 是否浮现在Activity之上 -->
        <item name="android:windowIsFloating">true</item>
-        <!--背景透明 -->
        <item name="android:windowIsTranslucent">false</item>
-        <!-- 是否有覆盖 -->
        <item name="android:windowContentOverlay">@null</item>
-        <!--进出的显示动画 -->
        <item name="android:windowAnimationStyle">@style/cornerDialogAnim</item>
-        <!--背景变暗-->
        <item name="android:backgroundDimEnabled">true</item>
    </style>
-    <!--对话框动画，中间弹出-->
+
    <style name="centerDialogAnim" parent="android:Animation">
        <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_center</item>
        <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_center</item>
    </style>
-    <!--对话框动画，角落弹出-->
+
    <style name="cornerDialogAnim" parent="android:Animation">
        <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_corner</item>
        <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
    </style>
-</resources>
+
+</resources>
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon May 11 20:29:55 HKT 2026
-stageCount=9
+#Tue May 12 09:16:45 HKT 2026
+stageCount=10
 libraryProject=libappbase
 baseVersion=15.20
-publishVersion=15.20.8
+publishVersion=15.20.9
 buildCount=0
-baseBetaVersion=15.20.9
+baseBetaVersion=15.20.10
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
@@ -8,6 +8,7 @@ package cc.winboll.studio.libappbase;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
@@ -248,7 +249,10 @@ public class LogView extends RelativeLayout {
 		}
 		mSelectAllTAGCheckBox.setLayoutParams(layoutParams2);
 		//mSelectAllTAGCheckBox.setPadding(0,0,0,0);
-		mSelectAllTAGCheckBox.setTextColor(mContext.getResources().getColor(R.color.white));
+		TypedArray ta1 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+		int toolbarTextColor1 = ta1.getColor(0, mContext.getResources().getColor(R.color.white));
+		ta1.recycle();
+		mSelectAllTAGCheckBox.setTextColor(toolbarTextColor1);
        mSelectAllTAGCheckBox.setOnClickListener(new View.OnClickListener(){
                @Override
                public void onClick(View v) {
@@ -502,10 +506,17 @@ public class LogView extends RelativeLayout {
 			}
 			holder.tvText.setLayoutParams(layoutParams);
 			holder.tvText.setPadding(0,0,0,0);
-			holder.tvText.setTextColor(mContext.getResources().getColor(R.color.white));
+			TypedArray ta2 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+			int toolbarTextColor2 = ta2.getColor(0, mContext.getResources().getColor(R.color.white));
+			ta2.recycle();
+			holder.tvText.setTextColor(toolbarTextColor2);
            holder.cbChecked.setChecked(item.isChecked());
 			holder.cbChecked.setLayoutParams(layoutParams);
 			holder.cbChecked.setPadding(0,0,0,0);
+			TypedArray ta3 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+			int toolbarTextColor3 = ta3.getColor(0, mContext.getResources().getColor(R.color.white));
+			ta3.recycle();
+			holder.cbChecked.setTextColor(toolbarTextColor3);
            holder.cbChecked.setOnClickListener(new View.OnClickListener(){

                    @Override
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java
@@ -3,6 +3,7 @@ package cc.winboll.studio.libappbase.widget;
 import android.content.Context;
 import android.graphics.Color;
 import android.text.TextUtils;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
@@ -153,9 +154,12 @@ public class LogTagSpinner extends Spinner {
 		itemTv.setPadding(mTextPadding, 0, mTextPadding, 0);
 		// 4. 文字对齐（垂直居中+靠左，符合常规 UI 设计）
 		//itemTv.setGravity(View.GRAVITY_CENTER_VERTICAL | View.GRAVITY_START);
-		// 5. 文字颜色（统一深色，可改为项目颜色资源）
-		itemTv.setTextColor(this.mContext.getColor(R.color.white));
-		itemTv.setBackgroundColor(this.mContext.getColor(R.color.btn_gray_normal));
+// 5. 文字颜色（使用主题属性 ?attr/toolbarTextColor）
+		TypedArray ta = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+		int toolbarTextColor = ta.getColor(0, mContext.getResources().getColor(R.color.white));
+		ta.recycle();
+		itemTv.setTextColor(toolbarTextColor);
+		itemTv.setBackgroundColor(this.mContext.getResources().getColor(R.color.btn_gray_normal));
 		// 6. 文字溢出处理（最多 2 行，超出省略，避免长标签换行过多）
 		itemTv.setSingleLine(false);
 		itemTv.setMaxLines(2);
--- a/libappbase/src/main/res/layout-night/activity_nfc_rsa_operate.xml
+++ b/libappbase/src/main/res/layout-night/activity_nfc_rsa_operate.xml
@@ -50,8 +50,8 @@
        android:layout_height="wrap_content"
        android:text="功能按钮待激活"
        android:textSize="16sp"
-        android:textColor="?attr/buttonTextColor"
-        android:backgroundTint="?attr/buttonBackgroundColor"
+        android:textColor="?attr/toolbarTextColor"
+        android:backgroundTint="?attr/toolbarBackgroundColor"
        android:padding="14dp"
        android:enabled="false"/>

--- a/libappbase/src/main/res/layout-night/dialog_winboll_host.xml
+++ b/libappbase/src/main/res/layout-night/dialog_winboll_host.xml
@@ -53,8 +53,8 @@
            android:layout_height="wrap_content"
            android:text="确认"
            android:textSize="14sp"
-            android:backgroundTint="?attr/buttonBackgroundColor"
-            android:textColor="?attr/buttonTextColor"/>
+            android:backgroundTint="?attr/toolbarBackgroundColor"
+            android:textColor="?attr/toolbarTextColor"/>

    </LinearLayout>

--- a/libappbase/src/main/res/layout-night/item_logtag.xml
+++ b/libappbase/src/main/res/layout-night/item_logtag.xml
@@ -18,6 +18,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/log_button_height"
 		android:textSize="@dimen/log_text_size"
+		android:textColor="?attr/toolbarTextColor"
 		android:id="@+id/viewlogtagCheckBox1"/>

 </LinearLayout>
--- a/libappbase/src/main/res/layout-night/view_log.xml
+++ b/libappbase/src/main/res/layout-night/view_log.xml
@@ -15,13 +15,13 @@
 		android:background="?attr/colorTittleBackgound"
 		android:id="@+id/viewlogRelativeLayoutToolbar">

-		<Button
+<Button
 			android:layout_width="@dimen/log_button_width"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
 			android:text="Clean"
-			android:textColor="?attr/colorText"
-			android:backgroundTint="?attr/colorTittleBackgound"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogButtonClean"
 			android:layout_marginLeft="5dp"/>
@@ -36,7 +36,7 @@
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogTextView1"
 			android:background="?attr/colorTittleBackgound"
-			android:textColor="?attr/colorText"/>
+			android:textColor="?attr/toolbarTextColor"/>

 		<cc.winboll.studio.libappbase.widget.LogTagSpinner
 			android:layout_width="wrap_content"
@@ -56,14 +56,14 @@
 			android:background="?attr/colorTittleBackgound"
 			android:id="@+id/viewlogCheckBoxSelectable"
 			android:padding="@dimen/log_text_padding"
-			android:textColor="?attr/colorText"/>
+			android:textColor="?attr/toolbarTextColor"/>

 		<Button
 			android:layout_width="@dimen/log_button_width"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
-			android:textColor="?attr/colorText"
-			android:backgroundTint="?attr/colorTittleBackgound"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
 			android:text="Copy"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
@@ -89,7 +89,7 @@
 			android:padding="2dp"
 			android:id="@+id/viewlogCheckBox1"
 			android:background="?attr/colorTittleBackgound"
-			android:textColor="?attr/colorText"
+			android:textColor="?attr/toolbarTextColor"
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>

--- a/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
+++ b/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
@@ -50,8 +50,8 @@
        android:layout_height="wrap_content"
        android:text="功能按钮待激活"
        android:textSize="16sp"
-        android:textColor="?attr/buttonTextColor"
-        android:backgroundTint="?attr/buttonBackgroundColor"
+        android:textColor="?attr/toolbarTextColor"
+        android:backgroundTint="?attr/toolbarBackgroundColor"
        android:padding="14dp"
        android:enabled="false"/>

--- a/libappbase/src/main/res/layout/dialog_winboll_host.xml
+++ b/libappbase/src/main/res/layout/dialog_winboll_host.xml
@@ -53,8 +53,8 @@
            android:layout_height="wrap_content"
            android:text="确认"
            android:textSize="14sp"
-            android:backgroundTint="?attr/buttonBackgroundColor"
-            android:textColor="?attr/buttonTextColor"/>
+            android:backgroundTint="?attr/toolbarBackgroundColor"
+            android:textColor="?attr/toolbarTextColor"/>

    </LinearLayout>

--- a/libappbase/src/main/res/layout/item_logtag.xml
+++ b/libappbase/src/main/res/layout/item_logtag.xml
@@ -18,6 +18,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/log_button_height"
 		android:textSize="@dimen/log_text_size"
+		android:textColor="?attr/toolbarTextColor"
 		android:id="@+id/viewlogtagCheckBox1"/>

 </LinearLayout>
--- a/libappbase/src/main/res/layout/view_log.xml
+++ b/libappbase/src/main/res/layout/view_log.xml
@@ -20,8 +20,8 @@
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
 			android:text="Clean"
-			android:textColor="?attr/colorText"
-			android:backgroundTint="?attr/colorTittleBackgound"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogButtonClean"
 			android:layout_marginLeft="5dp"/>
@@ -36,7 +36,7 @@
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogTextView1"
 			android:background="?attr/colorTittleBackgound"
-			android:textColor="?attr/colorText"/>
+			android:textColor="?attr/toolbarTextColor"/>

 		<cc.winboll.studio.libappbase.widget.LogTagSpinner
 			android:layout_width="wrap_content"
@@ -56,14 +56,14 @@
 			android:background="?attr/colorTittleBackgound"
 			android:id="@+id/viewlogCheckBoxSelectable"
 			android:padding="@dimen/log_text_padding"
-			android:textColor="?attr/colorText"/>
+			android:textColor="?attr/toolbarTextColor"/>

 		<Button
 			android:layout_width="@dimen/log_button_width"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
-			android:textColor="?attr/colorText"
-			android:backgroundTint="?attr/colorTittleBackgound"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
 			android:text="Copy"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
@@ -89,7 +89,7 @@
 			android:padding="2dp"
 			android:id="@+id/viewlogCheckBox1"
 			android:background="?attr/colorTittleBackgound"
-			android:textColor="?attr/colorText"
+			android:textColor="?attr/toolbarTextColor"
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>

--- a/libappbase/src/main/res/values-night/attrs.xml
+++ b/libappbase/src/main/res/values-night/attrs.xml
@@ -20,11 +20,7 @@
        <attr name="aboutViewDividerColor" format="color" />
    </declare-styleable>

-    <!-- ButtonStyle 样式属性 -->
-    <declare-styleable name="ButtonStyle">
-        <attr name="buttonBackgroundColor" format="color" />
-        <attr name="buttonTextColor" format="color" />
-    </declare-styleable>
+    

    <!-- DialogStyle 样式属性 -->
    <declare-styleable name="DialogStyle">
--- a/libappbase/src/main/res/values-night/colors.xml
+++ b/libappbase/src/main/res/values-night/colors.xml
@@ -63,7 +63,9 @@
 	<!-- ============== 主题颜色 ============== -->
 	<color name="mainWindowBackgroundColor">#FF0D1B2A</color>
 	<color name="mainWindowTextColor">#FFE0E0E0</color>
-	<color name="buttonBackgroundColor">#FF1E3A5F</color>
+	<color name="toolbarTextColor">#FFE0E0E0</color>
+	<color name="toolbarBackgroundColor">#FF1E3A5F</color>
+	
 	<color name="debugTextColor">#FF00FF00</color>

 </resources>
--- a/libappbase/src/main/res/values-night/styles.xml
+++ b/libappbase/src/main/res/values-night/styles.xml
@@ -8,12 +8,12 @@
        <item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
        <item name="aboutViewTitleColor">?attr/mainWindowDarkTextColor</item>
        <item name="aboutViewDividerColor">?attr/mainWindowTextColor</item>
-        <item name="buttonBackgroundColor">@color/buttonBackgroundColor</item>
-        <item name="buttonTextColor">?attr/mainWindowDarkTextColor</item>
+        
+        
        <item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
        <item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
-        <item name="toolbarBackgroundColor">?attr/buttonBackgroundColor</item>
-        <item name="toolbarTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
        <item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
        <item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
        <item name="editTextBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
@@ -29,12 +29,14 @@

    <!-- DebugActivityTheme 深色模式样式 -->
    <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
-        <item name="android:statusBarColor">@color/mainWindowBackgroundColor</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
        <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
-        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
        <item name="colorText">?attr/debugTextColor</item>
        <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        
 	</style>

    <!-- DialogStyle 对话框样式 -->
--- a/libappbase/src/main/res/values/attrs.xml
+++ b/libappbase/src/main/res/values/attrs.xml
@@ -26,11 +26,7 @@
        <attr name="aboutViewDividerColor" format="color" />
    </declare-styleable>

-    <!-- ButtonStyle 样式属性 -->
-    <declare-styleable name="ButtonStyle">
-        <attr name="buttonBackgroundColor" format="color" />
-        <attr name="buttonTextColor" format="color" />
-    </declare-styleable>
+    

    <!-- DialogStyle 样式属性 -->
    <declare-styleable name="DialogStyle">
--- a/libappbase/src/main/res/values/colors.xml
+++ b/libappbase/src/main/res/values/colors.xml
@@ -63,7 +63,9 @@
 	<!-- ============== 主题颜色 ============== -->
 	<color name="mainWindowBackgroundColor">#FFF5F5F5</color>
 	<color name="mainWindowTextColor">#FF000000</color>
-	<color name="buttonBackgroundColor">#FF00B322</color>
+	<color name="toolbarTextColor">#FF000000</color>
+	<color name="toolbarBackgroundColor">#FF00B322</color>
+	
 	<color name="debugTextColor">#FF808080</color>

 </resources>
--- a/libappbase/src/main/res/values/styles.xml
+++ b/libappbase/src/main/res/values/styles.xml
@@ -8,12 +8,12 @@
        <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
        <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
        <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
-        <item name="buttonBackgroundColor">@color/buttonBackgroundColor</item>
-        <item name="buttonTextColor">?attr/mainWindowTextColor</item>
+        
+        
        <item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
        <item name="dialogTextColor">?attr/mainWindowTextColor</item>
-        <item name="toolbarBackgroundColor">?attr/buttonBackgroundColor</item>
-        <item name="toolbarTextColor">?attr/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
        <item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
        <item name="textViewTextColor">?attr/mainWindowTextColor</item>
        <item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
@@ -29,12 +29,14 @@

    <!-- DebugActivityTheme 普通模式样式 -->
    <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="android:statusBarColor">@color/buttonBackgroundColor</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
        <item name="colorTittle">?attr/mainWindowTextColor</item>
-        <item name="colorTittleBackgound">@color/buttonBackgroundColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
        <item name="colorText">?attr/debugTextColor</item>
        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        
 	</style>

    <!-- DialogStyle 对话框样式 -->
Author	SHA1	Message	Date
ZhanGSKen	c6c290dcd2	<aes>APK 15.20.3 release Publish.	2026-05-12 13:11:09 +08:00
ZhanGSKen	e64f3a3e97	恢复 DrawerFragmentActivity 与 ASupportToolbar 显示正常的版本	2026-05-12 13:08:12 +08:00
LaizyBoy	632ecc51d8	重构ASupportToolbar自定义控件，支持AES主题切换 - 优化ASupportToolbar控件的绘图流程 - 移除atoolbar_frame.xml依赖，改用Java代码内部绘图 - 添加notifyColorChange()方法绘制三层渐变背景 - 在onAttachedToWindow()时自动调用refreshFromTheme()刷新背景 - 主题切换时通过DrawerFragmentActivity调用refreshFromTheme() - 添加attrs.xml属性：android:background用于自定义style - 添加详细调试日志追踪整个绘制流程 - TestASupportToolbarActivity添加日志便于测试验证修改文件： - libaes/src/main/java/.../views/ASupportToolbar.java：重构绘图逻辑，添加调试日志 - libaes/src/main/java/.../activitys/DrawerFragmentActivity.java：主题切换时刷新Toolbar - libaes/src/main/java/.../unittests/TestASupportToolbarActivity.java：添加调试日志 - libaes/src/main/res/values/attrs.xml：添加android:background属性 - aes/build.properties：版本号更新 - libaes/build.properties：版本号更新	2026-05-12 10:53:18 +08:00
LaizyBoy	58b2cace16	重构AES主题配置，继承APPBaseTheme属性支持 - AESTheme改为继承Theme.AppCompat并支持APPBaseTheme属性 - 修复运行时inflate错误：将?attr/xxx引用改为@color/xxx直接引用 - 添加DebugActivityTheme调试样式支持 - 添加必需的颜色定义（toolbarBackgroundColor、mainWindowBackgroundColor等） - 新增夜间模式主题配置（values-night目录） - 清理冗余注释和无用的调试配色方案 - aes模块的MyAESTheme添加themeDebug属性修改文件： - aes/src/main/res/values/styles.xml：添加MyDebugActivityTheme - aes/src/main/res/values-night/：新增夜间模式样式 - libaes/src/main/res/values/colors.xml：添加主题必需颜色 - libaes/src/main/res/values/styles.xml：重构使用AppCompat主题 - libaes/src/main/res/values-night/：新增夜间模式颜色和样式	2026-05-12 09:52:57 +08:00
ZhanGSKen	3648fa3361	更新基础类库版本	2026-05-12 09:26:33 +08:00
ZhanGSKen	122122ef80	Merge remote-tracking branch 'origin/appbase' into aes	2026-05-12 09:22:37 +08:00
ZhanGSKen	4caeb83e5e	<libappbase>Library Release 15.20.9	2026-05-12 09:17:18 +08:00
ZhanGSKen	f36ee0d9b1	<appbase>APK 15.20.9 release Publish.	2026-05-12 09:16:45 +08:00
LaizyBoy	fe0b2f97ea	重构日志窗口UI主题颜色系统，统一使用toolbarTextColor和toolbarBackgroundColor 【主要变更】 1. 新增主题颜色属性 - 新增 toolbarTextColor 属性定义（普通模式:黑色, 深色模式:#E0E0E0） - 新增 toolbarBackgroundColor 属性定义（普通模式:绿色, 深色模式:深蓝色） 2. 移除废弃颜色属性 - 移除 buttonTextColor 属性定义 - 移除 buttonBackgroundColor 属性定义 3. 更新布局文件（普通模式+深色模式） - view_log.xml: TextView(LV:)、CheckBox(Selectable/ALL) 使用 toolbarTextColor - view_log.xml: Button(Clean/Copy) 使用 toolbarBackgroundColor - item_logtag.xml: CheckBox 使用 toolbarTextColor - activity_main.xml: 所有Button使用 toolbarBackgroundColor - activity_crash_test.xml: 所有Button使用 toolbarBackgroundColor - activity_nfc_rsa_operate.xml: Button使用 toolbarBackgroundColor - dialog_winboll_host.xml: Button使用 toolbarBackgroundColor 4. 更新Java代码 - LogView.java: CheckBox和TextView使用主题属性获取 toolbarTextColor - LogTagSpinner.java: 下拉框文本颜色使用 toolbarTextColor 5. 更新样式定义 - styles.xml: 主题属性引用新的 toolbarTextColor/toolbarBackgroundColor - attrs.xml: 移除废弃属性，保留 toolbarTextColor/toolbarBackgroundColor - colors.xml: 添加新的颜色定义【适配说明】 - 统一普通模式和深色模式的颜色管理 - 确保日志窗口所有控件颜色与主窗口保持一致	2026-05-12 09:13:16 +08:00
LaizyBoy	43da2bc03a	统一日志窗口Clean/Copy按钮样式与主窗口保持一致	2026-05-12 00:33:14 +08:00
ZhanGSKen	d26ef7bf7f	Merge remote-tracking branch 'origin/appbase' into aes	2026-05-11 21:18:47 +08:00
ZhanGSKen	6baca2779d	同步build.gradle至origin/winboll分支最新配置	2026-05-11 21:13:50 +08:00
ZhanGSKen	f0fbdaf121	<libaes>Library Release 15.20.2	2026-05-11 20:41:44 +08:00
ZhanGSKen	a20f29728e	<aes>APK 15.20.2 release Publish.	2026-05-11 20:41:30 +08:00
ZhanGSKen	9669fe2a8d	更新应用基础类库,改进应用调试接口。	2026-05-11 20:38:17 +08:00
ZhanGSKen	ff8cb2fb42	<libappbase>Library Release 15.20.8	2026-05-11 20:30:07 +08:00
ZhanGSKen	ed5ab24bd3	<libaes>Library Release 15.20.1	2026-05-11 17:17:23 +08:00
ZhanGSKen	b5c989b5f9	<aes>APK 15.20.1 release Publish.	2026-05-11 17:17:05 +08:00
ZhanGSKen	725b336501	更新基础类库版本，提高应用调试能力。	2026-05-11 17:14:00 +08:00
ZhanGSKen	57e4f8770b	<libaes>Library Release 15.20.0	2026-05-11 15:02:44 +08:00
ZhanGSKen	3b313e2362	<aes>APK 15.20.0 release Publish.	2026-05-11 15:02:27 +08:00
ZhanGSKen	1e96cd02bc	对齐基础类库基准型号版本。	2026-05-11 14:58:21 +08:00
ZhanGSKen	270e21ed23	<libaes>Library Release 15.15.10	2026-05-10 05:04:34 +08:00
ZhanGSKen	6412554096	<aes>APK 15.15.10 release Publish.	2026-05-10 05:04:15 +08:00
LaizyBoy	286f8513d4	refactor: 升级编译配置并调整最低API版本 - 升级 Gradle 编译版本为 Java 11 根目录 build.gradle 中 JavaCompile 配置从 VERSION_1_7 改为 VERSION_11 - 调整 minSdkVersion 从 21 升级至 26 适配 Android 8.0 (API 26) 及以上系统修改范围: aes/build.gradle, libaes/build.gradle - 移除未使用的 XXPermissions 依赖该库使用 Java 8 字节码与 minSdkVersion 21 不兼容，项目中未引用此库	2026-05-10 04:48:29 +08:00