From 890ff6eda9ba953c4962b9dc88833601429ade94 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 31 Mar 2025 02:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=96=B9=E5=BC=8F=E5=92=8C=E5=BA=94=E7=94=A8=E4=BB=8B?= =?UTF-8?q?=E7=BB=8D=E7=AA=97=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mymessagemanager/build.gradle | 2 +- mymessagemanager/build.properties | 4 +- mymessagemanager/src/main/AndroidManifest.xml | 22 +++---- .../winboll/studio/mymessagemanager/App.java | 2 +- .../activitys/AboutActivity.java | 65 ++++++++----------- .../activitys/MainActivity.java | 13 ++-- .../activitys/WinBollActivity.java | 60 +++++++++++++++++ .../src/main/res/layout/activity_about.xml | 21 ++++++ .../src/main/res/layout/activity_main.xml | 6 -- .../src/main/res/menu/toolbar_main.xml | 3 + .../main/res/xml/network_security_config.xml | 6 ++ 11 files changed, 138 insertions(+), 66 deletions(-) create mode 100644 mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java create mode 100644 mymessagemanager/src/main/res/layout/activity_about.xml create mode 100644 mymessagemanager/src/main/res/xml/network_security_config.xml diff --git a/mymessagemanager/build.gradle b/mymessagemanager/build.gradle index 443f722..acae6bf 100644 --- a/mymessagemanager/build.gradle +++ b/mymessagemanager/build.gradle @@ -65,7 +65,7 @@ dependencies { //api 'androidx.fragment:fragment:1.1.0' api 'com.google.android.material:material:1.0.0' - api 'cc.winboll.studio:libaes:15.2.1' + api 'cc.winboll.studio:libaes:15.2.3' api 'cc.winboll.studio:libapputils:15.2.1' api 'cc.winboll.studio:libappbase:15.2.2' } diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties index 7d8663b..faec8c3 100644 --- a/mymessagemanager/build.properties +++ b/mymessagemanager/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 04:24:24 GMT 2025 +#Sun Mar 30 18:22:35 GMT 2025 stageCount=0 libraryProject= baseVersion=15.2 publishVersion=15.2.0 -buildCount=15 +buildCount=31 baseBetaVersion=15.2.1 diff --git a/mymessagemanager/src/main/AndroidManifest.xml b/mymessagemanager/src/main/AndroidManifest.xml index ac412a6..7647205 100644 --- a/mymessagemanager/src/main/AndroidManifest.xml +++ b/mymessagemanager/src/main/AndroidManifest.xml @@ -62,21 +62,19 @@ android:persistent="true" android:resizeableActivity="true" android:supportsRtl="true" - android:requestLegacyExternalStorage="true"> + android:requestLegacyExternalStorage="true" + android:networkSecurityConfig="@xml/network_security_config"> + android:name=".activitys.SMSActivity"/> + android:name=".activitys.SMSReceiveRuleActivity"> @@ -98,17 +96,14 @@ + android:name=".activitys.TTSPlayRuleActivity"/> + android:name=".activitys.AboutActivity"/> + android:exported="true"> @@ -122,8 +117,7 @@ + android:exported="true"> diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java index 5141920..273d9e6 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java @@ -29,7 +29,7 @@ public class App extends GlobalApplication { @Override public void onCreate() { super.onCreate(); - //setIsDebuging(BuildConfig.DEBUG); + setIsDebuging(BuildConfig.DEBUG); // 初始化 Toast 框架 ToastUtils.init(this); 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 b2007ed..929ce62 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 @@ -3,27 +3,27 @@ package cc.winboll.studio.mymessagemanager.activitys; /** * @Author ZhanGSKen@QQ.COM * @Date 2024/07/14 13:20:33 - * @Describe 应用关于对话窗口 + * @Describe 应用介绍窗口 */ import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.view.Menu; -import android.view.MenuItem; import android.view.ViewGroup; import android.widget.LinearLayout; -import cc.winboll.studio.libaes.utils.AESThemeUtil; +import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libaes.winboll.APPInfo; import cc.winboll.studio.libaes.winboll.AboutView; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.mymessagemanager.R; +import android.view.MenuItem; -public class AboutActivity extends BaseActivity implements IWinBollActivity { +public class AboutActivity extends WinBollActivity implements IWinBollActivity { public static final String TAG = "AboutActivity"; Context mContext; + Toolbar mToolbar; @Override public Activity getActivity() { @@ -38,19 +38,32 @@ public class AboutActivity extends BaseActivity implements IWinBollActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext())); mContext = this; + setContentView(R.layout.activity_about); + + mToolbar = findViewById(R.id.toolbar); + setSupportActionBar(mToolbar); + mToolbar.setSubtitle(TAG); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); AboutView aboutView = CreateAboutView(); // 在 Activity 的 onCreate 或其他生命周期方法中调用 - LinearLayout layout = new LinearLayout(this); - layout.setOrientation(LinearLayout.VERTICAL); +// LinearLayout layout = new LinearLayout(this); +// layout.setOrientation(LinearLayout.VERTICAL); +// // 创建布局参数（宽度和高度） +// ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( +// ViewGroup.LayoutParams.MATCH_PARENT, +// ViewGroup.LayoutParams.MATCH_PARENT +// ); +// addContentView(aboutView, params); + + LinearLayout layout = findViewById(R.id.aboutviewroot_ll); // 创建布局参数（宽度和高度） ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ); - addContentView(aboutView, params); + layout.addView(aboutView, params); GlobalApplication.getWinBollActivityManager().add(this); } @@ -62,40 +75,18 @@ public class AboutActivity extends BaseActivity implements IWinBollActivity { } public AboutView CreateAboutView() { - String szBranchName = "aes"; + String szBranchName = "mymessagemanager"; APPInfo appInfo = new APPInfo(); - appInfo.setAppName("AES"); + appInfo.setAppName(getString(R.string.app_name)); appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll); - appInfo.setAppDescription("AES Description"); + appInfo.setAppDescription(getString(R.string.app_description)); appInfo.setAppGitName("APP"); appInfo.setAppGitOwner("Studio"); appInfo.setAppGitAPPBranch(szBranchName); appInfo.setAppGitAPPSubProjectFolder(szBranchName); - appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES"); - appInfo.setAppAPKName("AES"); - appInfo.setAppAPKFolderName("AES"); + appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=MyMessageManager"); + appInfo.setAppAPKName("MyMessageManager"); + appInfo.setAppAPKFolderName("MyMessageManager"); return new AboutView(mContext, appInfo); } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.toolbar_about, menu); - return super.onCreateOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - /*if (item.getItemId() == R.id.item_help) { - ToastUtils.show("R.id.item_help"); - } else */if (item.getItemId() == android.R.id.home) { - GlobalApplication.getWinBollActivityManager().finish(this); - } - return super.onOptionsItemSelected(item); - } - - @Override - protected void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - setTitle(mContext.getString(R.string.text_about) + mContext.getString(R.string.app_name)); - } } 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 a87156b..45763b6 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 @@ -13,6 +13,7 @@ import android.widget.ScrollView; import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogView; +import cc.winboll.studio.mymessagemanager.App; import cc.winboll.studio.mymessagemanager.BuildConfig; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.MainActivity; @@ -42,7 +43,7 @@ public class MainActivity extends BaseActivity { public static final int MY_PERMISSIONS_REQUEST = 0; static MainActivity _mMainActivity; - LogView mLogView; + //LogView mLogView; AppConfigUtil mAppConfigUtil; ConfirmSwitchView msvEnableService; ConfirmSwitchView msvOnlyReceiveContacts; @@ -118,8 +119,8 @@ public class MainActivity extends BaseActivity { // void initView() { // 设置调试日志 - mLogView = findViewById(R.id.logview); - mLogView.start(); +// mLogView = findViewById(R.id.logview); +// mLogView.start(); // 设置消息处理函数 setOnActivityMessageReceived(mIOnActivityMessageReceived); @@ -267,7 +268,7 @@ public class MainActivity extends BaseActivity { protected void onResume() { super.onResume(); reloadSMS(); - mLogView.start(); + //mLogView.start(); } @Override @@ -310,7 +311,9 @@ public class MainActivity extends BaseActivity { Intent i = new Intent(MainActivity.this, AppSettingsActivity.class); i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(i); - } else if (nItemId == R.id.app_unittest) { + } else if (nItemId == R.id.app_log) { + 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); startActivity(i); 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 new file mode 100644 index 0000000..94ed786 --- /dev/null +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/WinBollActivity.java @@ -0,0 +1,60 @@ +package cc.winboll.studio.mymessagemanager.activitys; + +/** + * @Author ZhanGSKen@AliYun.Com + * @Date 2025/03/31 01:31:17 + * @Describe 应用活动窗口基类 + */ +import android.app.Activity; +import android.os.Bundle; +import android.view.MenuItem; +import androidx.appcompat.app.AppCompatActivity; +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 static final String TAG = "WinBollActivity"; + + protected volatile AESThemeBean.ThemeType mThemeType; + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + mThemeType = getThemeType(); + setThemeStyle(); + super.onCreate(savedInstanceState); + } + + AESThemeBean.ThemeType getThemeType() { + /*SharedPreferences sharedPreferences = getSharedPreferences( + SHAREDPREFERENCES_NAME, MODE_PRIVATE); + return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))]; + */ + return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext())); + } + + void setThemeStyle() { + //setTheme(AESThemeBean.getThemeStyle(getThemeType())); + setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext())); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if(item.getItemId() == android.R.id.home) { + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } +} diff --git a/mymessagemanager/src/main/res/layout/activity_about.xml b/mymessagemanager/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..787ec5b --- /dev/null +++ b/mymessagemanager/src/main/res/layout/activity_about.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/mymessagemanager/src/main/res/layout/activity_main.xml b/mymessagemanager/src/main/res/layout/activity_main.xml index 9291777..fe12c67 100644 --- a/mymessagemanager/src/main/res/layout/activity_main.xml +++ b/mymessagemanager/src/main/res/layout/activity_main.xml @@ -72,11 +72,5 @@ - - diff --git a/mymessagemanager/src/main/res/menu/toolbar_main.xml b/mymessagemanager/src/main/res/menu/toolbar_main.xml index ac86798..347c8cd 100644 --- a/mymessagemanager/src/main/res/menu/toolbar_main.xml +++ b/mymessagemanager/src/main/res/menu/toolbar_main.xml @@ -19,6 +19,9 @@ android:title="@string/text_smsrule"/> + diff --git a/mymessagemanager/src/main/res/xml/network_security_config.xml b/mymessagemanager/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..ee39aa4 --- /dev/null +++ b/mymessagemanager/src/main/res/xml/network_security_config.xml @@ -0,0 +1,6 @@ + + + + winboll.cc + +