Compare commits

...

3 Commits

Author SHA1 Message Date
e99d7ebc06 <positions>APK 15.12.21 release Publish. 2026-05-04 11:31:30 +08:00
07a286e7e0 重构主界面菜单与调试模式UI控制逻辑
- 将空转切换菜单项(item_idle_switch)从toolbar_main.xml移至新建的toolbar_main_idle.xml
- 调试模式(App.isDebugging()为真)时加载toolbar_main_idle.xml菜单,非调试模式不加载
- onCreate时根据调试状态控制日志区域(tv_idle_log)的显示/隐藏
- onResume时通过invalidateOptionsMenu()重新加载菜单,确保状态同步
2026-05-04 11:28:10 +08:00
7761c80275 更新基础类库 2026-05-04 10:57:41 +08:00
5 changed files with 28 additions and 10 deletions

View File

@@ -81,8 +81,8 @@ dependencies {
//api 'androidx.fragment:fragment:1.1.0' //api 'androidx.fragment:fragment:1.1.0'
// WinBoLL库 nexus.winboll.cc 地址 // WinBoLL库 nexus.winboll.cc 地址
api 'cc.winboll.studio:libaes:15.15.2' api 'cc.winboll.studio:libaes:15.15.9'
api 'cc.winboll.studio:libappbase:15.15.11' api 'cc.winboll.studio:libappbase:15.15.21'
// WinBoLL备用库 jitpack.io 地址 // WinBoLL备用库 jitpack.io 地址
//api 'com.github.ZhanGSKen:AES:aes-v15.12.9' //api 'com.github.ZhanGSKen:AES:aes-v15.12.9'

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Mon May 04 09:52:15 HKT 2026 #Mon May 04 11:31:30 HKT 2026
stageCount=21 stageCount=22
libraryProject= libraryProject=
baseVersion=15.12 baseVersion=15.12
publishVersion=15.12.20 publishVersion=15.12.21
buildCount=0 buildCount=0
baseBetaVersion=15.12.21 baseBetaVersion=15.12.22

View File

@@ -113,6 +113,15 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
mADsBannerView = findViewById(R.id.adsbanner); mADsBannerView = findViewById(R.id.adsbanner);
initAppIdleHandler(); initAppIdleHandler();
refreshIdleLogLayout(); refreshIdleLogLayout();
// 根据调试模式控制日志区域的显示
if (App.isDebugging()) {
mScrollIdleLog.setVisibility(View.VISIBLE);
LogUtils.d(TAG, "onCreate -> 调试模式,显示日志区域");
} else {
mScrollIdleLog.setVisibility(View.GONE);
LogUtils.d(TAG, "onCreate -> 非调试模式,隐藏日志区域");
}
} }
@Override @Override
@@ -125,6 +134,9 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
if (mADsBannerView != null) { if (mADsBannerView != null) {
mADsBannerView.resumeADs(MainActivity.this); mADsBannerView.resumeADs(MainActivity.this);
} }
// 重新加载菜单以根据当前调试状态刷新
invalidateOptionsMenu();
LogUtils.d(TAG, "onResume -> 重新加载菜单完成");
} }
@Override @Override
@@ -335,6 +347,7 @@ public class MainActivity extends WinBoLLActivity implements IWinBoLLActivity {
AESThemeUtil.inflateMenu(this, menu); AESThemeUtil.inflateMenu(this, menu);
if (App.isDebugging()) { if (App.isDebugging()) {
DevelopUtils.inflateMenu(this, menu); DevelopUtils.inflateMenu(this, menu);
getMenuInflater().inflate(R.menu.toolbar_main_idle, menu);
} }
getMenuInflater().inflate(R.menu.toolbar_main, menu); getMenuInflater().inflate(R.menu.toolbar_main, menu);
return true; return true;

View File

@@ -2,10 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/item_idle_switch"
android:title="空转状态切换"/>
<item <item
android:id="@+id/item_settings" android:id="@+id/item_settings"
android:title="Settings"/> android:title="Settings"/>

View File

@@ -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_idle_switch"
android:title="空转状态切换"/>
</menu>