Studio/WinBoLL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复像素拾取窗口菜单栏风格未统一问题。

Browse Source
This commit is contained in:
ZhangShaojian
2025-12-26 20:10:28 +08:00
parent c347d51c84
commit 890b32ceae
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
powerbell/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #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 stageCount=35
libraryProject= libraryProject=
baseVersion=15.14 baseVersion=15.14
publishVersion=15.14.34 publishVersion=15.14.34
buildCount=20 buildCount=21
baseBetaVersion=15.14.35 baseBetaVersion=15.14.35

23
powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
View File

@@ -16,6 +16,7 @@ import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.appcompat.widget.Toolbar;
import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity; import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
import cc.winboll.studio.libaes.views.AToolbar; import cc.winboll.studio.libaes.views.AToolbar;
import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogUtils;
@@ -49,7 +50,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
// ======================== 成员变量 ========================= // ======================== 成员变量 =========================
// UI组件 // UI组件
private AToolbar mAToolbar; private Toolbar mToolbar;
private ImageView imageView; private ImageView imageView;
private TextView infoText; private TextView infoText;
private ViewGroup imageContainer; private ViewGroup imageContainer;
@@ -112,7 +113,6 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
* 初始化所有UI组件 * 初始化所有UI组件
*/ */
private void initView() { private void initView() {
mAToolbar = (AToolbar) findViewById(R.id.toolbar);
imageView = findViewById(R.id.imageView); imageView = findViewById(R.id.imageView);
infoText = findViewById(R.id.infoText); infoText = findViewById(R.id.infoText);
imageContainer = findViewById(R.id.imageContainer); imageContainer = findViewById(R.id.imageContainer);
@@ -125,17 +125,24 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
* 初始化工具栏，设置导航与标题 * 初始化工具栏，设置导航与标题
*/ */
private void initToolbar() { private void initToolbar() {
setActionBar(mAToolbar); LogUtils.d(TAG, "initToolbar() 开始初始化");
mAToolbar.setSubtitle(R.string.subtitle_activity_pixelpicker); mToolbar = findViewById(R.id.toolbar);
getActionBar().setDisplayHomeAsUpEnabled(true); if (mToolbar == null) {
mAToolbar.setNavigationOnClickListener(new View.OnClickListener() { 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 @Override
public void onClick(View v) { public void onClick(View v) {
LogUtils.d(TAG, "【导航栏】点击返回"); LogUtils.d(TAG, "导航栏 点击返回按钮");
finish(); finish();
} }
}); });
LogUtils.d(TAG, "【initToolbar】工具栏初始化完成"); LogUtils.d(TAG, "initToolbar() 配置完成");
} }
// ======================== 业务逻辑方法 ========================= // ======================== 业务逻辑方法 =========================

2
powerbell/src/main/res/layout/activity_pixelpicker.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<cc.winboll.studio.libaes.views.AToolbar <cc.winboll.studio.libaes.views.ASupportToolbar
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height" android:layout_height="@dimen/toolbar_height"
android:id="@+id/toolbar" android:id="@+id/toolbar"