From 5440c1ad397da0fe9e39e3ee6a3844f51a3bcb92 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 23 Jan 2026 05:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E8=B0=83=E8=AF=95=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- winboll/build.properties | 4 ++-- .../java/cc/winboll/studio/winboll/MainActivity.java | 10 ++++++---- winboll/src/main/res/menu/toolbar_termux.xml | 9 --------- winboll/src/main/res/menu/toolbar_test.xml | 12 ++++++++++++ 4 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 winboll/src/main/res/menu/toolbar_termux.xml create mode 100644 winboll/src/main/res/menu/toolbar_test.xml diff --git a/winboll/build.properties b/winboll/build.properties index 31e2ebb..60a6b17 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 22 21:44:39 GMT 2026 +#Thu Jan 22 21:51:41 GMT 2026 stageCount=11 libraryProject= baseVersion=15.11 publishVersion=15.11.10 -buildCount=55 +buildCount=58 baseBetaVersion=15.11.11 diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index 67d3bea..59e63f9 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -23,7 +23,7 @@ public class MainActivity extends DrawerFragmentActivity { public static final String TAG = "MainActivity"; - + BrowserFragment mBrowserFragment; // ------------------- 新增:Handler 消息定义(接收URL历史更新消息) ------------------- @@ -44,7 +44,7 @@ public class MainActivity extends DrawerFragmentActivity { } showFragment(mBrowserFragment); } - + public static void sendMessage(Message msg) { _mMainHandler.sendMessage(msg); } @@ -122,7 +122,9 @@ public class MainActivity extends DrawerFragmentActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.toolbar_main, menu); - getMenuInflater().inflate(R.menu.toolbar_termux, menu); + if (!App.isDebugging()) { + getMenuInflater().inflate(R.menu.toolbar_test, menu); + } return super.onCreateOptionsMenu(menu); } @@ -151,7 +153,7 @@ public class MainActivity extends DrawerFragmentActivity { WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class); } else if (nItemId == R.id.item_about) { Intent intent = new Intent(getApplicationContext(), AboutActivity.class); - + WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); } else if (nItemId == R.id.item_termux_env_test) { Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class); diff --git a/winboll/src/main/res/menu/toolbar_termux.xml b/winboll/src/main/res/menu/toolbar_termux.xml deleted file mode 100644 index 28e17a6..0000000 --- a/winboll/src/main/res/menu/toolbar_termux.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/winboll/src/main/res/menu/toolbar_test.xml b/winboll/src/main/res/menu/toolbar_test.xml new file mode 100644 index 0000000..bb3b59a --- /dev/null +++ b/winboll/src/main/res/menu/toolbar_test.xml @@ -0,0 +1,12 @@ + + + + + + + + +