From 890b32ceae94aca7e62f621eb290e758b7f0de95 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@QQ.COM>
Date: Fri, 26 Dec 2025 20:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=83=8F=E7=B4=A0=E6=8B=BE?=
 =?UTF-8?q?=E5=8F=96=E7=AA=97=E5=8F=A3=E8=8F=9C=E5=8D=95=E6=A0=8F=E9=A3=8E?=
 =?UTF-8?q?=E6=A0=BC=E6=9C=AA=E7=BB=9F=E4=B8=80=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 powerbell/build.properties                    |  4 ++--
 .../activities/PixelPickerActivity.java       | 23 ++++++++++++-------
 .../main/res/layout/activity_pixelpicker.xml  |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/powerbell/build.properties b/powerbell/build.properties
index 8bd7357..97b6072 100644
--- a/powerbell/build.properties
+++ b/powerbell/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Dec 26 11:59:16 GMT 2025
+#Fri Dec 26 12:08:22 GMT 2025
 stageCount=35
 libraryProject=
 baseVersion=15.14
 publishVersion=15.14.34
-buildCount=20
+buildCount=21
 baseBetaVersion=15.14.35
diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
index 9fc54c2..f5fcd5d 100644
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
@@ -16,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
@@ -49,7 +50,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 
     // ======================== 成员变量 =========================
     // UI组件
-    private AToolbar mAToolbar;
+    private Toolbar mToolbar;
     private ImageView imageView;
     private TextView infoText;
     private ViewGroup imageContainer;
@@ -112,7 +113,6 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
      * 初始化所有UI组件
      */
     private void initView() {
-        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         imageView = findViewById(R.id.imageView);
         infoText = findViewById(R.id.infoText);
         imageContainer = findViewById(R.id.imageContainer);
@@ -125,17 +125,24 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
      * 初始化工具栏，设置导航与标题
      */
     private void initToolbar() {
-        setActionBar(mAToolbar);
-        mAToolbar.setSubtitle(R.string.subtitle_activity_pixelpicker);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+		LogUtils.d(TAG, "initToolbar() 开始初始化");
+        mToolbar = findViewById(R.id.toolbar);
+        if (mToolbar == null) {
+            LogUtils.e(TAG, "initToolbar() | Toolbar未找到");
+            return;
+        }
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(getTag());
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					LogUtils.d(TAG, "【导航栏】点击返回");
+					LogUtils.d(TAG, "导航栏 点击返回按钮");
 					finish();
 				}
 			});
-        LogUtils.d(TAG, "【initToolbar】工具栏初始化完成");
+        LogUtils.d(TAG, "initToolbar() 配置完成");
     }
 
     // ======================== 业务逻辑方法 =========================
diff --git a/powerbell/src/main/res/layout/activity_pixelpicker.xml b/powerbell/src/main/res/layout/activity_pixelpicker.xml
index 44eae4b..9cb6031 100644
--- a/powerbell/src/main/res/layout/activity_pixelpicker.xml
+++ b/powerbell/src/main/res/layout/activity_pixelpicker.xml
@@ -6,7 +6,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<cc.winboll.studio.libaes.views.AToolbar
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/toolbar_height"
 		android:id="@+id/toolbar"