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"> -