<mymessagemanager>APK 15.2.1 release Publish.

1.启用了只接受通讯录，通讯录里有记录
2.如果不是数字通讯地址，但是在通讯录内
3.通讯地址是数字，并且在短信接收规则内。
以上3种情况就接收，其他一律放到回收站。

androiddemo/build.gradle

@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
@@ -46,11 +46,11 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
-    // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
-
     // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    //api 'com.android.support:appcompat-v7:28.0.0'
+    api('com.android.support:appcompat-v7:28.0.0'){
+        exclude group: "com.android.support", module: "support-vector-drawable"
+    }
     // https://mvnrepository.com/artifact/com.android.support/support-compat
     api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
@@ -66,6 +66,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
     api 'com.android.support:recyclerview-v7:28.0.0'
     
-    api 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:23:51 GMT 2025
+#Sat Mar 29 04:34:14 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=11
+buildCount=15
 baseBetaVersion=15.0.1

androidxdemo/build.gradle

@@ -60,13 +60,14 @@ dependencies {
     // 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.0.0'
+    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 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    api 'cc.winboll.studio:libaes:15.2.1'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:19:57 GMT 2025
+#Sat Mar 29 04:28:00 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=8
+buildCount=11
 baseBetaVersion=15.0.1

appbase/build.gradle

@@ -30,7 +30,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.1"
+        versionName "15.2"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
-stageCount=1
+#Sat Mar 29 11:28:02 HKT 2025
+stageCount=3
 libraryProject=libappbase
-baseVersion=15.1
-publishVersion=15.1.0
-buildCount=130
-baseBetaVersion=15.1.1
+baseVersion=15.2
+publishVersion=15.2.2
+buildCount=0
+baseBetaVersion=15.2.3

appbase/src/main/AndroidManifest.xml

@@ -32,12 +32,15 @@
 
         </activity>
 
-        <activity android:name=".activities.NewActivity"
+        <activity
+            android:name=".activities.NewActivity"
+            android:label="NewActivity"
             android:exported="true"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
 
         <activity android:name=".activities.New2Activity"
+            android:label="New2Activity"
             android:exported="true"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>

appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java

@@ -1,12 +1,10 @@
 package cc.winboll.studio.appbase;
 
 import android.app.Activity;
-import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -16,17 +14,17 @@ import cc.winboll.studio.appbase.activities.NewActivity;
 import cc.winboll.studio.appbase.services.MainService;
 import cc.winboll.studio.appbase.services.TestDemoBindService;
 import cc.winboll.studio.appbase.services.TestDemoService;
+import cc.winboll.studio.libappbase.CrashHandler;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.LogActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import android.support.v7.widget.Toolbar;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
 
-public class MainActivity extends AppCompatActivity implements IWinBollActivity {
+public class MainActivity extends WinBollActivityBase implements IWinBollActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -71,12 +69,6 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
-            return true;
-        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
-            moveTaskToBack(true);
-        }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
         return super.onOptionsItemSelected(item);
     }
@@ -94,6 +86,13 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
 	public void onSwitchDebugMode(View view) {
         boolean isDebuging = ((CheckBox)view).isChecked();
         GlobalApplication.setIsDebuging(isDebuging);
+        GlobalApplication.saveDebugStatus();
+    }
+   
+    public void onPreviewGlobalCrashActivity(View view) {
+        Intent intent = new Intent(this, GlobalCrashActivity.class);
+        intent.putExtra(CrashHandler.EXTRA_CRASH_INFO, "Demo log...");
+        startActivity(intent);
     }
 
     public void onStartCenter(View view) {
@@ -139,6 +138,8 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         startService(intent);
 
     }
+    
+    
 
     public void onStopTestDemoService(View view) {
         Intent intent = new Intent(this, TestDemoService.class);
@@ -176,7 +177,7 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
     }
 
     public void onTestOpenNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
     }
 
     

appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java

@@ -0,0 +1,82 @@
+package cc.winboll.studio.appbase;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 15:34:16
+ * @Describe 应用活动窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import cc.winboll.studio.appbase.App;
+import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+
+public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
+
+    public static final String TAG = "WinBollActivityBase";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWinBollActivityManager().add(this);
+    }
+
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+    }
+    
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
+            return true;
+        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
+            //moveTaskToBack(true);
+            exit();
+        }
+        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
+        return super.onOptionsItemSelected(item);
+    }
+
+    void exit() {
+        YesNoAlertDialog.show(this, "Exit " + getString(R.string.app_name), "Close all activity and exit?", new YesNoAlertDialog.OnDialogResultListener(){
+
+                @Override
+                public void onYes() {
+                    App.getWinBollActivityManager().finishAll();
+                }
+
+                @Override
+                public void onNo() {
+                }
+            });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getWinBollActivityManager().registeRemove(this);
+    }
+}

appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java

@@ -7,16 +7,16 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.appbase.WinBollActivityBase;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class New2Activity extends AppCompatActivity implements IWinBollActivity {
+public class New2Activity extends WinBollActivityBase implements IWinBollActivity {
 
     public static final String TAG = "New2Activity";
 
@@ -52,15 +52,15 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
     }
 
     public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBollActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBollActivityManager().finishAll();
     }
 
     public void onNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, NewActivity.class);
     }
     
 
@@ -74,10 +74,8 @@ public class New2Activity extends AppCompatActivity implements IWinBollActivity
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
             return true;
-        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
-            moveTaskToBack(true);
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
         return super.onOptionsItemSelected(item);

appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java

@@ -6,16 +6,16 @@ package cc.winboll.studio.appbase.activities;
  */
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import cc.winboll.studio.appbase.R;
+import cc.winboll.studio.appbase.WinBollActivityBase;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-public class NewActivity extends AppCompatActivity implements IWinBollActivity {
+public class NewActivity extends WinBollActivityBase implements IWinBollActivity {
 
     public static final String TAG = "NewActivity";
 
@@ -50,15 +50,15 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
     }
 
     public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
+        GlobalApplication.getWinBollActivityManager().finish(this);
     }
 
     public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
+        GlobalApplication.getWinBollActivityManager().finishAll();
     }
 
     public void onNew2Activity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
+        GlobalApplication.getWinBollActivityManager().startWinBollActivity(this, New2Activity.class);
     }
     
 
@@ -72,10 +72,8 @@ public class NewActivity extends AppCompatActivity implements IWinBollActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
             return true;
-        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
-            moveTaskToBack(true);
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
         return super.onOptionsItemSelected(item);

appbase/src/main/res/layout/activity_main.xml

@@ -39,28 +39,41 @@
 					android:layout_height="wrap_content"
 					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
 
-				<LinearLayout
-					android:orientation="horizontal"
+				<HorizontalScrollView
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="right|center_vertical">
+					android:layout_height="wrap_content">
 
-					<CheckBox
-						android:layout_width="wrap_content"
+					<LinearLayout
+						android:orientation="horizontal"
 						android:layout_height="wrap_content"
-						android:text="Debug Mode"
-						android:layout_weight="1.0"
-						android:onClick="onSwitchDebugMode"
-						android:id="@+id/activitymainCheckBox1"/>
+						android:gravity="right|center_vertical"
+						android:layout_width="wrap_content">
 
-					<Button
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:text="Test Application CrashReport"
-						android:textAllCaps="false"
-						android:onClick="onTestApplicationCrashReport"/>
+						<CheckBox
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Debug Mode"
+							android:layout_weight="1.0"
+							android:onClick="onSwitchDebugMode"
+							android:id="@+id/activitymainCheckBox1"/>
 
-				</LinearLayout>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="Test Application CrashReport"
+							android:textAllCaps="false"
+							android:onClick="onTestApplicationCrashReport"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="PreviewGlobalCrashActivity"
+							android:textAllCaps="false"
+							android:onClick="onPreviewGlobalCrashActivity"/>
+
+					</LinearLayout>
+
+				</HorizontalScrollView>
 
 				<ScrollView
 					android:layout_width="match_parent"
@@ -72,26 +85,27 @@
 						android:layout_height="wrap_content"
 						android:gravity="right">
 
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+						<LinearLayout
+							android:orientation="horizontal"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content">
 
-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StartCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStartCenter"/>
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StartCenter"
+								android:textAllCaps="false"
+								android:onClick="onStartCenter"/>
+
+							<Button
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:text="StopCenter"
+								android:textAllCaps="false"
+								android:onClick="onStopCenter"/>
+
+						</LinearLayout>
 
-                            <Button
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="StopCenter"
-                                android:textAllCaps="false"
-                                android:onClick="onStopCenter"/>
-                        </LinearLayout>
-                        
 						<HorizontalScrollView
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content">
@@ -160,7 +174,6 @@
 
 						</HorizontalScrollView>
 
-
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
@@ -181,14 +194,14 @@
 							android:text="TestDemoServiceSOS"
 							android:textAllCaps="false"
 							android:onClick="onTestDemoServiceSOS"/>
-                        
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="TestOpenNewActivity"
-                            android:textAllCaps="false"
-                            android:onClick="onTestOpenNewActivity"/>
-                        
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestOpenNewActivity"
+							android:textAllCaps="false"
+							android:onClick="onTestOpenNewActivity"/>
+
 					</LinearLayout>
 
 				</ScrollView>
@@ -198,6 +211,6 @@
 		</LinearLayout>
 
 	</ScrollView>
-    
+
 </LinearLayout>
 

libappbase/build.gradle

@@ -24,9 +24,13 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
+    //api 'com.android.support:appcompat-v7:28.0.0'
+    api('com.android.support:appcompat-v7:28.0.0'){
+        //exclude group: "com.android.support", module: "support-vector-drawable"
+        exclude group: "com.android.support:animated-vector-drawable:28.0.0"
+    }
     // https://mvnrepository.com/artifact/com.android.support/support-compat
-    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
+    //api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
     api 'com.android.support:support-v4:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-media-compat

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
-stageCount=1
+#Sat Mar 29 11:27:54 HKT 2025
+stageCount=3
 libraryProject=libappbase
-baseVersion=15.1
-publishVersion=15.1.0
-buildCount=130
-baseBetaVersion=15.1.1
+baseVersion=15.2
+publishVersion=15.2.2
+buildCount=0
+baseBetaVersion=15.2.3

libappbase/src/main/AndroidManifest.xml

@@ -9,12 +9,16 @@
     <!-- 发送持久广播 -->
     <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
 
+    <!-- 对正在运行的应用重新排序 -->
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
     <application>
 
         <activity
             android:name=".CrashHandler$CrashActivity"
             android:label="CrashActivity"
-            android:launchMode="standard"/>
+            android:launchMode="singleInstance"
+            android:process=":CrashActivity"/>
 
         <activity
             android:name=".GlobalCrashActivity"
@@ -23,7 +27,8 @@
             android:process=":GlobalCrashActivity"/>
 
         <activity
-            android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
+            android:name=".winboll.LogActivity"
+            android:label="LogActivity"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
@@ -42,7 +47,8 @@
             android:name=".services.TestService"
             android:exported="true"/>
 
-        <receiver android:name=".receiver.MyBroadcastReceiver"
+        <receiver
+            android:name=".receiver.MyBroadcastReceiver"
             android:exported="true">
 
             <intent-filter>
@@ -85,7 +91,8 @@
 
         <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
 
-        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
+        <receiver
+            android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
             android:exported="true">
 
             <intent-filter>

libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java

@@ -339,6 +339,7 @@ public final class CrashHandler {
                     int padding = dp2px(16);
                     message.setPadding(padding, padding, padding, padding);
                     message.setText(mLog);
+                    message.setTextColor(Color.BLACK);
                     message.setTextIsSelectable(true);
                 }
                 hw.addView(message);

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -19,28 +19,18 @@ public class GlobalApplication extends Application {
 
     public static final String TAG = "GlobalApplication";
 
-    final static String PREFS = GlobalApplication.class.getName() + "PREFS";
-    final static String PREFS_ISDEBUGING = "PREFS_ISDEBUGING";
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
     volatile static GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     volatile static boolean isDebuging = false;
     MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
 
     public static void setIsDebuging(boolean isDebuging) {
+        GlobalApplication.isDebuging = isDebuging;
+    }
+    
+    public static void saveDebugStatus() {
         if (_GlobalApplication != null) {
-            GlobalApplication.isDebuging = isDebuging;
-            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging));
-            // 获取SharedPreferences实例
-//        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-//        // 获取编辑器
-//        SharedPreferences.Editor editor = sharedPreferences.edit();
-//        // 保存数据
-//        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
-//        // 提交更改
-//        editor.apply();
+            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(GlobalApplication.isDebuging));
         }
     }
 
@@ -56,57 +46,39 @@ public class GlobalApplication extends Application {
         return isDebuging;
     }
 
-    @Override
-    public Context getApplicationContext() {
-        return super.getApplicationContext();
-    }
-
-    public Application getApplication() {
-        return this;
+    public static WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(_GlobalApplication);
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-
-        // _GlobalApplication 取值调试部分
-        //
-        boolean is_GlobalApplicationNull = false;
-        if (_GlobalApplication == null) {
-            is_GlobalApplicationNull = true;
-            _GlobalApplication = this;
-        } else {
-            is_GlobalApplicationNull = false;
-            _GlobalApplication = this;
-        }
-
-        // 设置应用调试标志
-        APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
-        if (appBaseModel == null) {
-            setIsDebuging(false);
-        } else {
-            setIsDebuging(appBaseModel.isDebuging());
-        }
-
+        // 保存初始实例
+        _GlobalApplication = this;
+        
+        setIsDebuging(true);
+        // 添加日志模块
         LogUtils.init(this);
         //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
         //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
         //LogUtils.setALlTAGListEnable(true);
         //LogUtils.d(TAG, "LogUtils init");
-
         // 设置应用异常处理窗口
         CrashHandler.init(this);
-
         // 初始化 Toast 框架
         ToastUtils.init(this);
 
-        // _GlobalApplication 取值调试部分
-        //
-        LogUtils.d(TAG, String.format("is_GlobalApplicationNull is %s", is_GlobalApplicationNull));
-
-        WinBollActivityManager.getInstance(_GlobalApplication);
-        WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-        // 注册回调
+        // 应用保存的调试标志
+        APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
+        if (appBaseModel == null) {
+            setIsDebuging(false);
+            saveDebugStatus();
+        } else {
+            setIsDebuging(appBaseModel.isDebuging());
+        }
+        
+        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+        // 注册窗口回调监听
         mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
         registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }
@@ -115,7 +87,6 @@ public class GlobalApplication extends Application {
     @Override
     public void onTerminate() {
         super.onTerminate();
-        _GlobalApplication = null;
         // 注销回调（非必须，但建议释放资源）
         unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
     }

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java

@@ -4,26 +4,20 @@ package cc.winboll.studio.libappbase;
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/02/11 00:14:05
  */
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.R;
 
-public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
+public final class GlobalCrashActivity extends AppCompatActivity implements MenuItem.OnMenuItemClickListener {
 
     private static final int MENUITEM_COPY = 0;
     private static final int MENUITEM_RESTART = 1;
@@ -45,10 +39,10 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
         setContentView(R.layout.activity_globalcrash);
         mGlobalCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
         mGlobalCrashReportView.setReport(mLog);
-        setActionBar(mGlobalCrashReportView.getToolbar());
+        setSupportActionBar(mGlobalCrashReportView.getToolbar());
         
-        getActionBar().setTitle(CrashHandler.TITTLE);
-        getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+        getSupportActionBar().setTitle(CrashHandler.TITTLE);
+        getSupportActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
     }
 
     @Override
@@ -98,20 +92,4 @@ public final class GlobalCrashActivity extends Activity implements MenuItem.OnMe
         mGlobalCrashReportView.updateMenuStyle();
         return true;
     }
-
-    void joinQQGroup(String key) {
-        // 创建Intent
-        Intent intent = new Intent();
-        // 设置动作
-        intent.setAction("android.intent.action.VIEW");
-        // 设置数据为网址的URI
-        Uri content_url = Uri.parse("https://www.winboll.cc");
-        intent.setData(content_url);
-        // 添加标志
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        // 设置类名和活动名
-        intent.setClassName("com.android.browser", "com.android.browser.BrowserActivity");
-        // 启动Activity
-        startActivity(intent);
-    }
 }

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java

@@ -8,6 +8,7 @@ package cc.winboll.studio.libappbase;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.support.v7.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
@@ -16,7 +17,6 @@ import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import cc.winboll.studio.libappbase.R;
-import android.widget.Toolbar;
 
 public class GlobalCrashReportView extends LinearLayout {
 

libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java

@@ -220,7 +220,17 @@ public class LogUtils {
     }
 
     static boolean isLoggable(String tag, LOG_LEVEL logLevel) {
-        return _IsInited && mapTAGList.get(tag) && isInTheLevel(logLevel);
+        if (!_IsInited) {
+            return false;
+        } 
+        if (mapTAGList.get(tag) == null
+            || !mapTAGList.get(tag)) {
+            return false;
+        } 
+        if (!isInTheLevel(logLevel)) {
+            return false;
+        }
+        return true;
     }
 
     static boolean isInTheLevel(LOG_LEVEL logLevel) {

libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java

@@ -0,0 +1,60 @@
+package cc.winboll.studio.libappbase.dialogs;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 17:40:47
+ * @Date 2024/08/12 14:46:25
+ * @Describe 询问用户确定与否的选择框
+ */
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+
+public class YesNoAlertDialog {
+
+    public static final String TAG = "YesNoAlertDialog";
+
+    public static void show(Context context, String szTitle, String szMessage, final OnDialogResultListener listener) {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(
+            context);
+
+        // set title
+        alertDialogBuilder.setTitle(szTitle);
+
+        // set dialog message
+        alertDialogBuilder
+            .setMessage(szMessage)
+            .setCancelable(true)
+            .setOnCancelListener(new DialogInterface.OnCancelListener(){
+                @Override
+                public void onCancel(DialogInterface dialog) {
+                    listener.onNo();
+                }
+            })
+            .setPositiveButton("YES", new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    // if this button is clicked, close
+                    // current activity
+                    listener.onYes();
+                }
+            })
+            .setNegativeButton("NO", new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    // if this button is clicked, just close
+                    // the dialog box and do nothing
+                    dialog.cancel();
+                }
+            });
+
+        // create alert dialog
+        AlertDialog alertDialog = alertDialogBuilder.create();
+
+        // show it
+        alertDialog.show();
+    }
+
+    public interface OnDialogResultListener {
+        abstract void onYes();
+        abstract void onNo();
+    }
+}

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java

@@ -8,24 +8,17 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Intent;
 import android.os.Bundle;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity; 
+import cc.winboll.studio.libappbase.utils.ToastUtils; 
 
 public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
 
     public static final String TAG = "MyActivityLifecycleCallbacks";
-    
-    
+
     public String mInfo = "";
 
     public MyActivityLifecycleCallbacks() {
-        
-    }
-    
-    WinBollActivityManager getWinBollActivityManager() {
-        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+
     }
 
     void createActivityeInfo(Activity activity) {
@@ -54,7 +47,7 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
     }
 
     public void showActivityeInfo() {
-        ToastUtils.show("ActivityeInfo : " + mInfo);
+        //ToastUtils.show("ActivityeInfo : " + mInfo);
         LogUtils.d(TAG, "ActivityeInfo : " + mInfo);
     }
 
@@ -64,7 +57,6 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
         //System.out.println(activity.getLocalClassName() + " was created"); 
         LogUtils.d(TAG, activity.getLocalClassName() + " was created");
         createActivityeInfo(activity);
-        getWinBollActivityManager().add((IWinBollActivity)activity);
     } 
 
     @Override 
@@ -102,6 +94,5 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc
     public void onActivityDestroyed(Activity activity) { 
         //System.out.println(activity.getLocalClassName() + " was destroyed");
         LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-        getWinBollActivityManager().registeRemove((IWinBollActivity)activity);
     } 
 }

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java

@@ -12,6 +12,7 @@ import android.app.ActivityManager;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.HashMap;
@@ -29,27 +30,25 @@ public class WinBollActivityManager {
         };
 
     // 应用类型标志
-    volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
+    static volatile WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
 
-    Context mContext;
-    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-    static volatile WinBollActivityManager _mWinBollActivityManager;
+    GlobalApplication mGlobalApplication;
+    static volatile WinBollActivityManager _Instance;
     static volatile Map<String, IWinBollActivity> _mapIWinBollList;
-    static volatile IWinBollActivity firstIWinBollActivity;
+    volatile IWinBollActivity mFirstIWinBollActivity;
 
-    public WinBollActivityManager(Context context) {
-        mContext = context;
-        LogUtils.d(TAG, "WinBollActivityManager()");
+    WinBollActivityManager(GlobalApplication application) {
+        mGlobalApplication = application;
         _mapIWinBollList = new HashMap<String, IWinBollActivity>();
     }
 
-    public static synchronized WinBollActivityManager getInstance(Context context) {
+    public static synchronized WinBollActivityManager getInstance(GlobalApplication application) {
         LogUtils.d(TAG, "getInstance");
-        if (_mWinBollActivityManager == null) {
-            LogUtils.d(TAG, "_mWinBollActivityManager == null");
-            _mWinBollActivityManager = new WinBollActivityManager(context);
+        if (_Instance == null) {
+            LogUtils.d(TAG, "_Instance == null");
+            _Instance = new WinBollActivityManager(application);
         }
-        return _mWinBollActivityManager;
+        return _Instance;
     }
 
     //
@@ -73,11 +72,12 @@ public class WinBollActivityManager {
         String tag = ((IWinBollActivity)iWinBoll).getTag();
         LogUtils.d(TAG, String.format("add(T iWinBoll) tag is %s", tag));
         if (isActive(tag)) {
-            LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
+            LogUtils.d(TAG, String.format("isActive(tag) is true, tag : %s.", tag));
         } else {
             // 设置起始活动窗口，以便最后退出时提问
-            if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
-                firstIWinBollActivity = iWinBoll;
+            if (mFirstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
+                LogUtils.d(TAG, "Set firstIWinBollActivity, iWinBoll.getTag() is %s" + iWinBoll.getTag());
+                mFirstIWinBollActivity = iWinBoll;
             }
 
             // 添加到活动窗口列表
@@ -102,7 +102,7 @@ public class WinBollActivityManager {
                 resumeActivity(context, tag);
                 return;
             }
-            ToastUtils.show("startWinBollActivity(Context context, Class<T> clazz)");
+            //ToastUtils.show("startWinBollActivity(Context context, Class<T> clazz)");
 
             // 新建一个任务窗口
             Intent intent = new Intent(context, clazz);
@@ -168,7 +168,7 @@ public class WinBollActivityManager {
     }
 
     public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
-        return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
+        return mFirstIWinBollActivity != null && mFirstIWinBollActivity == iWinBollActivity;
     }
 
     //
@@ -220,10 +220,10 @@ public class WinBollActivityManager {
     //
     public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
         LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoll)");
-        ActivityManager am = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager am = (ActivityManager) mGlobalApplication.getSystemService(Context.ACTIVITY_SERVICE);
         //返回启动它的根任务（home 或者 MainActivity）
-        Intent intent = new Intent(mContext, iWinBoll.getClass());
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mContext);
+        Intent intent = new Intent(mGlobalApplication, iWinBoll.getClass());
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mGlobalApplication);
         stackBuilder.addNextIntentWithParentStack(intent);
         stackBuilder.startActivities();
         //moveTaskToFront(YourTaskId, 0);
@@ -287,7 +287,7 @@ public class WinBollActivityManager {
                 IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
                 iWinBoll.getActivity().finish();
                 if (preIWinBoll != null) {
-                    resumeActivity(mContext, preIWinBoll);
+                    resumeActivity(mGlobalApplication, preIWinBoll);
                 }
             }
 

libappbase/src/main/res/layout/view_globalcrashreport.xml

@@ -7,9 +7,9 @@
 	android:layout_height="match_parent"
 	android:id="@+id/viewglobalcrashreportLinearLayout1">
 
-	<android.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		android:id="@+id/viewglobalcrashreportToolbar1"/>
 
 	<ScrollView

mymessagemanager/build.gradle

@@ -18,18 +18,18 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.mymessagemanager"
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 8
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "4.1" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -44,26 +44,28 @@ android {
 }
 
 dependencies {
-	api 'cc.winboll.studio:winboll-shared:1.6.4'
-    api 'io.github.medyo:android-about-page:2.0.0'
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    
+	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 fileTree(dir: 'libs', include: ['*.jar'])
+    api 'cc.winboll.studio:libaes:15.2.3'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

mymessagemanager/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 25 10:52:41 GMT 2025
-stageCount=14
+#Mon Mar 31 02:29:38 HKT 2025
+stageCount=2
 libraryProject=
-baseVersion=4.1
-publishVersion=4.1.13
-buildCount=5
-baseBetaVersion=4.1.14
+baseVersion=15.2
+publishVersion=15.2.1
+buildCount=0
+baseBetaVersion=15.2.2

mymessagemanager/src/main/AndroidManifest.xml

@@ -53,30 +53,28 @@
     </queries>
 
     <application
-        android:name=".GlobalApplication"
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:roundIcon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/WinBoll.SupportThemeNoActionBar"
+        android:theme="@style/MyAppTheme"
         android:persistent="true"
         android:resizeableActivity="true"
         android:supportsRtl="true"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
-            android:name=".activitys.SMSActivity"
-            android:process=":sms"/>
+            android:name=".activitys.SMSActivity"/>
 
         <activity
-            android:name=".activitys.SMSReceiveRuleActivity"
-            android:process=":smsars">
+            android:name=".activitys.SMSReceiveRuleActivity">
 
         </activity>
 
         <activity
             android:name=".activitys.SharedJSONReceiveActivity"
-            android:process=":smssjr"
             android:exported="true">
 
             <intent-filter>
@@ -98,17 +96,14 @@
         </activity>
 
         <activity
-            android:name=".activitys.TTSPlayRuleActivity"
-            android:process=":ttsrule"/>
+            android:name=".activitys.TTSPlayRuleActivity"/>
 
         <activity
-            android:name=".activitys.AboutActivity"
-            android:process=":about"/>
+            android:name=".activitys.AboutActivity"/>
 
         <activity
             android:name=".activitys.MainActivity"
-            android:exported="true"
-            android:process=":main">
+            android:exported="true">
 
             <intent-filter>
 
@@ -122,8 +117,7 @@
 
         <activity
             android:name=".activitys.ComposeSMSActivity"
-            android:exported="true"
-            android:process=":csms">
+            android:exported="true">
 
             <intent-filter>
 
@@ -226,6 +220,8 @@
 
         <activity android:name="cc.winboll.studio.mymessagemanager.activitys.SMSRecycleActivity"/>
 
+        <activity android:name="cc.winboll.studio.mymessagemanager.unittest.UnitTestActivity"/>
+
     </application>
 
 </manifest>

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/App.java

@@ -6,13 +6,12 @@ package cc.winboll.studio.mymessagemanager;
  * @Describe 全局应用类
  */
 import android.view.Gravity;
+import cc.winboll.studio.libappbase.GlobalApplication;
 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";
 
@@ -30,7 +29,7 @@ public class GlobalApplication extends WinBollApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        //setIsDebug(cc.winboll.studio.mymessagemanager.BuildConfig.DEBUG);
+        setIsDebuging(BuildConfig.DEBUG);
 
         // 初始化 Toast 框架
         ToastUtils.init(this);
@@ -45,8 +44,4 @@ public class GlobalApplication extends WinBollApplication {
         _mszConfigUtilPath = _mszAppExternalFilesDir + File.separator + _mszConfigUtilFileName;
         _mszSMSReceiveRuleUtilPath = _mszAppExternalFilesDir + File.separator + _mszSMSReceiveRuleUtilFileName;
     }
-
-    public static void showApplicationMessage(String szMessage) {
-        LogUtils.i(TAG, szMessage);
-    }
 }

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/AboutActivity.java

@@ -3,72 +3,90 @@ package cc.winboll.studio.mymessagemanager.activitys;
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2024/07/14 13:20:33
- * @Describe 应用关于对话窗口
+ * @Describe 应用介绍窗口
  */
-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 cc.winboll.studio.libaes.utils.AESThemeUtil;
+import android.app.Activity;
 import android.content.Context;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+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;
 
-final public class AboutActivity extends WinBollActivity {
+public class AboutActivity extends WinBollActivity implements IWinBollActivity {
 
     public static final String TAG = "AboutActivity";
 
     Context mContext;
-    
+    Toolbar mToolbar;
+
+    @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);
+        mContext = this;
         setContentView(R.layout.activity_about);
-        mContext = getApplicationContext();
+
+        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);
+//        // 创建布局参数（宽度和高度）
+//        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
+        );
+        layout.addView(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);
-    }
-
-    @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) {
-            WinBollActivityManager.getInstance(getApplicationContext()).finish(this);
-        }
-        return super.onOptionsItemSelected(item);
+    public AboutView CreateAboutView() {
+        String szBranchName = "mymessagemanager";
+        APPInfo appInfo = new APPInfo();
+        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.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=MyMessageManager");
+        appInfo.setAppAPKName("MyMessageManager");
+        appInfo.setAppAPKFolderName("MyMessageManager");
+        return new AboutView(mContext, appInfo);
     }
 }

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));

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;

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/MainActivity.java

@@ -10,28 +10,26 @@ 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.App;
 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;
 
 public class MainActivity extends BaseActivity {
 
@@ -45,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;
@@ -121,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);
@@ -270,7 +268,7 @@ public class MainActivity extends BaseActivity {
     protected void onResume() {
         super.onResume();
         reloadSMS();
-        mLogView.start();
+        //mLogView.start();
     }
 
     @Override
@@ -303,27 +301,33 @@ public class MainActivity extends BaseActivity {
 		int nItemId = item.getItemId();
         if (nItemId == R.id.app_ttsrule) {
 			Intent i = new Intent(MainActivity.this, TTSPlayRuleActivity.class);
-			i.setFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT | Intent.FLAG_ACTIVITY_NEW_TASK);
+			i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 			startActivity(i);
 		} else if (nItemId == R.id.app_smsrule) {
 			Intent i = new Intent(MainActivity.this, SMSReceiveRuleActivity.class);
-			i.setFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT | Intent.FLAG_ACTIVITY_NEW_TASK);
+			i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 			startActivity(i);
 		} else if (nItemId == R.id.app_appsettings) {
             Intent i = new Intent(MainActivity.this, AppSettingsActivity.class);
-            i.setFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT | Intent.FLAG_ACTIVITY_NEW_TASK);
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
-		} else if (nItemId ==  R.id.app_crashtest) {
+		} 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);
+        } else if (nItemId ==  R.id.app_crashtest) {
             for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
                 getString(i);
             }
         } else if (nItemId ==  R.id.app_about) {
             Intent i = new Intent(MainActivity.this, AboutActivity.class);
-            i.setFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT | Intent.FLAG_ACTIVITY_NEW_TASK);
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
         } else if (nItemId ==  R.id.app_smsrecycle) {
             Intent i = new Intent(MainActivity.this, SMSRecycleActivity.class);
-            i.setFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT | Intent.FLAG_ACTIVITY_NEW_TASK);
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             startActivity(i);
         }
         

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/activitys/SMSActivity.java

@@ -18,10 +18,10 @@ import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.mymessagemanager.R;
 import cc.winboll.studio.mymessagemanager.activitys.SMSActivity;
 import cc.winboll.studio.mymessagemanager.adapters.SMSArrayAdapter;
+import cc.winboll.studio.mymessagemanager.utils.AddressUtils;
 import cc.winboll.studio.mymessagemanager.utils.SMSUtil;
 import cc.winboll.studio.mymessagemanager.utils.ViewUtil;
 import cc.winboll.studio.mymessagemanager.views.SMSListViewForScrollView;
-import cc.winboll.studio.mymessagemanager.views.SMSView;
 import java.lang.ref.WeakReference;
 
 public class SMSActivity extends BaseActivity {
@@ -102,7 +102,7 @@ public class SMSActivity extends BaseActivity {
 
         // 初始化标题栏
         mToolbar = findViewById(R.id.activitysmsASupportToolbar1);
-        mToolbar.setSubtitle(getString(R.string.activity_name_smsinphone) + " < Phone : " + mszPhoneTo + " >");
+        mToolbar.setSubtitle(getString(R.string.activity_name_smsinphone) + " < Phone : " + AddressUtils.getFormattedAddress(mszPhoneTo) + " >");
         setActionBar(mToolbar);
 
         // 初始化滚动窗口

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

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 {
 

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);
+    }
+}

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/PhoneArrayAdapter.java

@@ -9,13 +9,14 @@ 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;
 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;
 
@@ -74,9 +75,9 @@ public class PhoneArrayAdapter extends BaseAdapter {
             viewHolder = (ViewHolder) convertView.getTag();
         }
 
-		String szAddress = ((SMSBean)getItem(position)).getAddress();
+		final String szAddress = ((SMSBean)getItem(position)).getAddress();
 
-		viewHolder.tvAddress.setText(szAddress);
+		viewHolder.tvAddress.setText(AddressUtils.getFormattedAddress(szAddress));
 		viewHolder.tvName.setText(getName(szAddress));
 
         //Drawable drawableFrame = AppCompatResources.getDrawable(mContext, R.drawable.bg_frame);
@@ -87,7 +88,7 @@ public class PhoneArrayAdapter extends BaseAdapter {
 
                     //Toast.makeText(mContext, tv.getText(), Toast.LENGTH_SHORT).show();
                     Intent intent = new Intent(mContext, SMSActivity.class);
-                    intent.putExtra(SMSActivity.EXTRA_PHONE, viewHolder.tvAddress.getText());
+                    intent.putExtra(SMSActivity.EXTRA_PHONE, szAddress);
                     mContext.startActivity(intent);
                 }
 

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/adapters/SMSRecycleAdapter.java

@@ -34,6 +34,7 @@ import cc.winboll.studio.mymessagemanager.views.DateAgoTextView;
 import cc.winboll.studio.mymessagemanager.views.SMSView;
 import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
+import cc.winboll.studio.mymessagemanager.utils.AddressUtils;
 
 public class SMSRecycleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -154,7 +155,7 @@ public class SMSRecycleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         final SMSRecycleBean item = mDataList.get(position);
         if (holder.getItemViewType() == 0) {
             SimpleViewHolder viewHolder = (SimpleViewHolder) holder;
-            viewHolder.mtvAddress.setText(item.getAddress());
+            viewHolder.mtvAddress.setText(AddressUtils.getFormattedAddress(item.getAddress()));
             viewHolder.mbtnViewBody.setOnClickListener(new View.OnClickListener(){
                     @Override
                     public void onClick(View v) {
@@ -179,7 +180,7 @@ public class SMSRecycleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 viewHolder.mvRight.setVisibility(View.GONE);
                 viewHolder.mSMSView.setSMSType(SMSView.SMSType.SEND);
             }
-            viewHolder.mtvAddress.setText(item.getAddress());
+            viewHolder.mtvAddress.setText(AddressUtils.getFormattedAddress(item.getAddress()));
             viewHolder.mdatvDeleteDate.setDate(item.getDeleteDate());
             viewHolder.mdatvDate.setDate(item.getDate());
             if(mAppConfigUtil.mAppConfigBean.isSMSRecycleProtectMode()) {

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 {

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 {

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;

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;

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 {

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;

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 {
 

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,7 +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;
 
 public class SMSRecevier extends BroadcastReceiver {
 
@@ -39,31 +39,17 @@ public class SMSRecevier extends BroadcastReceiver {
             //LogUtils.d(TAG, "ACTION_SMS_RECEIVED");
             String szSmsBody = SMSUtil.getSmsBody(intent);
             String szSmsAddress = SMSUtil.getSmsAddress(intent);
-            PhoneUtil phoneUtil = new PhoneUtil(context);
-            boolean isPhoneInContacts = phoneUtil.isPhoneInContacts(szSmsAddress);
             AppConfigUtil configUtil = AppConfigUtil.getInstance(context);
-            boolean isOnlyReceiveContacts = configUtil.mAppConfigBean.isEnableOnlyReceiveContacts();
             boolean isEnableTTS = configUtil.mAppConfigBean.isEnableTTS();
             boolean isEnableTTSAnalyzeMode = configUtil.mAppConfigBean.isEnableTTSRuleMode();
-            boolean isInSMSAcceptRule = SMSReceiveRuleUtil.getInstance(context, false).checkIsSMSAcceptInRule(context, szSmsBody);
-            //LogUtils.d(TAG, "isInSMSAcceptRule is : " + Boolean.toString(isInSMSAcceptRule));
 
-            if (!isPhoneInContacts) {
-                GlobalApplication.showApplicationMessage(" The phone number " + szSmsAddress + " is not in contacts.");
-                if (isOnlyReceiveContacts) {
-                    GlobalApplication.showApplicationMessage("Close the \"Only Receive Contacts\" switch will be receive The " + szSmsAddress + "'s message in future.");
-                }
-            }
-
-            if ((!isOnlyReceiveContacts)
-                || isPhoneInContacts
-                || isInSMSAcceptRule) {
+            if (checkIsSMSOK(context, szSmsBody, szSmsAddress)) {
                 int nResultId = SMSUtil.saveReceiveSms(context, szSmsAddress, szSmsBody, "0", System.currentTimeMillis(), "inbox");
                 if (nResultId >= 0) {
                     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]");
+                    LogUtils.d(TAG, "<" + szSmsAddress + "> : ( " + szSmsBody + " ) [SAVED]");
                     if (isEnableTTS) {
                         if (isEnableTTSAnalyzeMode) {
                             TTSPlayRuleUtil ttsPlayRuleUtil = TTSPlayRuleUtil.getInstance(context);
@@ -81,12 +67,41 @@ public class SMSRecevier extends BroadcastReceiver {
                 SMSRecycleUtil.addSMSRecycleItem(context, bean);
             }
         }
-
-
-
     }
 
+    //
+    // 检查短信是否在接收设定规则内
+    //
+    public static boolean checkIsSMSOK(Context context, String szSmsBody, String szSmsAddress) {
+        PhoneUtil phoneUtil = new PhoneUtil(context);
+        boolean isPhoneInContacts = phoneUtil.isPhoneInContacts(szSmsAddress);
+        LogUtils.d(TAG, String.format("isPhoneInContacts %s", isPhoneInContacts));
 
+        boolean isPhoneByDigit = phoneUtil.isPhoneByDigit(szSmsAddress);
+        LogUtils.d(TAG, String.format("isPhoneByDigit %s", isPhoneByDigit));
+
+        AppConfigUtil configUtil = AppConfigUtil.getInstance(context);
+        boolean isOnlyReceiveContacts = configUtil.mAppConfigBean.isEnableOnlyReceiveContacts();
+        LogUtils.d(TAG, String.format("isOnlyReceiveContacts %s", isOnlyReceiveContacts));
+
+        boolean isInSMSAcceptRule = SMSReceiveRuleUtil.getInstance(context, false).checkIsSMSAcceptInRule(context, szSmsBody);
+        LogUtils.d(TAG, String.format("isInSMSAcceptRule %s", isInSMSAcceptRule));
+
+        // 启用了只接受通讯录，通讯录里有记录
+        if (isOnlyReceiveContacts && isPhoneInContacts) {
+            return true;
+        }
+        // 如果不是数字通讯地址，但是在通讯录内
+        if (!isPhoneByDigit && isPhoneInContacts) {
+            return true;
+        }
+        // 通讯地址是数字，并且在短信接收规则内。
+        if (isPhoneByDigit && isInSMSAcceptRule) {
+            return true;
+        }
+        
+        return false;
+    }
 }
     
     

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 {

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/AddressUtils_Test.java

@@ -0,0 +1,28 @@
+package cc.winboll.studio.mymessagemanager.unittest;
+import android.content.Context;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.mymessagemanager.utils.AddressUtils;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/01 13:07:32
+ * @Describe AddressUtils Test
+ */
+public class AddressUtils_Test {
+
+    public static final String TAG = "AddressUtils_Test";
+
+    public static void main(Context context) {
+        String szSmsBody = "无影无迹";
+        String szSmsAddress = "无名小辈";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(szSmsAddress)));
+        szSmsAddress = "13172887736";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(szSmsAddress)));
+        szSmsAddress = "+8613172887736";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(szSmsAddress)));
+        szSmsAddress = "8613172887736";
+        LogUtils.d(TAG, String.format("szSmsAddress %s\n getFormattedAddress : %s", szSmsAddress, AddressUtils.getFormattedAddress(szSmsAddress)));
+        
+    }
+
+}

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/SMSRecevier_Test.java

@@ -0,0 +1,56 @@
+package cc.winboll.studio.mymessagemanager.unittest;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/25 19:02:15
+ * @Describe SMSRecevier 测试类
+ */
+import android.content.Context;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.mymessagemanager.receivers.SMSRecevier;
+
+public class SMSRecevier_Test {
+
+    public static final String TAG = "SMSRecevier_Test";
+
+    public static void main(Context context) {
+        String szSmsBody = "无影无迹";
+        String szSmsAddress = "无名小辈";
+        test1(context, szSmsBody, szSmsAddress);
+        
+        szSmsBody = "无影无迹";
+        szSmsAddress = "淘宝物流";
+        test1(context, szSmsBody, szSmsAddress);
+        
+        szSmsBody = "无影无迹";
+        szSmsAddress = "1?0";
+        test1(context, szSmsBody, szSmsAddress);
+        
+        szSmsBody = "无影无迹";
+        szSmsAddress = "10000";
+        test1(context, szSmsBody, szSmsAddress);
+        
+        szSmsBody = "【UC】无影无迹";
+        szSmsAddress = "无名小辈";
+        test1(context, szSmsBody, szSmsAddress);
+        
+        szSmsBody = "【UC】无影无迹";
+        szSmsAddress = "10000";
+        test1(context, szSmsBody, szSmsAddress);
+        
+        szSmsBody = "【UC】无影无迹";
+        szSmsAddress = "13172887736";
+        test1(context, szSmsBody, szSmsAddress);
+        
+        szSmsBody = "【UC】无影无迹";
+        szSmsAddress = "+8613172887736";
+        test1(context, szSmsBody, szSmsAddress);
+        
+    }
+    
+    public static void test1(Context context, String szSmsBody, String szSmsAddress) {
+        
+        boolean isSMSOK = SMSRecevier.checkIsSMSOK(context, szSmsBody, szSmsAddress);
+        LogUtils.d(TAG, String.format("szSmsBody : %s\nszSmsAddress : %s\nisSMSOK : %s", szSmsBody, szSmsAddress, isSMSOK));
+    }
+}

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/unittest/UnitTestActivity.java

@@ -0,0 +1,36 @@
+package cc.winboll.studio.mymessagemanager.unittest;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/25 19:00:10
+ * @Describe 应用单元测试窗口
+ */
+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;
+
+public class UnitTestActivity extends Activity {
+
+    public static final String TAG = "UnitTestActivity";
+
+    LogView mLogView;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_unittest);
+        
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+    }
+
+    public void onMain(View view) {
+        LogUtils.d(TAG, "SMSRecevier_Test");
+        SMSRecevier_Test.main(this);
+        LogUtils.d(TAG, "AddressUtils_Test");
+        AddressUtils_Test.main(this);
+    }
+}

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/AddressUtils.java

@@ -0,0 +1,20 @@
+package cc.winboll.studio.mymessagemanager.utils;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/01 13:03:16
+ * @Describe 通信录地址工具
+ */
+public class AddressUtils {
+    
+    public static final String TAG = "AddressUtils";
+    
+    public static String getFormattedAddress(String address) {
+        if (address != null && address.matches("[+]?\\d+")) {
+            return address;
+        } else {
+            return "【" + address + "】";
+        }
+    }
+    
+}

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;

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 {
 

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;

mymessagemanager/src/main/java/cc/winboll/studio/mymessagemanager/utils/PhoneUtil.java

@@ -10,11 +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.Matcher;
+import java.util.regex.Pattern;
 
 public class PhoneUtil {
 
@@ -67,4 +70,23 @@ public class PhoneUtil {
         return false;
     }
 
+    //
+    // 检验电话号码是否是数字
+    //
+    public static boolean isPhoneByDigit(String szPhone) {
+        if(!RegexPPiUtils.isPPiOK(szPhone)) {
+            return false;
+        }
+        //String text = "这里是一些任意的文本内容";
+        String regex = "[+]?\\d+";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(szPhone);
+        LogUtils.d(TAG, String.format("matcher.matches() : %s", matcher.matches()));
+        /*if (matcher.matches()) {
+         System.out.println("文本满足该正则表达式模式");
+         } else {
+         System.out.println("文本不满足该正则表达式模式");
+         }*/
+        return matcher.matches();
+    }
 }

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 {
 
@@ -194,9 +193,9 @@ public class SMSReceiveRuleUtil {
     public ArrayList<SMSAcceptRuleBean> loadConfigData() {
         ArrayList<SMSAcceptRuleBean> list = new ArrayList<SMSAcceptRuleBean>();
         SMSAcceptRuleBean.loadBeanList(mContext, list, SMSAcceptRuleBean.class);
-        for (int i = 0; i < list.size(); i++) {
-            LogUtils.d(TAG, "loadConfigData isEnable : " + Boolean.toString(list.get(i).isEnable()));
-        }
+//        for (int i = 0; i < list.size(); i++) {
+//            LogUtils.d(TAG, "loadConfigData isEnable : " + Boolean.toString(list.get(i).isEnable()));
+//        }
         mDataList.clear();
         mDataList.addAll(list);
         return mDataList;

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;

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;
 

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;

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 {

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 {
 

mymessagemanager/src/main/res/layout/activity_about.xml

@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-   <!--<androidx.appcompat.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/activityaboutToolbar1"/>-->
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <cc.winboll.studio.libaes.views.ASupportToolbar
         android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_height"
-		android:id="@+id/activityaboutASupportToolbar1"/>
+        android:layout_height="wrap_content"
+        android:id="@+id/toolbar"/>
 
-    <cc.winboll.studio.shared.view.AboutView
-        app:appname="MyMessageManager"
-        app:appprojectname="MyMessageManager"
-        app:appdescription="用正则表达式方法自定义短信过滤和语音播报的短信应用。"
-        app:appicon="@drawable/ic_winboll"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/activityaboutAboutView1"/>
+        android:layout_height="0dp"
+        android:layout_weight="1.0"
+        android:id="@+id/aboutviewroot_ll"/>
 
 </LinearLayout>
-

mymessagemanager/src/main/res/layout/activity_main.xml

@@ -72,11 +72,5 @@
 
 	</com.baoyz.widget.PullRefreshLayout>
 
-	<cc.winboll.studio.shared.log.LogView
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="120dp"
-		android:id="@+id/logview"/>
-
 </LinearLayout>
 

mymessagemanager/src/main/res/layout/activity_unittest.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="500dp">
+
+		<LinearLayout
+			android:orientation="vertical"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Test Main"
+					android:onClick="onMain"
+					android:textAllCaps="false"/>
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+	<cc.winboll.studio.shared.log.LogView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/logview"/>
+
+</LinearLayout>
+

mymessagemanager/src/main/res/menu/toolbar_main.xml

@@ -19,6 +19,12 @@
         android:title="@string/text_smsrule"/>
     <item android:title="@string/app_developoptions">
         <menu>
+            <item
+                android:id="@+id/app_log"
+                android:title="@string/app_log"/>
+            <item
+                android:id="@+id/app_unittest"
+                android:title="@string/app_unittest"/>
             <item
                 android:id="@+id/app_crashtest"
                 android:title="@string/app_crashtest"/>

mymessagemanager/src/main/res/values-zh/strings.xml

@@ -9,6 +9,7 @@
     <string name="app_goldentheme">辉煌历程主题</string>
     <string name="app_developoptions">开发选项</string>
     <string name="app_default_app_settings">默认应用设置</string>
+    <string name="app_unittest">单元测试</string>
     <string name="app_crashtest">应用异常崩溃处理测试</string>
     <string name="app_about">关于应用</string>
     <string name="app_smsrecycle">短信回收站</string>

mymessagemanager/src/main/res/values/strings.xml

@@ -9,6 +9,7 @@
     <string name="app_goldentheme">Golden Theme</string>
     <string name="app_developoptions">Develop Options</string>
     <string name="app_default_app_settings">Default App Settings</string>
+    <string name="app_unittest">Unit Test</string>
     <string name="app_crashtest">Crash Test</string>
     <string name="app_about">About APP</string>
     <string name="app_smsrecycle">SMS Recycle</string>

mymessagemanager/src/main/res/values/themes.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="MyDefaultAESTheme" parent="DefaultAESTheme">
+    <style name="MyAppTheme" parent="AESTheme">
         <item name="android:textSize">20sp</item>
         <item name="attrSMSViewSendColor">@color/colorSMSSendColor</item>
         <item name="attrSMSViewInboxColor">@color/colorSMSInboxColor</item>

mymessagemanager/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">winboll.cc</domain>
+    </domain-config>
+</network-security-config>