From 36fb8b41a4c50353560c3404c031244402809ae8 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 10:17:55 +0800 Subject: [PATCH] 1017 --- mymessagemanager/build.gradle | 22 +++-- mymessagemanager/build.properties | 4 +- mymessagemanager/src/main/AndroidManifest.xml | 6 +- .../{GlobalApplication.java => App.java} | 6 +- .../activitys/AboutActivity.java | 91 +++++++++++++------ .../activitys/BaseActivity.java | 8 +- .../activitys/ComposeSMSActivity.java | 1 - .../activitys/MainActivity.java | 12 +-- .../activitys/SMSReceiveRuleActivity.java | 4 +- .../activitys/SMSRecycleActivity.java | 4 +- .../adapters/PhoneArrayAdapter.java | 2 +- .../mymessagemanager/beans/AppConfigBean.java | 3 +- .../beans/SMSAcceptRuleBean.java | 2 +- .../mymessagemanager/beans/SMSBean.java | 2 +- .../beans/SMSRecycleBean.java | 2 +- .../beans/TTSPlayRuleBean.java | 2 +- .../beans/TTSPlayRuleBean_V1.java | 2 +- .../receivers/MainReceiver.java | 2 +- .../receivers/SMSRecevier.java | 7 +- .../services/MainService.java | 2 +- .../unittest/AddressUtils_Test.java | 2 +- .../unittest/SMSRecevier_Test.java | 3 +- .../unittest/UnitTestActivity.java | 4 +- .../mymessagemanager/utils/FileUtil.java | 2 +- .../utils/NotificationUtil.java | 2 +- .../utils/PermissionUtil.java | 2 +- .../mymessagemanager/utils/PhoneUtil.java | 4 +- .../utils/SMSReceiveRuleUtil.java | 3 +- .../utils/SMSRecycleUtil.java | 2 +- .../mymessagemanager/utils/SMSUtil.java | 2 +- .../utils/TTSPlayRuleUtil.java | 2 +- .../utils/TextToSpeechUtil.java | 2 +- .../views/ConfirmSwitchView.java | 2 +- .../src/main/res/layout/activity_about.xml | 27 ++---- .../src/main/res/layout/activity_main.xml | 2 +- .../src/main/res/values/themes.xml | 2 +- 36 files changed, 131 insertions(+), 116 deletions(-) rename mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/{GlobalApplication.java => App.java} (90%) diff --git a/mymessagemanager/build.gradle b/mymessagemanager/build.gradle index 598d76f..7808564 100644 --- a/mymessagemanager/build.gradle +++ b/mymessagemanager/build.gradle @@ -23,7 +23,7 @@ android { defaultConfig { applicationId "cc.winboll.studio.mymessagemanager" - minSdkVersion 26 + minSdkVersion 24 targetSdkVersion 29 versionCode 8 // versionName 更新后需要手动设置 @@ -46,24 +46,26 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:winboll-shared:1.6.4' - api 'io.github.medyo:android-about-page:2.0.0' + api 'io.github.medyo:android-about-page:2.0.0' api 'com.github.getActivity:ToastUtils:10.5' api 'com.jcraft:jsch:0.1.55' api 'org.jsoup:jsoup:1.13.1' api 'com.squareup.okhttp3:okhttp:4.4.1' - api 'androidx.appcompat:appcompat:1.0.0' - api 'androidx.fragment:fragment:1.0.0' - api 'com.google.android.material:material:1.0.0' - // 权限请求框架：https://github.com/getActivity/XXPermissions api 'com.github.getActivity:XXPermissions:18.63' api 'com.baoyz.pullrefreshlayout:library:1.2.0' - api 'androidx.appcompat:appcompat:1.0.0' - api 'androidx.fragment:fragment:1.0.0' + // AndroidX 类库 + api 'androidx.appcompat:appcompat:1.1.0' + api 'com.google.android.material:material:1.4.0' + //api 'androidx.viewpager:viewpager:1.0.0' + //api 'androidx.vectordrawable:vectordrawable:1.1.0' + //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' + //api 'androidx.fragment:fragment:1.1.0' api 'com.google.android.material:material:1.0.0' - api 'cc.winboll.studio:libaes:7.6.0' + api 'cc.winboll.studio:libappbase:15.2.0' + api 'cc.winboll.studio:libapputils:15.2.0' + api 'cc.winboll.studio:libaes:15.2.0' } diff --git a/mymessagemanager/build.properties b/mymessagemanager/build.properties index 438bde5..3e33d3b 100644 --- a/mymessagemanager/build.properties +++ b/mymessagemanager/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Mar 26 17:54:55 HKT 2025 +#Sat Mar 29 02:15:42 GMT 2025 stageCount=1 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=0 +buildCount=3 baseBetaVersion=15.0.1 diff --git a/mymessagemanager/src/main/AndroidManifest.xml b/mymessagemanager/src/main/AndroidManifest.xml index 90f6448..ac412a6 100644 --- a/mymessagemanager/src/main/AndroidManifest.xml +++ b/mymessagemanager/src/main/AndroidManifest.xml @@ -53,12 +53,12 @@ - \ No newline at end of file + diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/GlobalApplication.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java similarity index 90% rename from mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/GlobalApplication.java rename to mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java index a14351e..2bea4f8 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/GlobalApplication.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java @@ -6,13 +6,13 @@ package cc.winboll.studio.mymessagemanager; * @Describe 全局应用类 */ import android.view.Gravity; +import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; -import cc.winboll.studio.shared.app.WinBollApplication; -import cc.winboll.studio.shared.log.LogUtils; import com.hjq.toast.ToastUtils; import java.io.File; -public class GlobalApplication extends WinBollApplication { +public class App extends GlobalApplication { public static final String TAG = "GlobalApplication"; 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 51750d6..2bfdecf 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 @@ -5,55 +5,80 @@ package cc.winboll.studio.mymessagemanager.activitys; * @Date 2024/07/14 13:20:33 * @Describe 应用关于对话窗口 */ +import android.app.Activity; +import android.content.Context; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; -import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.mymessagemanager.R; -import cc.winboll.studio.shared.app.WinBollActivity; -import cc.winboll.studio.shared.app.WinBollActivityManager; -import com.hjq.toast.ToastUtils; +import android.view.ViewGroup; +import android.widget.LinearLayout; import cc.winboll.studio.libaes.utils.AESThemeUtil; -import android.content.Context; +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; -final public class AboutActivity extends WinBollActivity { +public class AboutActivity extends BaseActivity implements IWinBollActivity { public static final String TAG = "AboutActivity"; Context mContext; - + + @Override + public Activity getActivity() { + return this; + } + @Override public String getTag() { return TAG; } - @Override - protected boolean isEnableDisplayHomeAsUp() { - return false; - } - @Override protected void onCreate(Bundle savedInstanceState) { - setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext())); super.onCreate(savedInstanceState); - setContentView(R.layout.activity_about); - mContext = getApplicationContext(); + setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext())); + //setContentView(R.layout.activity_about); + mContext = this; + + LinearLayout layout = findViewById(R.id.aboutmain_ll); + + AboutView aboutView = CreateAboutView(); + layout.addView(aboutView); + // 在 Activity 的 onCreate 或其他生命周期方法中调用 +// 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); + + GlobalApplication.getWinBollActivityManager().add(this); } @Override - protected void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - setTitle(mContext.getString(R.string.text_about) + mContext.getString(R.string.app_name)); + protected void onDestroy() { + super.onDestroy(); + GlobalApplication.getWinBollActivityManager().registeRemove(this); } - @Override - protected boolean isAddWinBollToolBar() { - return false; - } - - @Override - protected Toolbar initToolBar() { - return findViewById(R.id.activityaboutASupportToolbar1); + public AboutView CreateAboutView() { + String szBranchName = "aes"; + APPInfo appInfo = new APPInfo(); + appInfo.setAppName("AES"); + appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll); + appInfo.setAppDescription("AES 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"); + return new AboutView(mContext, appInfo); } @Override @@ -65,10 +90,16 @@ final public class AboutActivity extends WinBollActivity { @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) { - WinBollActivityManager.getInstance(getApplicationContext()).finish(this); + 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/BaseActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/BaseActivity.java index 233f18a..066c3c8 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 @@ -1,6 +1,5 @@ package cc.winboll.studio.mymessagemanager.activitys; -import cc.winboll.studio.mymessagemanager.R; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -8,9 +7,8 @@ import android.view.Menu; import android.view.MenuItem; import androidx.appcompat.app.AppCompatActivity; import cc.winboll.studio.libaes.utils.AESThemeUtil; -import cc.winboll.studio.shared.log.LogUtils; -import com.hjq.toast.ToastUtils; -import cc.winboll.studio.libaes.beans.AESThemeBean; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.mymessagemanager.R; abstract public class BaseActivity extends AppCompatActivity { @@ -103,7 +101,7 @@ abstract public class BaseActivity extends AppCompatActivity { AESThemeUtil.saveThemeStyleID(this, R.style.MyTaoAESTheme); recreate(); } else if (R.id.item_defaulttheme == item.getItemId()) { - AESThemeUtil.saveThemeStyleID(this, R.style.MyDefaultAESTheme); + 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/ComposeSMSActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/ComposeSMSActivity.java index 03a7a3c..cd995b0 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/ComposeSMSActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/ComposeSMSActivity.java @@ -10,7 +10,6 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.SimpleAdapter; import android.widget.TextView; -import android.widget.Toast; import android.widget.Toolbar; import cc.winboll.studio.libaes.views.AOHPCTCSeekBar; import cc.winboll.studio.mymessagemanager.R; 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 936fbea..a87156b 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 @@ -10,29 +10,25 @@ import android.view.MenuItem; import android.view.View; import android.widget.Button; import android.widget.ScrollView; -import cc.winboll.studio.libaes.views.AToolbar; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.mymessagemanager.BuildConfig; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.MainActivity; import cc.winboll.studio.mymessagemanager.adapters.PhoneArrayAdapter; import cc.winboll.studio.mymessagemanager.services.MainService; +import cc.winboll.studio.mymessagemanager.unittest.UnitTestActivity; import cc.winboll.studio.mymessagemanager.utils.AppConfigUtil; import cc.winboll.studio.mymessagemanager.utils.AppGoToSettingsUtil; import cc.winboll.studio.mymessagemanager.utils.NotificationUtil; import cc.winboll.studio.mymessagemanager.utils.PermissionUtil; import cc.winboll.studio.mymessagemanager.utils.SMSUtil; -import cc.winboll.studio.mymessagemanager.utils.ThemeUtil; import cc.winboll.studio.mymessagemanager.utils.ViewUtil; import cc.winboll.studio.mymessagemanager.views.ConfirmSwitchView; import cc.winboll.studio.mymessagemanager.views.PhoneListViewForScrollView; -import cc.winboll.studio.shared.log.LogUtils; -import cc.winboll.studio.shared.log.LogView; import com.baoyz.widget.PullRefreshLayout; import java.util.ArrayList; -import cc.winboll.studio.libaes.utils.AESThemeUtil; -import cc.winboll.studio.libaes.views.ASupportToolbar; -import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.mymessagemanager.unittest.UnitTestActivity; public class MainActivity extends BaseActivity { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSReceiveRuleActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSReceiveRuleActivity.java index c043091..1b19c61 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSReceiveRuleActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSReceiveRuleActivity.java @@ -21,7 +21,7 @@ import android.widget.Toast; import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import cc.winboll.studio.mymessagemanager.GlobalApplication; +import cc.winboll.studio.mymessagemanager.App; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.SMSReceiveRuleActivity; import cc.winboll.studio.mymessagemanager.adapters.SMSAcceptRuleArrayAdapter; @@ -114,7 +114,7 @@ public class SMSReceiveRuleActivity extends BaseActivity { } void initSMSAcceptRuleBeanAdd() { - mSMSAcceptRuleBeanAdd = new SMSAcceptRuleBean(GlobalApplication.USER_ID, "", true, SMSAcceptRuleBean.RuleType.REFUSE, true); + mSMSAcceptRuleBeanAdd = new SMSAcceptRuleBean(App.USER_ID, "", true, SMSAcceptRuleBean.RuleType.REFUSE, true); } @Override diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSRecycleActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSRecycleActivity.java index 1c61a0a..95b5f9c 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSRecycleActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSRecycleActivity.java @@ -8,16 +8,16 @@ package cc.winboll.studio.mymessagemanager.activitys; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; +import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.SMSRecycleActivity; import cc.winboll.studio.mymessagemanager.adapters.SMSRecycleAdapter; import cc.winboll.studio.mymessagemanager.utils.SMSRecycleUtil; -import cc.winboll.studio.shared.view.YesNoAlertDialog; import com.baoyz.widget.PullRefreshLayout; import java.io.File; -import androidx.appcompat.widget.Toolbar; public class SMSRecycleActivity extends BaseActivity { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java index b5be8bb..12381bc 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.LinearLayout; import android.widget.TextView; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.SMSActivity; import cc.winboll.studio.mymessagemanager.beans.PhoneBean; @@ -16,7 +17,6 @@ import cc.winboll.studio.mymessagemanager.beans.SMSBean; import cc.winboll.studio.mymessagemanager.utils.AddressUtils; import cc.winboll.studio.mymessagemanager.utils.PhoneUtil; import cc.winboll.studio.mymessagemanager.utils.SMSUtil; -import cc.winboll.studio.shared.log.LogUtils; import java.util.ArrayList; import java.util.List; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/AppConfigBean.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/AppConfigBean.java index 364e942..15c5c37 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/AppConfigBean.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/AppConfigBean.java @@ -7,8 +7,7 @@ package cc.winboll.studio.mymessagemanager.beans; */ import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.mymessagemanager.utils.ThemeUtil; -import cc.winboll.studio.shared.app.BaseBean; +import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; public class AppConfigBean extends BaseBean { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSAcceptRuleBean.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSAcceptRuleBean.java index cd145eb..def4799 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSAcceptRuleBean.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSAcceptRuleBean.java @@ -7,7 +7,7 @@ package cc.winboll.studio.mymessagemanager.beans; */ import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.shared.app.BaseBean; +import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; public class SMSAcceptRuleBean extends BaseBean { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSBean.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSBean.java index 7534844..6b6d527 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSBean.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSBean.java @@ -34,7 +34,7 @@ package cc.winboll.studio.mymessagemanager.beans; import android.content.ContentValues; import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.shared.app.BaseBean; +import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; import java.text.Collator; import java.util.ArrayList; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSRecycleBean.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSRecycleBean.java index 7da594b..badf6de 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSRecycleBean.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/SMSRecycleBean.java @@ -7,7 +7,7 @@ package cc.winboll.studio.mymessagemanager.beans; */ import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.shared.app.BaseBean; +import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; import java.text.Collator; import java.util.ArrayList; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean.java index 41ce4f0..68be0f7 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean.java @@ -7,7 +7,7 @@ package cc.winboll.studio.mymessagemanager.beans; */ import android.util.JsonReader; import android.util.JsonWriter; -import cc.winboll.studio.shared.app.BaseBean; +import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; public class TTSPlayRuleBean extends BaseBean { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean_V1.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean_V1.java index b4e2c95..73c64da 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean_V1.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/beans/TTSPlayRuleBean_V1.java @@ -8,8 +8,8 @@ package cc.winboll.studio.mymessagemanager.beans; import android.content.Context; import android.util.JsonReader; import android.util.JsonWriter; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.utils.FileUtil; -import cc.winboll.studio.shared.log.LogUtils; import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/MainReceiver.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/MainReceiver.java index 254039d..eabda26 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/MainReceiver.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/MainReceiver.java @@ -10,9 +10,9 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Build; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.services.MainService; import cc.winboll.studio.mymessagemanager.utils.AppConfigUtil; -import cc.winboll.studio.shared.log.LogUtils; public class MainReceiver extends BroadcastReceiver { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java index 48c1e52..e08240f 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/receivers/SMSRecevier.java @@ -4,7 +4,8 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import cc.winboll.studio.mymessagemanager.GlobalApplication; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.mymessagemanager.App; import cc.winboll.studio.mymessagemanager.activitys.SMSActivity; import cc.winboll.studio.mymessagemanager.beans.SMSBean; import cc.winboll.studio.mymessagemanager.utils.AppConfigUtil; @@ -14,8 +15,6 @@ import cc.winboll.studio.mymessagemanager.utils.SMSReceiveRuleUtil; import cc.winboll.studio.mymessagemanager.utils.SMSRecycleUtil; import cc.winboll.studio.mymessagemanager.utils.SMSUtil; import cc.winboll.studio.mymessagemanager.utils.TTSPlayRuleUtil; -import cc.winboll.studio.mymessagemanager.utils.RegexPPiUtils; -import cc.winboll.studio.shared.log.LogUtils; public class SMSRecevier extends BroadcastReceiver { @@ -50,7 +49,7 @@ public class SMSRecevier extends BroadcastReceiver { NotificationUtil nu = new NotificationUtil(); nu.sendSMSReceivedMessage(context, nResultId, szSmsAddress, szSmsBody); LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent(SMSActivity.ACTION_NOTIFY_SMS_CHANGED)); - GlobalApplication.showApplicationMessage("<" + szSmsAddress + "> : ( " + szSmsBody + " ) [SAVED]"); + App.showApplicationMessage("<" + szSmsAddress + "> : ( " + szSmsBody + " ) [SAVED]"); if (isEnableTTS) { if (isEnableTTSAnalyzeMode) { TTSPlayRuleUtil ttsPlayRuleUtil = TTSPlayRuleUtil.getInstance(context); diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/services/MainService.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/services/MainService.java index 3b8b4ce..8b58d1a 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/services/MainService.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/services/MainService.java @@ -12,6 +12,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.os.IBinder; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.beans.MessageNotificationBean; import cc.winboll.studio.mymessagemanager.receivers.SMSRecevier; @@ -19,7 +20,6 @@ import cc.winboll.studio.mymessagemanager.services.MainService; import cc.winboll.studio.mymessagemanager.utils.AppConfigUtil; import cc.winboll.studio.mymessagemanager.utils.NotificationUtil; import cc.winboll.studio.mymessagemanager.utils.ServiceUtil; -import cc.winboll.studio.shared.log.LogUtils; import com.hjq.toast.ToastUtils; public class MainService extends Service { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java index 1d58783..e310a82 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java @@ -1,6 +1,6 @@ package cc.winboll.studio.mymessagemanager.unittest; -import cc.winboll.studio.shared.log.LogUtils; import android.content.Context; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.utils.AddressUtils; /** diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java index c26d1f4..0d9257f 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java @@ -5,9 +5,8 @@ package cc.winboll.studio.mymessagemanager.unittest; * @Date 2025/02/25 19:02:15 * @Describe SMSRecevier 测试类 */ -import cc.winboll.studio.mymessagemanager.utils.SMSReceiveRuleUtil; import android.content.Context; -import cc.winboll.studio.shared.log.LogUtils; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.receivers.SMSRecevier; public class SMSRecevier_Test { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java index 1a3c4dc..d34fd81 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java @@ -8,9 +8,9 @@ package cc.winboll.studio.mymessagemanager.unittest; import android.app.Activity; import android.os.Bundle; import android.view.View; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.LogView; import cc.winboll.studio.mymessagemanager.R; -import cc.winboll.studio.shared.log.LogUtils; -import cc.winboll.studio.shared.log.LogView; public class UnitTestActivity extends Activity { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/FileUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/FileUtil.java index 49fa200..959ac73 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/FileUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/FileUtil.java @@ -10,7 +10,7 @@ import android.content.Intent; import android.content.res.AssetManager; import android.net.Uri; import androidx.core.content.FileProvider; -import cc.winboll.studio.shared.log.LogUtils; +import cc.winboll.studio.libappbase.LogUtils; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/NotificationUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/NotificationUtil.java index 1c94e56..802fb9c 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/NotificationUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/NotificationUtil.java @@ -15,12 +15,12 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import android.media.RingtoneManager; import android.widget.RemoteViews; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.MainActivity; import cc.winboll.studio.mymessagemanager.activitys.SMSActivity; import cc.winboll.studio.mymessagemanager.beans.MessageNotificationBean; import cc.winboll.studio.mymessagemanager.services.MainService; -import cc.winboll.studio.shared.log.LogUtils; public class NotificationUtil { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PermissionUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PermissionUtil.java index ea0cf52..95afddf 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PermissionUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PermissionUtil.java @@ -10,9 +10,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.BaseActivity; -import cc.winboll.studio.shared.log.LogUtils; import com.hjq.permissions.OnPermissionCallback; import com.hjq.permissions.Permission; import com.hjq.permissions.XXPermissions; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PhoneUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PhoneUtil.java index 5a401ae..05e9220 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PhoneUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PhoneUtil.java @@ -10,14 +10,14 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.provider.ContactsContract; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.beans.PhoneBean; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.regex.Pattern; import java.util.regex.Matcher; -import cc.winboll.studio.shared.log.LogUtils; +import java.util.regex.Pattern; public class PhoneUtil { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSReceiveRuleUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSReceiveRuleUtil.java index bd3be9f..6ea7a04 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSReceiveRuleUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSReceiveRuleUtil.java @@ -7,9 +7,9 @@ package cc.winboll.studio.mymessagemanager.utils; */ import android.content.Context; import android.util.JsonReader; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.beans.SMSAcceptRuleBean; import cc.winboll.studio.mymessagemanager.beans.SMSAcceptRuleBean_V1; -import cc.winboll.studio.shared.log.LogUtils; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.nio.channels.AcceptPendingException; public class SMSReceiveRuleUtil { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSRecycleUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSRecycleUtil.java index 01012ef..eb49323 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSRecycleUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSRecycleUtil.java @@ -6,7 +6,7 @@ package cc.winboll.studio.mymessagemanager.utils; * @Describe 短信回收站工具类 */ import android.content.Context; -import cc.winboll.studio.mymessagemanager.GlobalApplication; +import cc.winboll.studio.mymessagemanager.App; import cc.winboll.studio.mymessagemanager.beans.SMSBean; import cc.winboll.studio.mymessagemanager.beans.SMSRecycleBean; import java.util.ArrayList; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSUtil.java index 0cf09f1..1469ffa 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/SMSUtil.java @@ -17,8 +17,8 @@ import android.os.Bundle; import android.provider.Telephony; import android.telephony.gsm.SmsManager; import android.telephony.gsm.SmsMessage; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.beans.SMSBean; -import cc.winboll.studio.shared.log.LogUtils; import com.hjq.toast.ToastUtils; import java.util.ArrayList; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TTSPlayRuleUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TTSPlayRuleUtil.java index c954dbd..15791e9 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TTSPlayRuleUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TTSPlayRuleUtil.java @@ -10,6 +10,7 @@ import android.content.Intent; import android.os.Message; import android.util.JsonReader; import android.widget.Toast; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.activitys.TTSPlayRuleActivity; import cc.winboll.studio.mymessagemanager.beans.TTSPlayRuleBean; @@ -17,7 +18,6 @@ import cc.winboll.studio.mymessagemanager.beans.TTSPlayRuleBean_V1; import cc.winboll.studio.mymessagemanager.beans.TTSSpeakTextBean; import cc.winboll.studio.mymessagemanager.dialogs.YesNoAlertDialog; import cc.winboll.studio.mymessagemanager.services.TTSPlayService; -import cc.winboll.studio.shared.log.LogUtils; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TextToSpeechUtil.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TextToSpeechUtil.java index a0f62b5..eb07de0 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TextToSpeechUtil.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/TextToSpeechUtil.java @@ -14,9 +14,9 @@ import android.view.Gravity; import android.view.View; import android.view.WindowManager; import android.widget.LinearLayout; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.R; import cc.winboll.studio.mymessagemanager.beans.TTSSpeakTextBean; -import cc.winboll.studio.shared.log.LogUtils; import java.util.ArrayList; public class TextToSpeechUtil { diff --git a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/views/ConfirmSwitchView.java b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/views/ConfirmSwitchView.java index 6c9ebb6..0463b34 100644 --- a/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/views/ConfirmSwitchView.java +++ b/mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/views/ConfirmSwitchView.java @@ -8,8 +8,8 @@ import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.Switch; +import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.mymessagemanager.dialogs.YesNoAlertDialog; -import cc.winboll.studio.shared.log.LogUtils; public class ConfirmSwitchView extends Switch { diff --git a/mymessagemanager/src/main/res/layout/activity_about.xml b/mymessagemanager/src/main/res/layout/activity_about.xml index a2dcf3f..64910ce 100644 --- a/mymessagemanager/src/main/res/layout/activity_about.xml +++ b/mymessagemanager/src/main/res/layout/activity_about.xml @@ -6,24 +6,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - - - + diff --git a/mymessagemanager/src/main/res/layout/activity_main.xml b/mymessagemanager/src/main/res/layout/activity_main.xml index c2c12c3..9291777 100644 --- a/mymessagemanager/src/main/res/layout/activity_main.xml +++ b/mymessagemanager/src/main/res/layout/activity_main.xml @@ -72,7 +72,7 @@ - -