From f2f7cab330c04d5e880dd3905e4b2ce692cbb987 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 3 Jul 2025 12:38:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8E=92=E5=88=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mymessagemanager/build.properties | 4 +-- .../activitys/MainActivity.java | 18 ++++--------- .../src/main/res/menu/toolbar_main.xml | 22 ---------------- .../src/main/res/menu/toolbar_main2.xml | 26 +++++++++++++++++++ 4 files changed, 33 insertions(+), 37 deletions(-) create mode 100644 mymessagemanager/src/main/res/menu/toolbar_main2.xml diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties index 3258555..7a0f917 100644 --- a/mymessagemanager/build.properties +++ b/mymessagemanager/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue May 20 20:39:06 HKT 2025 +#Thu Jul 03 04:37:09 GMT 2025 stageCount=6 libraryProject= baseVersion=15.2 publishVersion=15.2.5 -buildCount=0 +buildCount=2 baseBetaVersion=15.2.6 diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java index de3c945..4468eb9 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java @@ -128,7 +128,7 @@ public class MainActivity extends BaseActivity { mToolbar = findViewById(R.id.activitymainASupportToolbar1); mToolbar.setSubtitle(getString(R.string.activity_name_main)); setSupportActionBar(mToolbar); - + boolean isEnableService = mAppConfigUtil.mAppConfigBean.isEnableService(); msvEnableService = findViewById(R.id.activitymainSwitchView1); msvEnableService.setChecked(isEnableService); @@ -269,17 +269,9 @@ public class MainActivity extends BaseActivity { public boolean onCreateOptionsMenu(Menu menu) { //return super.onCreateOptionsMenu(menu); getMenuInflater().inflate(R.menu.toolbar_main, menu); - - /*ThemeUtil.BaseTheme baseTheme = ThemeUtil.getTheme(mAppConfigUtil.mAppConfigBean.getAppThemeID()); - if (baseTheme == ThemeUtil.BaseTheme.DEFAULT) { - menu.findItem(R.id.app_defaulttheme).setChecked(true); - } else if (baseTheme == ThemeUtil.BaseTheme.SKY) { - menu.findItem(R.id.app_skytheme).setChecked(true); - } else if (baseTheme == ThemeUtil.BaseTheme.GOLDEN) { - menu.findItem(R.id.app_goldentheme).setChecked(true); - }*/ - - return super.onCreateOptionsMenu(menu); + super.onCreateOptionsMenu(menu); + getMenuInflater().inflate(R.menu.toolbar_main2, menu); + return true; } public static void reloadSMS() { @@ -324,7 +316,7 @@ public class MainActivity extends BaseActivity { i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(i); } - + return super.onOptionsItemSelected(item); } diff --git a/mymessagemanager/src/main/res/menu/toolbar_main.xml b/mymessagemanager/src/main/res/menu/toolbar_main.xml index 347c8cd..84b6807 100644 --- a/mymessagemanager/src/main/res/menu/toolbar_main.xml +++ b/mymessagemanager/src/main/res/menu/toolbar_main.xml @@ -17,26 +17,4 @@ - - - - - - - - - - diff --git a/mymessagemanager/src/main/res/menu/toolbar_main2.xml b/mymessagemanager/src/main/res/menu/toolbar_main2.xml new file mode 100644 index 0000000..e60fde9 --- /dev/null +++ b/mymessagemanager/src/main/res/menu/toolbar_main2.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + From c878e9dc026217fc21754ff04cedcf2547f2941c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 3 Jul 2025 12:53:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8A=9F=E8=83=BDBugFix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mymessagemanager/build.gradle | 6 +++--- mymessagemanager/build.properties | 4 ++-- .../studio/mymessagemanager/activitys/AboutActivity.java | 2 +- .../studio/mymessagemanager/activitys/BaseActivity.java | 3 +++ .../studio/mymessagemanager/activitys/MainActivity.java | 2 +- .../{WinBollActivity.java => WinBoLLActivity.java} | 4 ++-- mymessagemanager/src/main/res/layout/activity_unittest.xml | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) rename mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/{WinBollActivity.java => WinBoLLActivity.java} (93%) diff --git a/mymessagemanager/build.gradle b/mymessagemanager/build.gradle index 32cbce1..de21733 100644 --- a/mymessagemanager/build.gradle +++ b/mymessagemanager/build.gradle @@ -45,9 +45,9 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:libaes:15.8.0' - api 'cc.winboll.studio:libapputils:15.8.1' - api 'cc.winboll.studio:libappbase:15.8.1' + api 'cc.winboll.studio:libaes:15.9.2' + api 'cc.winboll.studio:libapputils:15.8.4' + api 'cc.winboll.studio:libappbase:15.8.4' api 'io.github.medyo:android-about-page:2.0.0' api 'com.github.getActivity:ToastUtils:10.5' diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties index 7a0f917..5ebab66 100644 --- a/mymessagemanager/build.properties +++ b/mymessagemanager/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jul 03 04:37:09 GMT 2025 +#Thu Jul 03 04:51:03 GMT 2025 stageCount=6 libraryProject= baseVersion=15.2 publishVersion=15.2.5 -buildCount=2 +buildCount=7 baseBetaVersion=15.2.6 diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java index 739c979..180ac3a 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java @@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.mymessagemanager.App; import cc.winboll.studio.mymessagemanager.R; -public class AboutActivity extends WinBollActivity implements IWinBoLLActivity { +public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity { public static final String TAG = "AboutActivity"; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java index 066c3c8..cca83b7 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java @@ -103,6 +103,9 @@ abstract public class BaseActivity extends AppCompatActivity { } else if (R.id.item_defaulttheme == item.getItemId()) { AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme); recreate(); + } else if (R.id.item_defaulttheme == item.getItemId()) { + AESThemeUtil.saveThemeStyleID(this, R.style.MyAppTheme); + recreate(); } //ToastUtils.show("nThemeStyleID " + Integer.toString(nThemeStyleID)); diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java index 4468eb9..c5ec61c 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java @@ -298,7 +298,7 @@ public class MainActivity extends BaseActivity { i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(i); } else if (nItemId == R.id.app_log) { - //App.getWinBoLLActivityManager().startLogActivity(this); + App.getWinBoLLActivityManager().startLogActivity(this); } else if (nItemId == R.id.app_unittest) { Intent i = new Intent(MainActivity.this, UnitTestActivity.class); i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBoLLActivity.java similarity index 93% rename from mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java rename to mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBoLLActivity.java index 0a5ae35..55c882a 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBoLLActivity.java @@ -13,9 +13,9 @@ import cc.winboll.studio.libaes.beans.AESThemeBean; import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; -public class WinBollActivity extends AppCompatActivity implements IWinBoLLActivity { +public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity { - public static final String TAG = "WinBollActivity"; + public static final String TAG = "WinBoLLActivity"; protected volatile AESThemeBean.ThemeType mThemeType; diff --git a/mymessagemanager/src/main/res/layout/activity_unittest.xml b/mymessagemanager/src/main/res/layout/activity_unittest.xml index 66c1835..b37f8f1 100644 --- a/mymessagemanager/src/main/res/layout/activity_unittest.xml +++ b/mymessagemanager/src/main/res/layout/activity_unittest.xml @@ -34,7 +34,7 @@ - Date: Thu, 3 Jul 2025 12:56:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BB=8B=E7=BB=8D?= =?UTF-8?q?=E9=A1=B5=E9=93=BE=E6=8E=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mymessagemanager/build.properties | 4 ++-- .../studio/mymessagemanager/activitys/AboutActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties index 5ebab66..ca08ab7 100644 --- a/mymessagemanager/build.properties +++ b/mymessagemanager/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jul 03 04:51:03 GMT 2025 +#Thu Jul 03 04:55:38 GMT 2025 stageCount=6 libraryProject= baseVersion=15.2 publishVersion=15.2.5 -buildCount=7 +buildCount=9 baseBetaVersion=15.2.6 diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java index 180ac3a..493076f 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java @@ -79,11 +79,11 @@ public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity { appInfo.setAppName(getString(R.string.app_name)); appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll); appInfo.setAppDescription(getString(R.string.app_description)); - appInfo.setAppGitName("APP"); + appInfo.setAppGitName("APPBase"); appInfo.setAppGitOwner("Studio"); appInfo.setAppGitAPPBranch(szBranchName); appInfo.setAppGitAPPSubProjectFolder(szBranchName); - appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=MyMessageManager"); + appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=5&extra=page%3D1"); appInfo.setAppAPKName("MyMessageManager"); appInfo.setAppAPKFolderName("MyMessageManager"); return new AboutView(mContext, appInfo);