<aes>APK 15.2.5 release Publish.

aes/build.gradle

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "7.6" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,29 +41,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
 	api project(':libaes')
-    
-    //api 'cc.winboll.studio:winboll-shared:1.6.5'
-    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'
-    
-    api 'cc.winboll.studio:libapputils:9.2.1'
-    api 'cc.winboll.studio:libappbase:1.0.3'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jan 19 04:58:59 GMT 2025
-stageCount=3
+#Wed Apr 02 20:08:50 HKT 2025
+stageCount=6
 libraryProject=libaes
-baseVersion=7.6
-publishVersion=7.6.2
-buildCount=4
-baseBetaVersion=7.6.3
+baseVersion=15.2
+publishVersion=15.2.5
+buildCount=0
+baseBetaVersion=15.2.6

aes/src/main/AndroidManifest.xml

@@ -8,9 +8,10 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/WinBoll.SupportThemeNoActionBar"
+        android:theme="@style/MyAESTheme"
         android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".MainActivity"
@@ -30,6 +31,8 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+        <activity android:name=".AboutActivity"/>
+
     </application>
 
 </manifest>

aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java

@@ -0,0 +1,91 @@
+package cc.winboll.studio.aes;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 23:52:29
+ * @Describe AES应用介绍窗口
+ */
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import androidx.appcompat.app.AppCompatActivity;
+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;
+
+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 void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = this;
+        setContentView(R.layout.activity_about);
+        
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(TAG);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        
+        AboutView aboutView = CreateAboutView();
+        // 在 Activity 的 onCreate 或其他生命周期方法中调用
+//        LinearLayout layout = new LinearLayout(this);
+//        layout.setOrientation(LinearLayout.VERTICAL);
+//        // 创建布局参数（宽度和高度）
+//        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 onDestroy() {
+        super.onDestroy();
+        GlobalApplication.getWinBollActivityManager().registeRemove(this);
+    }
+
+    public AboutView CreateAboutView() {
+        String szBranchName = "aes";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("AES");
+        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
+        appInfo.setAppDescription("AES Description");
+        appInfo.setAppGitName("APP");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
+        appInfo.setAppAPKName("AES");
+        appInfo.setAppAPKFolderName("AES");
+        return new AboutView(mContext, appInfo);
+    }
+}

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

@@ -5,16 +5,26 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:03:58
  * @Describe AES应用类
  */
+import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import com.hjq.toast.ToastUtils;
+
 
 public class App extends GlobalApplication {
-    
+
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
         super.onCreate();
-        //setIsDebug(BuildConfig.DEBUG);
+
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+
     }
-    
+
 }

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

@@ -5,12 +5,193 @@ package cc.winboll.studio.aes;
  * @Date 2024/06/13 19:05:52
  * @Describe 应用主窗口
  */
-import cc.winboll.studio.libaes.unittests.LibraryActivity;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Toast;
+import cc.winboll.studio.aes.R;
+import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
+import cc.winboll.studio.libaes.beans.DrawerMenuBean;
+import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
+import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
+import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity;
+import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
+import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
+import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
+import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
+import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import com.hjq.toast.ToastUtils;
+import java.util.ArrayList;
+
+public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
+
 
-public class MainActivity extends LibraryActivity {
-    
     public static final String TAG = "MainActivity";
+
+    TestAButtonFragment mTestAButtonFragment;
+    TestViewPageFragment mTestViewPageFragment;
     
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (mTestAButtonFragment == null) {
+            mTestAButtonFragment = new TestAButtonFragment();
+            addFragment(mTestAButtonFragment);
+        }
+        showFragment(mTestAButtonFragment);
+        //setSubtitle(TAG);
+        //ToastUtils.show("onCreate");
+    }
+
+    @Override
+    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.initDrawerMenuItemList(listDrawerMenu);
+        LogUtils.d(TAG, "initDrawerMenuItemList");
+        //listDrawerMenu.clear();
+        // 添加抽屉菜单项
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.reinitDrawerMenuItemList(listDrawerMenu);
+        LogUtils.d(TAG, "reinitDrawerMenuItemList");
+        //listDrawerMenu.clear();
+        // 添加抽屉菜单项
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public DrawerFragmentActivity.ActivityType initActivityType() {
+        return DrawerFragmentActivity.ActivityType.Main;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_library, menu);
+        if(App.isDebuging()) {
+            getMenuInflater().inflate(cc.winboll.studio.libapputils.R.menu.toolbar_studio_debug, menu);
+        }
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        super.onItemClick(parent, view, position, id);
+        switch (position) {
+            case 0 : {
+                    if (mTestAButtonFragment == null) {
+                        mTestAButtonFragment = new TestAButtonFragment();
+                        addFragment(mTestAButtonFragment);
+                    }
+                    showFragment(mTestAButtonFragment);
+                    break;
+                }
+            case 1 : {
+                    if (mTestViewPageFragment == null) {
+                        mTestViewPageFragment = new TestViewPageFragment();
+                        addFragment(mTestViewPageFragment);
+                    }
+                    showFragment(mTestViewPageFragment);
+                    break;
+                }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int nItemId = item.getItemId();
+//        if (item.getItemId() == R.id.item_log) {
+//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
+//        } else 
+        if (nItemId == R.id.item_atoast) {
+            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
+        } else if (nItemId == R.id.item_atoolbar) {
+            Intent intent = new Intent(this, TestAToolbarActivity.class);
+            startActivity(intent);
+
+        } else if (nItemId == R.id.item_asupporttoolbar) {
+            Intent intent = new Intent(this, TestASupportToolbarActivity.class);
+            startActivity(intent);
+
+        } else if (nItemId == R.id.item_colordialog) {
+            ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary));
+            dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
+
+                    @Override
+                    public void beforeColorChanged() {
+                    }
+
+                    @Override
+                    public void onColorChanged(int color) {
+
+                    }
+
+                    @Override
+                    public void afterColorChanged() {
+                    }
+
+
+                });
+            dlg.show();
+
+        } else if (nItemId ==  R.id.item_dialogstoragepath) {
+            final StoragePathDialog dialog = new StoragePathDialog(this, 0);
+            dialog.setOnOKClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            dialog.show();
+
+        } else if (nItemId ==  R.id.item_localfileselectdialog) {
+            final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this);
+            dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() {
+                    @Override
+                    public void onOKClick(String sz) {
+                        Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
+                        //dialog.dismiss();
+                    }
+                });
+            dialog.open();
+
+        } else if (nItemId ==  R.id.item_secondarylibraryactivity) {
+            Intent intent = new Intent(this, SecondaryLibraryActivity.class);
+            startActivity(intent);
+        } else if (nItemId ==  R.id.item_drawerfragmentactivity) {
+            Intent intent = new Intent(this, TestDrawerFragmentActivity.class);
+            startActivity(intent);
+        } 
+        else if (nItemId ==  R.id.item_about) {
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
     
     
 }

aes/src/main/java/cc/winboll/studio/aes/WinBollActivity.java

@@ -0,0 +1,60 @@
+package cc.winboll.studio.aes;
+
+import android.app.Activity;
+import android.os.Bundle;
+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;
+import android.view.MenuItem;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/30 00:34:02
+ * @Describe WinBoll 活动窗口通用基类
+ */
+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);
+    }
+}

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

@@ -0,0 +1,22 @@
+<?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">
+
+	<cc.winboll.studio.libaes.views.ASupportToolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/toolbar"/>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/aboutviewroot_ll"/>
+
+</LinearLayout>
+

aes/src/main/res/menu/toolbar_library.xml

@@ -13,7 +13,7 @@
     <item
         android:id="@+id/item_localfileselectdialog"
         android:title="LocalFileSelectDialog"/>
-    
+
     <item
         android:id="@+id/item_atoolbar"
         android:title="Test AToolbar"/>

aes/src/main/res/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FF00B322</color>
+    <color name="colorPrimaryDark">#FF005C12</color>
+    <color name="colorAccent">#FF8DFFA2</color>
+    <color name="colorText">#FFFFFB8D</color>
+</resources>

aes/src/main/res/values/styles.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="MyAESTheme" parent="AESTheme">
     </style>
 </resources>

aes/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>

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.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 29 08:43:44 HKT 2025
-stageCount=1
+#Sat Mar 29 11:28:02 HKT 2025
+stageCount=3
 libraryProject=libappbase
 baseVersion=15.2
-publishVersion=15.2.0
+publishVersion=15.2.2
 buildCount=0
-baseBetaVersion=15.2.1
+baseBetaVersion=15.2.3

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

@@ -86,6 +86,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit
 	public void onSwitchDebugMode(View view) {
         boolean isDebuging = ((CheckBox)view).isChecked();
         GlobalApplication.setIsDebuging(isDebuging);
+        GlobalApplication.saveDebugStatus();
     }
    
     public void onPreviewGlobalCrashActivity(View view) {

contacts/build.gradle

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.contacts"
-        minSdkVersion 24
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "1.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,41 +41,31 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
+        // 二维码使用的类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    
+    api 'io.github.medyo:android-about-page:2.0.0'
+    api 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.jcraft:jsch:0.1.55'
+    api 'org.jsoup:jsoup:1.13.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.viewpager:viewpager:1.0.0'
+    api 'androidx.fragment:fragment:1.1.0'
+    api 'com.google.android.material:material:1.4.0'
+    
+    api 'cc.winboll.studio:libapputils:9.3.2'
+    api 'cc.winboll.studio:libappbase:1.5.6'
+    
     api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.github.getActivity:XXPermissions:18.63'
-    // 下拉控件
-    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    // 拼音搜索
-    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
-    implementation 'com.github.open-android:pinyin4j:2.5.0'
-    // SSH
-    implementation 'com.jcraft:jsch:0.1.55'
-    // Html 解析
-    implementation 'org.jsoup:jsoup:1.13.1'
-    // 二维码类库
-    implementation 'com.google.zxing:core:3.4.1'
-    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
-    // 应用介绍页类库
-    implementation 'io.github.medyo:android-about-page:2.0.0'
-    // 吐司类库
-    implementation 'com.github.getActivity:ToastUtils:10.5'
-    // 网络连接类库
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    // Android 类库
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    
-    implementation 'cc.winboll.studio:libappbase:15.2.0'
-    implementation 'cc.winboll.studio:libapputils:15.2.0'
-    implementation 'cc.winboll.studio:libaes:15.2.0'
 }

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Mar 29 09:34:54 HKT 2025
-stageCount=1
+#Tue Feb 25 00:17:29 HKT 2025
+stageCount=2
 libraryProject=
-baseVersion=15.2
-publishVersion=15.2.0
+baseVersion=1.0
+publishVersion=1.0.1
 buildCount=0
-baseBetaVersion=15.2.1
+baseBetaVersion=1.0.2

contacts/src/main/AndroidManifest.xml

@@ -29,13 +29,9 @@
 
     <!-- 更改您的音频设置 -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-
-    <!-- 读取通话记录 -->
-    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
-
-    <!-- 录音 -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-
+        
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+        
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -69,7 +65,7 @@
 
         <activity
             android:name=".phonecallui.PhoneCallActivity"
-            android:launchMode="singleTask"
+            android:launchMode="singleInstance"
             android:exported="true">
 
             <intent-filter>
@@ -186,8 +182,6 @@
 
         </provider>
 
-        <activity android:name="cc.winboll.studio.contacts.activities.UnitTestActivity"/>
-
     </application>
 
-</manifest>
+</manifest>

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

@@ -7,8 +7,7 @@ package cc.winboll.studio.contacts;
  */
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
 
 public class App extends GlobalApplication {
 
@@ -18,14 +17,12 @@ public class App extends GlobalApplication {
     public void onCreate() {
         // 必须在调用基类前设置应用调试标志，
         // 这样可以预先设置日志与数据的存储根目录。
-        setIsDebuging(BuildConfig.DEBUG);
+        setIsDebuging(this, BuildConfig.DEBUG);
         super.onCreate();
         // 设置 WinBoll 应用 UI 类型
         WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
         
         LogUtils.d(TAG, "onCreate");
-        
-        ToastUtils.init(this);
     }
 
 }

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

@@ -1,44 +1,52 @@
 package cc.winboll.studio.contacts;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.role.RoleManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.telecom.TelecomManager;
-import android.telephony.PhoneStateListener;
-import android.telephony.TelephonyManager;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Switch;
 import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.core.content.ContextCompat;
 import androidx.viewpager.widget.ViewPager;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.activities.SettingsActivity;
+import cc.winboll.studio.contacts.activities.CallActivity;
+import cc.winboll.studio.contacts.adapters.MyPagerAdapter;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
-import cc.winboll.studio.contacts.fragments.CallLogFragment;
-import cc.winboll.studio.contacts.fragments.ContactsFragment;
-import cc.winboll.studio.contacts.fragments.LogFragment;
 import cc.winboll.studio.contacts.services.MainService;
-import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
+import cc.winboll.studio.libapputils.bean.APPInfo;
+import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
+import cc.winboll.studio.contacts.listenphonecall.CallListenerService;
 import com.google.android.material.tabs.TabLayout;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import android.content.DialogInterface;
+import cc.winboll.studio.contacts.activities.SettingsActivity;
 
 final public class MainActivity extends AppCompatActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
@@ -49,13 +57,11 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 
     public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";
 
-    static MainActivity _MainActivity;
     LogView mLogView;
     Toolbar mToolbar;
     CheckBox cbMainService;
     MainServiceBean mMainServiceBean;
-    private TabLayout tabLayout;
-    private ViewPager viewPager;
+    ViewPager viewPager;
     private List<View> views; //用来存放放进ViewPager里面的布局
     //实例化存储imageView（导航原点）的集合
     ImageView[] imageViews;
@@ -64,18 +70,15 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
     LinearLayout linearLayout;//下标所在在LinearLayout布局里
     int currentPoint = 0;//当前被选中中页面的下标
 
-    private TelephonyManager telephonyManager;
-    private MyPhoneStateListener phoneStateListener;
-
     private static final int DIALER_REQUEST_CODE = 1;
 
     @Override
-    public Activity getActivity() {
+    public AppCompatActivity getActivity() {
         return this;
     }
 
-//    @Override
-//    public APPInfo getAppInfo() {
+    @Override
+    public APPInfo getAppInfo() {
 //        String szBranchName = "contacts";
 //
 //        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
@@ -90,8 +93,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //        appInfo.setAppAPKName("Contacts");
 //        appInfo.setAppAPKFolderName("Contacts");
 //        return appInfo;
-//        return null;
-//    }
+        return null;
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -99,50 +102,27 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         //if (prosessIntents(getIntent())) return;
         // 以下正常创建主窗口
         super.onCreate(savedInstanceState);
-        _MainActivity = this;
         setContentView(R.layout.activity_main);
 
         // 初始化工具栏
         mToolbar = findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
-//        if (isEnableDisplayHomeAsUp()) {
-//            // 显示后退按钮
-//            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-//        }
+        if (isEnableDisplayHomeAsUp()) {
+            // 显示后退按钮
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
         getSupportActionBar().setSubtitle(getTag());
-        
-        tabLayout = findViewById(R.id.tabLayout);
-        viewPager = findViewById(R.id.viewPager);
 
-        // 创建Fragment列表和标题列表
-        List<Fragment> fragmentList = new ArrayList<>();
-        List<String> tabTitleList = new ArrayList<>();
-        fragmentList.add(CallLogFragment.newInstance(0));
-        fragmentList.add(ContactsFragment.newInstance(1));
-        fragmentList.add(LogFragment.newInstance(2));
-        tabTitleList.add("通话记录");
-        tabTitleList.add("联系人");
-        tabTitleList.add("应用日志");
+        initData();
+        initView();
+        //initPoint();//调用初始化导航原点的方法
+        viewPager.addOnPageChangeListener(this);//滑动事件
 
-        // 设置ViewPager的适配器
-        MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList);
-        viewPager.setAdapter(adapter);
-
-        // 关联TabLayout和ViewPager
+        ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
+        MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(pagerAdapter);
+        TabLayout tabLayout = findViewById(R.id.activitymainTabLayout1);
         tabLayout.setupWithViewPager(viewPager);
-    
-
-
-//        initData();
-//        initView();
-//        //initPoint();//调用初始化导航原点的方法
-//        viewPager.addOnPageChangeListener(this);//滑动事件
-
-        //ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
-        //MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
-        //viewPager.setAdapter(pagerAdapter);
-        //TabLayout tabLayout = findViewById(R.id.activitymainTabLayout1);
-        //tabLayout.setupWithViewPager(viewPager);
 
 //        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
 //        if (mMainServiceBean == null) {
@@ -160,86 +140,36 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //                    }
 //                }
 //            });
-
-        MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
-        if (mMainServiceBean == null) {
-            mMainServiceBean = new MainServiceBean();
-            MainServiceBean.saveBean(this, mMainServiceBean);
-        }
-        if (mMainServiceBean.isEnable()) {
-            MainService.startMainService(this);
-        }
-
-        // 初始化TelephonyManager和PhoneStateListener
-        telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
-        phoneStateListener = new MyPhoneStateListener();
-        telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-    }
-    
-
-    // ViewPager的适配器
-    private class MyPagerAdapter extends FragmentPagerAdapter {
-
-        private List<Fragment> fragmentList;
-        private List<String> tabTitleList;
-
-        public MyPagerAdapter(FragmentManager fm, List<Fragment> fragmentList, List<String> tabTitleList) {
-            super(fm);
-            this.fragmentList = fragmentList;
-            this.tabTitleList = tabTitleList;
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            return fragmentList.get(position);
-        }
-
-        @Override
-        public int getCount() {
-            return fragmentList.size();
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return tabTitleList.get(position);
-        }
-    }
-
-    public static void dialPhoneNumber(String phoneNumber) {
-        Intent intent = new Intent(Intent.ACTION_DIAL);
-        intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-        if (ActivityCompat.checkSelfPermission(_MainActivity, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        _MainActivity.startActivity(intent);
+        MainService.startMainService(MainActivity.this);
     }
 
     //初始化view，即显示的图片
-//    void initView() {
-//        viewPager = findViewById(R.id.activitymainViewPager1);
-//        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
-//        viewPager.setAdapter(pagerAdapter);
-//        //adapter = new MyPagerAdapter(views);
-//        //viewPager = findViewById(R.id.activitymainViewPager1);
-//        //viewPager.setAdapter(adapter);
-//        //linearLayout = findViewById(R.id.activitymainLinearLayout1);
-//        //initPoint();//初始化页面下方的点
-//        viewPager.setOnPageChangeListener(this);
-//
-//    }
+    void initView() {
+        viewPager = findViewById(R.id.activitymainViewPager1);
+        pagerAdapter = new MyPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(pagerAdapter);
+        //adapter = new MyPagerAdapter(views);
+        //viewPager = findViewById(R.id.activitymainViewPager1);
+        //viewPager.setAdapter(adapter);
+        //linearLayout = findViewById(R.id.activitymainLinearLayout1);
+        //initPoint();//初始化页面下方的点
+        viewPager.setOnPageChangeListener(this);
+
+    }
 
     //初始化所要显示的布局
-//    void initData() {
-//        LayoutInflater inflater = LayoutInflater.from(getActivity());
-//        View view1 = inflater.inflate(R.layout.fragment_call_log, viewPager, false);
-//        View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false);
-//        View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false);
-//
-//        views = new ArrayList<>();
-//        views.add(view1);
-//        views.add(view2);
-//        views.add(view3);
-//    }
+    void initData() {
+        ViewPager viewPager = findViewById(R.id.activitymainViewPager1);
+        LayoutInflater inflater = LayoutInflater.from(getActivity());
+        View view1 = inflater.inflate(R.layout.fragment_call, viewPager, false);
+        View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false);
+        View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false);
+
+        views = new ArrayList<>();
+        views.add(view1);
+        views.add(view2);
+        views.add(view3);
+    }
 
 //    void initPoint() {
 //        imageViews = new ImageView[5];//实例化5个图片
@@ -301,23 +231,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         //setSubTitle("");
     }
 
-    private class MyPhoneStateListener extends PhoneStateListener {
-        @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
-            switch (state) {
-                case TelephonyManager.CALL_STATE_IDLE:
-                    LogUtils.d(TAG, "电话已挂断");
-                    break;
-                case TelephonyManager.CALL_STATE_OFFHOOK:
-                    LogUtils.d(TAG, "正在通话中");
-                    break;
-                case TelephonyManager.CALL_STATE_RINGING:
-                    LogUtils.d(TAG, "来电: " + incomingNumber);
-                    break;
-            }
-        }
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -374,25 +287,40 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         return TAG;
     }
 
-//    @Override
-//    public void onBackPressed() {
-//        exit();
-//    }
-//
-//    void exit() {
-//        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
-//
-//            @Override
-//            public void onYes() {
-//                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
-//            }
-//
-//            @Override
-//            public void onNo() {
-//            }
-//        };
-//        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
-//    }
+    @Override
+    public Toolbar initToolBar() {
+        return findViewById(R.id.activitymainToolbar1);
+    }
+
+    @Override
+    public boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+
+    @Override
+    public void onBackPressed() {
+        exit();
+    }
+
+    void exit() {
+        YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
+
+            @Override
+            public void onYes() {
+                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+            }
+
+            @Override
+            public void onNo() {
+            }
+        };
+        YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
+    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -403,7 +331,11 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.item_settings) {
+        if (item.getItemId() == R.id.item_call) {
+            Intent intent = new Intent(this, CallActivity.class);
+            startActivity(intent);
+            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class);
+        } else if (item.getItemId() == R.id.item_settings) {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
             //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class);

contacts/src/main/java/cc/winboll/studio/contacts/PhoneCallManager.java

@@ -0,0 +1,35 @@
+package cc.winboll.studio.contacts;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/20 21:14:52
+ * @Describe PhoneCallManager
+ */
+
+import android.telecom.Call;
+import android.telecom.VideoProfile;
+
+public class PhoneCallManager {
+    
+    public static final String TAG = "PhoneCallManager";
+    
+    public static Call call;
+
+    /**
+     * 接听电话
+     */
+    public void answer() {
+        if (call != null) {
+            call.answer(VideoProfile.STATE_AUDIO_ONLY);
+        }
+    }
+
+    /**
+     * 断开电话，包括来电时的拒接以及接听后的挂断
+     */
+    public void disconnect() {
+        if (call != null) {
+            call.disconnect();
+        }
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java

@@ -34,7 +34,6 @@ public class CallActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        
         super.onCreate(savedInstanceState);
         //setContentView(R.layout.activity_main);
         setContentView(R.layout.activity_call);

contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java

@@ -4,6 +4,7 @@ package cc.winboll.studio.contacts.activities;
  * @Author ZhanGSKen@AliYun.Com
  * @Date 2025/02/21 05:37:42
  */
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,32 +15,17 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.SeekBar;
 import android.widget.Switch;
-import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.adapters.PhoneConnectRuleAdapter;
-import cc.winboll.studio.contacts.beans.MainServiceBean;
-import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
 import cc.winboll.studio.contacts.beans.RingTongBean;
-import cc.winboll.studio.contacts.beans.SettingsModel;
-import cc.winboll.studio.contacts.bobulltoon.TomCat;
-import cc.winboll.studio.contacts.dun.Rules;
-import cc.winboll.studio.contacts.services.MainService;
-import cc.winboll.studio.contacts.views.DuInfoTextView;
-import cc.winboll.studio.libaes.winboll.APPInfo;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.IWinBollActivity;
+import cc.winboll.studio.libappbase.bean.APPInfo;
 import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
-import java.util.List;
 
 public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {
 
@@ -47,25 +33,11 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
 
     Toolbar mToolbar;
     Switch swSilent;
-    SeekBar msbVolume;
-    TextView mtvVolume;
-    int mnStreamMaxVolume;
-    int mnStreamVolume;
-    Switch mswMainService;
-    static DuInfoTextView _DuInfoTextView;
 
-    // 云盾防御层数量
-    EditText etDunTotalCount;
-    // 防御层恢复时间间隔(秒钟)
-    EditText etDunResumeSecondCount;
-    // 每次恢复防御层数
-    EditText etDunResumeCount;
-    // 是否启用云盾
-    Switch swIsEnableDun;
-
-    private RecyclerView recyclerView;
-    private PhoneConnectRuleAdapter adapter;
-    private List<PhoneConnectRuleModel> ruleList;
+    @Override
+    public APPInfo getAppInfo() {
+        return null;
+    }
 
     @Override
     public AppCompatActivity getActivity() {
@@ -77,6 +49,21 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         return TAG;
     }
 
+    @Override
+    public Toolbar initToolBar() {
+        return findViewById(R.id.activitymainToolbar1);
+    }
+
+    @Override
+    public boolean isAddWinBollToolBar() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnableDisplayHomeAsUp() {
+        return false;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,136 +72,11 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         // 初始化工具栏
         mToolbar = findViewById(R.id.activitymainToolbar1);
         setSupportActionBar(mToolbar);
-        // 显示后退按钮
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        if (isEnableDisplayHomeAsUp()) {
+            // 显示后退按钮
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
         getSupportActionBar().setSubtitle(getTag());
-
-        mswMainService = findViewById(R.id.sw_mainservice);
-        MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
-        mswMainService.setChecked(mMainServiceBean.isEnable());
-        mswMainService.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View arg0) {
-                    LogUtils.d(TAG, "mswMainService onClick");
-                    // TODO: Implement this method
-                    if (mswMainService.isChecked()) {
-                        //ToastUtils.show("Is Checked");
-                        MainService.startMainServiceAndSaveStatus(SettingsActivity.this);
-                    } else {
-                        //ToastUtils.show("Not Checked");
-                        MainService.stopMainServiceAndSaveStatus(SettingsActivity.this);
-                    }
-                }
-            });
-
-        msbVolume = findViewById(R.id.bellvolume);
-        mtvVolume = findViewById(R.id.tv_volume);
-        final AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-
-        // 设置SeekBar的最大值为系统铃声音量的最大刻度
-        mnStreamMaxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
-        msbVolume.setMax(mnStreamMaxVolume);
-        // 获取当前铃声音量并设置为SeekBar的初始进度
-        mnStreamVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
-        msbVolume.setProgress(mnStreamVolume);
-
-        updateStreamVolumeTextView();
-
-        msbVolume.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    if (fromUser) {
-                        // 设置铃声音量
-                        audioManager.setStreamVolume(AudioManager.STREAM_RING, progress, 0);
-                        RingTongBean bean = RingTongBean.loadBean(SettingsActivity.this, RingTongBean.class);
-                        if (bean == null) {
-                            bean = new RingTongBean();
-                        }
-                        bean.setStreamVolume(progress);
-                        RingTongBean.saveBean(SettingsActivity.this, bean);
-                        mnStreamVolume = progress;
-                        updateStreamVolumeTextView();
-                        //Toast.makeText(SettingsActivity.this, "音量设置为: " + progress, Toast.LENGTH_SHORT).show();
-                    }
-                }
-
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
-                    // 当开始拖动SeekBar时的操作
-                }
-
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
-                    // 当停止拖动SeekBar时的操作
-                }
-            });
-
-
-        recyclerView = findViewById(R.id.recycler_view);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-
-        ruleList = Rules.getInstance(this).getPhoneBlacRuleBeanList();
-
-        adapter = new PhoneConnectRuleAdapter(this, ruleList);
-        recyclerView.setAdapter(adapter);
-
-        // 设置参数云盾
-        _DuInfoTextView = findViewById(R.id.tv_DunInfo);
-        etDunTotalCount = findViewById(R.id.et_DunTotalCount);
-        etDunResumeSecondCount = findViewById(R.id.et_DunResumeSecondCount);
-        etDunResumeCount = findViewById(R.id.et_DunResumeCount);
-        swIsEnableDun = findViewById(R.id.sw_IsEnableDun);
-        SettingsModel settingsModel = Rules.getInstance(this).getSettingsModel();
-
-        etDunTotalCount.setText(Integer.toString(settingsModel.getDunTotalCount()));
-        etDunResumeSecondCount.setText(Integer.toString(settingsModel.getDunResumeSecondCount()));
-        etDunResumeCount.setText(Integer.toString(settingsModel.getDunResumeCount()));
-        swIsEnableDun.setChecked(settingsModel.isEnableDun());
-
-        boolean isEnableDun = settingsModel.isEnableDun();
-        etDunTotalCount.setEnabled(!isEnableDun);
-        etDunResumeSecondCount.setEnabled(!isEnableDun);
-        etDunResumeCount.setEnabled(!isEnableDun);
-
-    }
-
-    public static void notifyDunInfoUpdate() {
-        if (_DuInfoTextView != null) {
-            _DuInfoTextView.notifyInfoUpdate();
-        }
-    }
-
-    public void onSW_IsEnableDun(View view) {
-        LogUtils.d(TAG, "onSW_IsEnableDun");
-        boolean isEnableDun = swIsEnableDun.isChecked();
-        etDunTotalCount.setEnabled(!isEnableDun);
-        etDunResumeSecondCount.setEnabled(!isEnableDun);
-        etDunResumeCount.setEnabled(!isEnableDun);
-
-        SettingsModel settingsModel = Rules.getInstance(this).getSettingsModel();
-        if (isEnableDun) {
-            settingsModel.setDunTotalCount(Integer.parseInt(etDunTotalCount.getText().toString()));
-            settingsModel.setDunResumeSecondCount(Integer.parseInt(etDunResumeSecondCount.getText().toString()));
-            settingsModel.setDunResumeCount(Integer.parseInt(etDunResumeCount.getText().toString()));
-        }
-        settingsModel.setIsEnableDun(isEnableDun);
-        Rules.getInstance(this).saveDun();
-        Rules.getInstance(this).reload();
-    }
-
-    void updateStreamVolumeTextView() {
-        mtvVolume.setText(String.format("%d/%d", mnStreamVolume, mnStreamMaxVolume));
-    }
-
-    public void onUnitTest(View view) {
-        Intent intent = new Intent(this, UnitTestActivity.class);
-        startActivity(intent);
-    }
-
-    public void onAddNewConnectionRule(View view) {
-        Rules.getInstance(this).getPhoneBlacRuleBeanList().add(new PhoneConnectRuleModel());
-        Rules.getInstance(this).saveRules();
-        adapter.notifyDataSetChanged();
     }
 
     public void onDefaultPhone(View view) {
@@ -232,38 +94,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         }
     }
 
-    public void onDownloadBoBullToon(View view) {
-        final TomCat tomCat = TomCat.getInstance(this);
-        new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    if (tomCat.downloadBoBullToon()) {
-                        ToastUtils.show("BoBullToon downlaod OK!");
-                        MainService.restartMainService(SettingsActivity.this);
-                        Rules.getInstance(SettingsActivity.this).reload();
-                    }
-                }
-            }).start();
-    }
-
-
-
-    public void onSearchBoBullToonPhone(View view) {
-        TomCat tomCat = TomCat.getInstance(this);
-        EditText etPhone = findViewById(R.id.activitysettingsEditText1);
-        String phone = etPhone.getText().toString().trim();
-        if (tomCat.loadPhoneBoBullToon()) {
-            if (tomCat.isPhoneBoBullToon(phone)) {
-                ToastUtils.show("It is a BoBullToon Phone!");
-            } else {
-                ToastUtils.show("Not in BoBullToon.");
-            }
-        } else {
-            ToastUtils.show("没有下载 BoBullToon。");
-        }
-
-    }
-
     private void askForDrawOverlay() {
         AlertDialog alertDialog = new AlertDialog.Builder(this)
             .setTitle("允许显示悬浮框")

contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java

@@ -1,91 +0,0 @@
-package cc.winboll.studio.contacts.activities;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.dun.Rules;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
-import android.widget.EditText;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/02 16:07:04
- */
-public class UnitTestActivity extends Activity {
-
-    public static final String TAG = "UnitTestActivity";
-
-    LogView logView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_unittest);
-        logView = findViewById(R.id.logview);
-        logView.start();
-    }
-
-    public void onTestPhone(View view) {
-        // 开始测试数据
-        EditText etPhone = findViewById(R.id.phone_et);
-        Rules rules = Rules.getInstance(this);
-        String phone = etPhone.getText().toString().trim();
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-    }
-
-    public void onTestMain(View view) {
-        Rules rules = Rules.getInstance(this);
-
-        // 如果没有规则就添加测试规则
-        if (rules.getPhoneBlacRuleBeanList().size() == 0) {
-            // 手机号码允许
-            // 中国手机号码正则表达式，以1开头，第二位可以是3、4、5、6、7、8、9，后面跟9位数字
-            String regex = "^1[3-9]\\d{9}$";
-            rules.add(regex, true, true);
-
-            // 指定区号号码允许
-            regex = "^0660\\d+$";
-            rules.add(regex, true, true);
-
-            // 指定区号号码允许
-            regex = "^020\\d+$";
-            rules.add(regex, true, true);
-
-            // 添加默认拒接规则
-            regex = ".*";
-            rules.add(regex, false, true);
-
-            // 保存规则到文件
-            rules.saveRules();
-        }
-
-        // 开始测试数据
-        String phone = "16769764848";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "16856582777";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "17519703124";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "0205658955";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "0108965253";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "+8616769764848";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "4005816769764848";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-        phone = "95566";
-        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
-
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java

@@ -1,93 +0,0 @@
-package cc.winboll.studio.contacts.adapters;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/26 13:09:32
- * @Describe CallLogAdapter
- */
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.beans.CallLogModel;
-import cc.winboll.studio.contacts.utils.ContactUtils;
-import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
-import com.hjq.toast.ToastUtils;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Locale;
-
-public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogViewHolder> {
-    public static final String TAG = "CallLogAdapter";
-
-    private List<CallLogModel> callLogList;
-    ContactUtils mContactUtils;
-    Context mContext;
-
-    public CallLogAdapter(Context context, List<CallLogModel> callLogList) {
-        mContext = context;
-        this.mContactUtils = ContactUtils.getInstance(mContext);
-        this.callLogList = callLogList;
-    }
-
-    @NonNull
-    @Override
-    public CallLogViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_call_log, parent, false);
-        return new CallLogViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull CallLogViewHolder holder, int position) {
-        final CallLogModel callLog = callLogList.get(position);
-        holder.phoneNumber.setText(callLog.getPhoneNumber() + "☎" + mContactUtils.getContactsName(callLog.getPhoneNumber()));
-        holder.callStatus.setText(callLog.getCallStatus());
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
-        holder.callDate.setText(dateFormat.format(callLog.getCallDate()));
-
-        // 初始化拉动后拨号控件 
-        holder.dialAOHPCTCSeekBar.setThumb(holder.itemView.getContext().getDrawable(R.drawable.ic_call));
-        holder.dialAOHPCTCSeekBar.setBlurRightDP(80);
-        holder.dialAOHPCTCSeekBar.setThumbOffset(0);
-        holder.dialAOHPCTCSeekBar.setOnOHPCListener(
-            new AOHPCTCSeekBar.OnOHPCListener(){
-                @Override
-                public void onOHPCommit() {
-                    String phoneNumber = callLog.getPhoneNumber().replaceAll("\\s", "");
-                    ToastUtils.show(phoneNumber);
-                    Intent intent = new Intent(Intent.ACTION_CALL);
-                    intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-                    // 添加 FLAG_ACTIVITY_NEW_TASK 标志
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    holder.itemView.getContext().startActivity(intent);
-                }
-            });
-    }
-
-    @Override
-    public int getItemCount() {
-        return callLogList.size();
-    }
-
-    public class CallLogViewHolder extends RecyclerView.ViewHolder {
-        TextView phoneNumber, callStatus, callDate;
-        Button dialButton;
-        AOHPCTCSeekBar dialAOHPCTCSeekBar;
-
-        public CallLogViewHolder(@NonNull View itemView) {
-            super(itemView);
-            phoneNumber = itemView.findViewById(R.id.phone_number);
-            callStatus = itemView.findViewById(R.id.call_status);
-            callDate = itemView.findViewById(R.id.call_date);
-            dialAOHPCTCSeekBar = itemView.findViewById(R.id.aohpctcseekbar_dial);
-        }
-    }
-
-}
-

contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java

@@ -1,84 +0,0 @@
-package cc.winboll.studio.contacts.adapters;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/26 13:35:44
- * @Describe ContactAdapter
- */
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.beans.ContactModel;
-import com.hjq.toast.ToastUtils;
-import java.util.List;
-import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
-
-public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {
-
-    public static final String TAG = "ContactAdapter";
-
-    private static final int REQUEST_CALL_PHONE = 1;
-
-    private List<ContactModel> contactList;
-
-    public ContactAdapter(List<ContactModel> contactList) {
-        this.contactList = contactList;
-    }
-
-    @NonNull
-    @Override
-    public ContactViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_contact, parent, false);
-        return new ContactViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ContactViewHolder holder, int position) {
-        final ContactModel contact = contactList.get(position);
-        holder.contactName.setText(contact.getName());
-        holder.contactNumber.setText(contact.getNumber());
-
-        // 初始化拉动后拨号控件 
-        holder.dialAOHPCTCSeekBar.setThumb(holder.itemView.getContext().getDrawable(R.drawable.ic_call));
-        holder.dialAOHPCTCSeekBar.setBlurRightDP(80);
-        holder.dialAOHPCTCSeekBar.setThumbOffset(0);
-        holder.dialAOHPCTCSeekBar.setOnOHPCListener(
-            new AOHPCTCSeekBar.OnOHPCListener(){
-                @Override
-                public void onOHPCommit() {
-                    String phoneNumber = contact.getNumber().replaceAll("\\s", "");
-                    ToastUtils.show(phoneNumber);
-                    Intent intent = new Intent(Intent.ACTION_CALL);
-                    intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-                    // 添加 FLAG_ACTIVITY_NEW_TASK 标志
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    holder.itemView.getContext().startActivity(intent);
-                }
-            });
-    }
-
-    @Override
-    public int getItemCount() {
-        return contactList.size();
-    }
-
-    public class ContactViewHolder extends RecyclerView.ViewHolder {
-        TextView contactName;
-        TextView contactNumber;
-        AOHPCTCSeekBar dialAOHPCTCSeekBar;
-        
-        public ContactViewHolder(@NonNull View itemView) {
-            super(itemView);
-            contactName = itemView.findViewById(R.id.contact_name);
-            contactNumber = itemView.findViewById(R.id.contact_number);
-            dialAOHPCTCSeekBar = itemView.findViewById(R.id.aohpctcseekbar_dial);
-        }
-    }
-}
-

contacts/src/main/java/cc/winboll/studio/contacts/adapters/MyPagerAdapter.java

@@ -0,0 +1,42 @@
+package cc.winboll.studio.contacts.adapters;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/20 13:33:04
+ * @Describe MyPagerAdapter
+ */
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import cc.winboll.studio.contacts.fragments.CallFragment;
+import cc.winboll.studio.contacts.fragments.ContactsFragment;
+import cc.winboll.studio.contacts.fragments.LogFragment;
+
+public class MyPagerAdapter extends FragmentPagerAdapter {
+    public static final String TAG = "MyPagerAdapter";
+
+    private static final int PAGE_COUNT = 3;
+
+    public MyPagerAdapter(@NonNull FragmentManager fm) {
+        super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+    }
+
+    @NonNull
+    @Override
+    public Fragment getItem(int position) {
+        if(position == 1) {
+            return ContactsFragment.newInstance(position);
+        } else if(position == 2) {
+            return LogFragment.newInstance(position);
+        } else {
+            return CallFragment.newInstance(position);
+        }
+    }
+
+    @Override
+    public int getCount() {
+        return PAGE_COUNT;
+    }
+}
+

contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java

@@ -1,247 +0,0 @@
-package cc.winboll.studio.contacts.adapters;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/02 17:27:41
- * @Describe PhoneConnectRuleAdapter
- */
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
-import cc.winboll.studio.contacts.dun.Rules;
-import cc.winboll.studio.contacts.views.LeftScrollView;
-import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
-import com.hjq.toast.ToastUtils;
-import java.util.ArrayList;
-import java.util.List;
-
-public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    public static final String TAG = "PhoneConnectRuleAdapter";
-
-    private static final int VIEW_TYPE_SIMPLE = 0;
-    private static final int VIEW_TYPE_EDIT = 1;
-
-    private Context context;
-    private List<PhoneConnectRuleModel> ruleList;
-
-    public PhoneConnectRuleAdapter(Context context, List<PhoneConnectRuleModel> ruleList) {
-        this.context = context;
-        this.ruleList = ruleList;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        LayoutInflater inflater = LayoutInflater.from(context);
-        if (viewType == VIEW_TYPE_SIMPLE) {
-            View view = inflater.inflate(R.layout.view_phone_connect_rule_simple, parent, false);
-            return new SimpleViewHolder(parent, view);
-        } else {
-            View view = inflater.inflate(R.layout.view_phone_connect_rule, parent, false);
-            return new EditViewHolder(parent, view);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int position) {
-        final PhoneConnectRuleModel model = ruleList.get(position);
-        if (holder instanceof SimpleViewHolder) {
-            final SimpleViewHolder simpleViewHolder = (SimpleViewHolder) holder;
-            String szView = model.getRuleText().trim().equals("") ?"[NULL]": model.getRuleText();
-            simpleViewHolder.tvRuleText.setText(szView);
-            simpleViewHolder.scrollView.setOnActionListener(new LeftScrollView.OnActionListener(){
-
-                    @Override
-                    public void onUp() {
-                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
-                        if (position > 0) {
-                            ToastUtils.show("onUp");
-                            simpleViewHolder.scrollView.smoothScrollTo(0, 0);
-//                            PhoneConnectRuleModel newBean = new PhoneConnectRuleModel();
-//                            newBean.setRuleText(list.get(position).getRuleText());
-//                            newBean.setIsAllowConnection(list.get(position).isAllowConnection());
-//                            newBean.setIsEnable(list.get(position).isEnable());
-//                            newBean.setIsSimpleView(list.get(position).isSimpleView());
-                            list.add(position - 1, list.get(position));
-                            list.remove(position + 1);
-                            Rules.getInstance(context).saveRules();
-                            notifyDataSetChanged();
-                        }
-                    }
-
-                    @Override
-                    public void onDown() {
-                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
-                        if (position < list.size() - 1) {
-                            ToastUtils.show("onDown");
-                            simpleViewHolder.scrollView.smoothScrollTo(0, 0);
-//                            PhoneConnectRuleModel newBean = new PhoneConnectRuleModel();
-//                            newBean.setRuleText(list.get(position).getRuleText());
-//                            newBean.setIsAllowConnection(list.get(position).isAllowConnection());
-//                            newBean.setIsEnable(list.get(position).isEnable());
-//                            newBean.setIsSimpleView(list.get(position).isSimpleView());
-                            list.add(position + 2, list.get(position));
-                            list.remove(position);
-                            Rules.getInstance(context).saveRules();
-                            notifyDataSetChanged();
-                        }
-                    }
-
-                    @Override
-                    public void onEdit() {
-                        simpleViewHolder.scrollView.smoothScrollTo(0, 0);
-                        model.setIsSimpleView(false);
-                        notifyDataSetChanged();
-                        //notifyItemChanged(position);
-                    }
-
-                    @Override
-                    public void onDelete() {
-                        YesNoAlertDialog.show(simpleViewHolder.scrollView.getContext(), "删除确认", "是否删除该通话规则？", new YesNoAlertDialog.OnDialogResultListener(){
-
-                                @Override
-                                public void onYes() {
-                                    simpleViewHolder.scrollView.smoothScrollTo(0, 0);
-                                    model.setIsSimpleView(true);
-                                    ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
-                                    list.remove(position);
-                                    Rules.getInstance(context).saveRules();
-                                    notifyDataSetChanged();
-                                    //notifyItemChanged(position);
-                                }
-
-                                @Override
-                                public void onNo() {
-                                }
-                            });
-
-                    }
-                });
-//            simpleViewHolder.editButton.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        model.setIsSimpleView(false);
-//                        notifyItemChanged(position);
-//                    }
-//                });
-//            simpleViewHolder.deleteButton.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        model.setIsSimpleView(false);
-//                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
-//                        list.remove(position);
-//                        Rules.getInstance(context).saveRules();
-//                        notifyItemChanged(position);
-//                    }
-//                });
-//            // 触摸事件处理
-//            simpleViewHolder.contentLayout.setOnTouchListener(new View.OnTouchListener() {
-//                    @Override
-//                    public boolean onTouch(View v, MotionEvent event) {
-//                        switch (event.getAction()) {
-//                            case MotionEvent.ACTION_DOWN:
-//                                simpleViewHolder.startX = event.getX();
-//                                simpleViewHolder.isSwiping = true;
-//                                break;
-//                            case MotionEvent.ACTION_MOVE:
-//                                if (simpleViewHolder.isSwiping) {
-//                                    float deltaX = simpleViewHolder.startX - event.getX();
-//                                    if (deltaX > 0) { // 左滑
-//                                        float translationX = Math.max(-simpleViewHolder.actionLayout.getWidth(), -deltaX);
-//                                        simpleViewHolder.contentLayout.setTranslationX(translationX);
-//                                        simpleViewHolder.actionLayout.setVisibility(View.VISIBLE);
-//                                    }
-//                                }
-//                                break;
-//                            case MotionEvent.ACTION_UP:
-//                                simpleViewHolder.isSwiping = false;
-//                                if (simpleViewHolder.contentLayout.getTranslationX() < -simpleViewHolder.actionLayout.getWidth() / 2) {
-//                                    // 保持按钮显示
-//                                    simpleViewHolder.contentLayout.setTranslationX(-actionLayout.getWidth());
-//                                } else {
-//                                    // 恢复原状
-//                                    simpleViewHolder.contentLayout.animate().translationX(0).setDuration(200).start();
-//                                    simpleViewHolder.actionLayout.setVisibility(View.INVISIBLE);
-//                                }
-//                                break;
-//                        }
-//                        return true;
-//                    }
-//                });
-        } else if (holder instanceof EditViewHolder) {
-            final EditViewHolder editViewHolder = (EditViewHolder) holder;
-            editViewHolder.editText.setText(model.getRuleText());
-            editViewHolder.checkBoxAllow.setChecked(model.isAllowConnection());
-            editViewHolder.checkBoxEnable.setChecked(model.isEnable());
-            editViewHolder.buttonConfirm.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        model.setRuleText(editViewHolder.editText.getText().toString());
-                        model.setIsAllowConnection(editViewHolder.checkBoxAllow.isChecked());
-                        model.setIsEnable(editViewHolder.checkBoxEnable.isChecked());
-                        model.setIsSimpleView(true);
-                        Rules.getInstance(context).saveRules();
-                        notifyItemChanged(position);
-                        Toast.makeText(context, "保存成功", Toast.LENGTH_SHORT).show();
-                    }
-                });
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return ruleList.size();
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        PhoneConnectRuleModel model = ruleList.get(position);
-        // 这里可以根据模型的状态来决定视图类型，简单起见，假设点击按钮后进入编辑视图
-        return model.isSimpleView() ? VIEW_TYPE_SIMPLE : VIEW_TYPE_EDIT;
-    }
-
-    static class SimpleViewHolder extends RecyclerView.ViewHolder {
-
-        private final LeftScrollView scrollView;
-        private final TextView tvRuleText;
-
-
-        public SimpleViewHolder(@NonNull ViewGroup parent, @NonNull View itemView) {
-            super(itemView);
-            scrollView = itemView.findViewById(R.id.scrollView);
-            //tvRuleText = itemView.findViewById(R.id.ruletext_tv);
-            tvRuleText = new TextView(itemView.getContext());
-            scrollView.setContentWidth(parent.getWidth());
-            //scrollView.setContentWidth(600);
-            scrollView.addContentLayout(tvRuleText);
-        }
-
-    }
-
-    static class EditViewHolder extends RecyclerView.ViewHolder {
-        EditText editText;
-        CheckBox checkBoxAllow;
-        CheckBox checkBoxEnable;
-        Button buttonConfirm;
-
-        public EditViewHolder(@NonNull ViewGroup parent, @NonNull View itemView) {
-            super(itemView);
-            editText = itemView.findViewById(R.id.edit_text);
-            checkBoxAllow = itemView.findViewById(R.id.checkbox_allow);
-            checkBoxEnable = itemView.findViewById(R.id.checkbox_enable);
-            buttonConfirm = itemView.findViewById(R.id.button_confirm);
-        }
-    }
-}
-

contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java

@@ -1,36 +0,0 @@
-package cc.winboll.studio.contacts.beans;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/26 13:10:57
- * @Describe CallLogModel
- */
-
-import java.util.Date;
-
-public class CallLogModel {
-    public static final String TAG = "CallLogModel";
-
-    private String phoneNumber;
-    private String callStatus;
-    private Date callDate;
-
-    public CallLogModel(String phoneNumber, String callStatus, Date callDate) {
-        this.phoneNumber = phoneNumber.replaceAll("\\s", "");
-        this.callStatus = callStatus;
-        this.callDate = callDate;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public String getCallStatus() {
-        return callStatus;
-    }
-
-    public Date getCallDate() {
-        return callDate;
-    }
-}
-

contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java

@@ -1,64 +0,0 @@
-package cc.winboll.studio.contacts.beans;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/26 13:37:00
- * @Describe ContactModel
- */
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
-
-public class ContactModel {
-
-    public static final String TAG = "ContactModel";
-
-    private String name;
-    private String number;
-    private String pinyin;
-
-    public ContactModel(String name, String number) {
-        this.name = name;
-        this.number = number.replaceAll("\\s", "");
-        this.pinyin = convertToPinyin(name);
-    }
-
-    private String convertToPinyin(String chinese) {
-        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
-        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
-        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-
-        StringBuilder pinyin = new StringBuilder();
-        for (int i = 0; i < chinese.length(); i++) {
-            char ch = chinese.charAt(i);
-            if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) {
-                try {
-                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
-                    if (pinyinArray != null) {
-                        pinyin.append(pinyinArray[0]);
-                    }
-                } catch (BadHanyuPinyinOutputFormatCombination e) {
-                    e.printStackTrace();
-                }
-            } else {
-                pinyin.append(ch);
-            }
-        }
-        return pinyin.toString();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-
-    public String getPinyin() {
-        return pinyin;
-    }
-}
-

contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneBlackRuleBean.java

@@ -10,35 +10,21 @@ import android.util.JsonWriter;
 import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-public class PhoneConnectRuleModel extends BaseBean {
-
-    public static final String TAG = "PhoneConnectRuleModel";
-
+public class PhoneBlackRuleBean extends BaseBean {
+    
+    public static final String TAG = "PhoneBlackRuleBean";
+    
     String ruleText;
-    boolean isAllowConnection;
     boolean isEnable;
-    boolean isSimpleView;
-
-    public PhoneConnectRuleModel() {
+    
+    public PhoneBlackRuleBean() {
         this.ruleText = "";
-        this.isAllowConnection = false;
         this.isEnable = false;
-        this.isSimpleView = true;
     }
 
-    public PhoneConnectRuleModel(String ruleText, boolean isAllowConnection, boolean isEnable) {
+    public PhoneBlackRuleBean(String ruleText, boolean isEnable) {
         this.ruleText = ruleText;
-        this.isAllowConnection = isAllowConnection;
         this.isEnable = isEnable;
-        this.isSimpleView = true;
-    }
-
-    public void setIsSimpleView(boolean isSimpleView) {
-        this.isSimpleView = isSimpleView;
-    }
-
-    public boolean isSimpleView() {
-        return isSimpleView;
     }
 
     public void setRuleText(String ruleText) {
@@ -49,14 +35,6 @@ public class PhoneConnectRuleModel extends BaseBean {
         return ruleText;
     }
 
-    public void setIsAllowConnection(boolean isAllowConnection) {
-        this.isAllowConnection = isAllowConnection;
-    }
-
-    public boolean isAllowConnection() {
-        return isAllowConnection;
-    }
-
     public void setIsEnable(boolean isEnable) {
         this.isEnable = isEnable;
     }
@@ -65,19 +43,17 @@ public class PhoneConnectRuleModel extends BaseBean {
         return isEnable;
     }
 
-
-
     @Override
     public String getName() {
-        return PhoneConnectRuleModel.class.getName();
+        return PhoneBlackRuleBean.class.getName();
     }
 
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
         jsonWriter.name("ruleText").value(getRuleText());
-        jsonWriter.name("isAllowConnection").value(isAllowConnection());
         jsonWriter.name("isEnable").value(isEnable());
+
     }
 
     @Override
@@ -85,8 +61,6 @@ public class PhoneConnectRuleModel extends BaseBean {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
             if (name.equals("ruleText")) {
                 setRuleText(jsonReader.nextString());
-            } else if (name.equals("isAllowConnection")) {
-                setIsAllowConnection(jsonReader.nextBoolean());
             } else if (name.equals("isEnable")) {
                 setIsEnable(jsonReader.nextBoolean());
             } else {
@@ -109,6 +83,6 @@ public class PhoneConnectRuleModel extends BaseBean {
         jsonReader.endObject();
         return this;
     }
-
-
+    
+    
 }

contacts/src/main/java/cc/winboll/studio/contacts/beans/RingTongBean.java

@@ -12,26 +12,26 @@ import android.media.AudioManager;
 import android.util.JsonReader;
 
 public class RingTongBean extends BaseBean {
-
+    
     public static final String TAG = "AudioRingTongBean";
-
-    // 铃声音量
-    int streamVolume;
+    
+    // 模式
+    int ringerMode;
     
     public RingTongBean() {
-        this.streamVolume = 100;
+        this.ringerMode = AudioManager.RINGER_MODE_NORMAL;
     }
 
-    public RingTongBean(int streamVolume) {
-        this.streamVolume = streamVolume;
+    public RingTongBean(int ringerMode) {
+        this.ringerMode = ringerMode;
     }
 
-    public void setStreamVolume(int streamVolume) {
-        this.streamVolume = streamVolume;
+    public void setRingerMode(int ringerMode) {
+        this.ringerMode = ringerMode;
     }
 
-    public int getStreamVolume() {
-        return streamVolume;
+    public int getRingerMode() {
+        return ringerMode;
     }
 
     @Override
@@ -42,15 +42,15 @@ public class RingTongBean extends BaseBean {
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("streamVolume").value(getStreamVolume());
+        jsonWriter.name("ringerMode").value(getRingerMode());
 
     }
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("streamVolume")) {
-                setStreamVolume(jsonReader.nextInt());
+            if (name.equals("ringerMode")) {
+                setRingerMode(jsonReader.nextInt());
             } else {
                 return false;
             }

contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java

@@ -1,135 +0,0 @@
-package cc.winboll.studio.contacts.beans;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/02 19:51:40
- * @Describe SettingsModel
- */
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import java.io.IOException;
-
-public class SettingsModel extends BaseBean {
-
-    public static final String TAG = "SettingsModel";
-
-    // 云盾防御层数量
-    int dunTotalCount;
-    // 当前云盾防御层
-    int dunCurrentCount;
-    // 防御层恢复时间间隔(秒钟)
-    int dunResumeSecondCount;
-    // 每次恢复防御层数
-    int dunResumeCount;
-    // 是否启用云盾
-    boolean isEnableDun;
-
-    public SettingsModel() {
-        this.dunTotalCount = 6;
-        this.dunCurrentCount = 6;
-        this.dunResumeSecondCount = 60;
-        this.dunResumeCount = 1;
-        this.isEnableDun = false;
-    }
-
-    public SettingsModel(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount, int dunResumeCount, boolean isEnableDun) {
-        this.dunTotalCount = dunTotalCount;
-        this.dunCurrentCount = dunCurrentCount;
-        this.dunResumeSecondCount = dunResumeSecondCount;
-        this.dunResumeCount = dunResumeCount;
-        this.isEnableDun = isEnableDun;
-    }
-
-    public void setDunTotalCount(int dunTotalCount) {
-        this.dunTotalCount = dunTotalCount;
-    }
-
-    public int getDunTotalCount() {
-        return dunTotalCount;
-    }
-
-    public void setDunCurrentCount(int dunCurrentCount) {
-        this.dunCurrentCount = dunCurrentCount;
-    }
-
-    public int getDunCurrentCount() {
-        return dunCurrentCount;
-    }
-
-    public void setDunResumeSecondCount(int dunResumeSecondCount) {
-        this.dunResumeSecondCount = dunResumeSecondCount;
-    }
-
-    public int getDunResumeSecondCount() {
-        return dunResumeSecondCount;
-    }
-
-    public void setDunResumeCount(int dunResumeCount) {
-        this.dunResumeCount = dunResumeCount;
-    }
-
-    public int getDunResumeCount() {
-        return dunResumeCount;
-    }
-
-    public void setIsEnableDun(boolean isEnableDun) {
-        this.isEnableDun = isEnableDun;
-    }
-
-    public boolean isEnableDun() {
-        return isEnableDun;
-    }
-
-
-
-    @Override
-    public String getName() {
-        return SettingsModel.class.getName();
-    }
-
-    @Override
-    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-        super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("dunTotalCount").value(getDunTotalCount());
-        jsonWriter.name("dunCurrentCount").value(getDunCurrentCount());
-        jsonWriter.name("dunResumeSecondCount").value(getDunResumeSecondCount());
-        jsonWriter.name("dunResumeCount").value(getDunResumeCount());
-        jsonWriter.name("isEnableDun").value(isEnableDun());
-
-    }
-
-    @Override
-    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("dunTotalCount")) {
-                setDunTotalCount(jsonReader.nextInt());
-            } else if (name.equals("dunCurrentCount")) {
-                setDunCurrentCount(jsonReader.nextInt());
-            } else if (name.equals("dunResumeSecondCount")) {
-                setDunResumeSecondCount(jsonReader.nextInt());
-            } else if (name.equals("dunResumeCount")) {
-                setDunResumeCount(jsonReader.nextInt());
-            } else if (name.equals("isEnableDun")) {
-                setIsEnableDun(jsonReader.nextBoolean());
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
-        jsonReader.beginObject();
-        while (jsonReader.hasNext()) {
-            String name = jsonReader.nextName();
-            if (!initObjectsFromJsonReader(jsonReader, name)) {
-                jsonReader.skipValue();
-            }
-        }
-        // 结束 JSON 对象
-        jsonReader.endObject();
-        return this;
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java

@@ -1,178 +0,0 @@
-package cc.winboll.studio.contacts.bobulltoon;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/02 13:47:48
- * @Describe 汤姆猫管家 ：使用 BoBullToon 项目，对通讯地址进行筛选判断的好朋友。
- */
-import android.content.Context;
-import cc.winboll.studio.libappbase.LogUtils;
-import com.hjq.toast.ToastUtils;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class TomCat {
-
-    public static final String TAG = "TomCat";
-
-    List<String> listPhoneBoBullToon = new ArrayList<String>();
-
-    static volatile TomCat _TomCat;
-    Context mContext;
-    TomCat(Context context) {
-        mContext = context;
-    }
-
-    public static synchronized TomCat getInstance(Context context) {
-        if (_TomCat == null) {
-            _TomCat = new TomCat(context);
-        }
-        return _TomCat;
-    }
-
-    void downloadAndExtractZip(String zipUrl, String destinationFolder) throws IOException {
-        OkHttpClient client = new OkHttpClient();
-        Request request = new Request.Builder()
-            .url(zipUrl)
-            .build();
-
-        try {
-            Response response = client.newCall(request).execute();
-            if (!response.isSuccessful()) {
-                throw new IOException("Unexpected code " + response);
-            }
-
-            // 下载 ZIP 文件到临时位置
-            File tempZipFile = File.createTempFile("temp", ".zip");
-            try {
-                InputStream inputStream = response.body().byteStream();
-                FileOutputStream outputStream = new FileOutputStream(tempZipFile);
-                byte[] buffer = new byte[1024];
-                int length;
-                while ((length = inputStream.read(buffer)) > 0) {
-                    outputStream.write(buffer, 0, length);
-                }
-            } catch (Exception e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            }
-
-            // 解压 ZIP 文件到指定文件夹
-            try {
-                ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(tempZipFile.toPath()));
-                ZipEntry zipEntry;
-                while ((zipEntry = zipInputStream.getNextEntry()) != null) {
-                    Path targetFilePath = Paths.get(destinationFolder, zipEntry.getName());
-                    if (zipEntry.isDirectory()) {
-                        Files.createDirectories(targetFilePath);
-                    } else {
-                        Files.createDirectories(targetFilePath.getParent());
-                        try (FileOutputStream fos = new FileOutputStream(targetFilePath.toFile())) {
-                            byte[] buffer = new byte[1024];
-                            int len;
-                            while ((len = zipInputStream.read(buffer)) > 0) {
-                                fos.write(buffer, 0, len);
-                            }
-                        }
-                    }
-                    zipInputStream.closeEntry();
-                }
-            } catch (Exception e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            }
-
-            // 删除临时 ZIP 文件
-            tempZipFile.delete();
-            LogUtils.d(TAG, "已更新 BoBullToon 数据");
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    public boolean downloadBoBullToon() {
-        String zipUrl = "https://gitea.winboll.cc//Studio/BoBullToon/archive/main.zip"; // 替换为实际的 ZIP 文件 URL
-        String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
-        try {
-            // 删除旧文件
-            File fOldFolder = new File(destinationFolder);
-            if (fOldFolder.exists()) {
-                deleteFolderRecursive(fOldFolder);
-                fOldFolder.mkdirs();
-                LogUtils.d(TAG, "已清空 BoBullToon 数据");
-            }
-
-            // 更新新文件
-            downloadAndExtractZip(zipUrl, destinationFolder);
-            LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
-            return true;
-        } catch (IOException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-
-    // 递归删除文件夹及其内容的方法
-    public static void deleteFolderRecursive(File file) {
-        // 判断是否为文件夹
-        if (file.isDirectory()) {
-            // 列出文件夹中的所有文件和子文件夹
-            File[] files = file.listFiles();
-            if (files != null) {
-                // 遍历并递归删除每个文件和子文件夹
-                for (File f : files) {
-                    deleteFolderRecursive(f);
-                }
-            }
-        }
-        // 删除文件或空文件夹
-        file.delete();
-    }
-
-    File getWorkingFolder() {
-        return mContext.getExternalFilesDir(TAG);
-    }
-
-    public boolean loadPhoneBoBullToon() {
-        listPhoneBoBullToon.clear();
-        File fBoBullToon = new File(getWorkingFolder(), "bobulltoon");
-        if (fBoBullToon.exists()) {
-            LogUtils.d(TAG, String.format("getWorkingFolder() %s", getWorkingFolder()));
-            for (File userFolder : fBoBullToon.listFiles()) {
-                if (userFolder.isDirectory()) {
-                    for (File recordFile : userFolder.listFiles()) {
-                        listPhoneBoBullToon.add(recordFile.getName());
-                    }
-                }
-            }
-
-            for (int i = 0; i < listPhoneBoBullToon.size(); i++) {
-                LogUtils.d(TAG, String.format("listPhoneBoBullToon add : %s", listPhoneBoBullToon.get(i)));
-            }
-            return true;
-        } else {
-            LogUtils.d(TAG, "fBoBullToon not exists。");
-        }
-        return false;
-    }
-
-    public boolean isPhoneBoBullToon(String phone) {
-        for (int i = 0; i < listPhoneBoBullToon.size(); i++) {
-            LogUtils.d(TAG, String.format("isPhoneBoBullToon(...) get(i) phone : %s", listPhoneBoBullToon.get(i)));
-            if (listPhoneBoBullToon.get(i).equals(phone)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java

@@ -5,35 +5,25 @@ package cc.winboll.studio.contacts.dun;
  * @Date 2025/02/21 06:15:10
  * @Describe 云盾防御规则
  */
-import android.content.Context;
-import cc.winboll.studio.contacts.activities.SettingsActivity;
-import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
-import cc.winboll.studio.contacts.beans.SettingsModel;
-import cc.winboll.studio.contacts.services.MainService;
-import cc.winboll.studio.contacts.utils.ContactUtils;
-import cc.winboll.studio.contacts.utils.RegexPPiUtils;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.contacts.beans.PhoneBlackRuleBean;
 import java.util.ArrayList;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.regex.Pattern;
+import android.content.Context;
 
 public class Rules {
 
     public static final String TAG = "Rules";
 
-    ArrayList<PhoneConnectRuleModel> _PhoneConnectRuleModelList;
+    ArrayList<PhoneBlackRuleBean> _PhoneBlacRuleBeanList;
     static volatile Rules _Rules;
     Context mContext;
-    SettingsModel mSettingsModel;
-    Timer mDunResumeTimer;
 
     Rules(Context context) {
         mContext = context;
-        _PhoneConnectRuleModelList = new ArrayList<PhoneConnectRuleModel>();
-        reload();
-    }
+        _PhoneBlacRuleBeanList = new ArrayList<PhoneBlackRuleBean>();
+        PhoneBlackRuleBean.loadBeanList(mContext, _PhoneBlacRuleBeanList, PhoneBlackRuleBean.class);
 
+    }
     public static synchronized Rules getInstance(Context context) {
         if (_Rules == null) {
             _Rules = new Rules(context);
@@ -41,167 +31,46 @@ public class Rules {
         return _Rules;
     }
 
-    public void reload() {
-        LogUtils.d(TAG, "reload()");
-        loadRules();
-        loadDun();
-        setDunResumTimer();
-    }
-
-    public void setDunResumTimer() {
-        if (mDunResumeTimer != null) {
-            mDunResumeTimer.cancel();
-        }
-
-        // 盾牌恢复定时器
-        mDunResumeTimer = new Timer();
-        mDunResumeTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    if (mSettingsModel.getDunCurrentCount() != mSettingsModel.getDunTotalCount()) {
-                        LogUtils.d(TAG, String.format("当前防御值为%d，最大防御值为%d", mSettingsModel.getDunCurrentCount(), mSettingsModel.getDunTotalCount()));
-                        int newDunCount = mSettingsModel.getDunCurrentCount() + mSettingsModel.getDunResumeCount();
-                        // 设置盾值在[0，DunTotalCount]之内其他值一律重置为 DunTotalCount。
-                        newDunCount = (newDunCount > mSettingsModel.getDunTotalCount()) ?mSettingsModel.getDunTotalCount(): newDunCount;
-                        mSettingsModel.setDunCurrentCount(newDunCount);
-                        LogUtils.d(TAG, String.format("设置防御值为%d", newDunCount));
-                        saveDun();
-                        SettingsActivity.notifyDunInfoUpdate();
-                    }
-                }
-            }, 1000, mSettingsModel.getDunResumeSecondCount() * 1000);
-    }
-
-    public void loadRules() {
-        _PhoneConnectRuleModelList.clear();
-        PhoneConnectRuleModel.loadBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleModel.class);
-    }
-
-    public void saveRules() {
-        LogUtils.d(TAG, String.format("saveRules()"));
-        PhoneConnectRuleModel.saveBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleModel.class);
-    }
-
-    public void loadDun() {
-        mSettingsModel = SettingsModel.loadBean(mContext, SettingsModel.class);
-        if (mSettingsModel == null) {
-            mSettingsModel = new SettingsModel();
-            SettingsModel.saveBean(mContext, mSettingsModel);
-        }
-    }
-
-    public void saveDun() {
-        LogUtils.d(TAG, String.format("saveDun()"));
-        SettingsModel.saveBean(mContext, mSettingsModel);
-    }
-
     public boolean isAllowed(String phoneNumber) {
-        // 没有启用云盾，默认允许接通任何电话
-        if (!mSettingsModel.isEnableDun()) {
-            LogUtils.d(TAG, String.format("没有启用云盾，默认允许接通任何电话。isAllowed(...) return true"));
+        // 黑名单拒接
+        for (int i = 0; i < _PhoneBlacRuleBeanList.size(); i++) {
+            if (_PhoneBlacRuleBeanList.get(i).isEnable()) {
+                String regex = _PhoneBlacRuleBeanList.get(i).getRuleText();
+                if (Pattern.matches(regex, phoneNumber)) {
+                    return false;
+                }
+            }
+        }
+
+        // 手机号码允许
+        // 中国手机号码正则表达式，以1开头，第二位可以是3、4、5、6、7、8、9，后面跟9位数字
+        String regex = "^1[3-9]\\d{9}$";
+        if (Pattern.matches(regex, phoneNumber)) {
+            return true;
+        }
+        
+        // 指定区号号码允许
+        regex = "^0660\\d+$";
+        if (Pattern.matches(regex, phoneNumber)) {
+            return true;
+        }
+        
+        // 指定区号号码允许
+        regex = "^020\\d+$";
+        if (Pattern.matches(regex, phoneNumber)) {
             return true;
         }
 
-        //
-        // 以下是云盾防御体系
-        boolean isDefend = false; // 盾牌是否生效
-        boolean isConnect = true; // 防御结果是否连接
-
-        // 如果盾值小于1，则解除防御
-        if (!isDefend && mSettingsModel.getDunCurrentCount() < 1) {
-            // 盾层为1以下，防御解除
-            LogUtils.d(TAG, "盾层为1以下，防御解除");
-            isDefend = true;
-            isConnect = true;
-            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-        }
-
-        // 正则运算预防针
-        if (!isDefend && !RegexPPiUtils.isPPiOK(phoneNumber)) {
-            LogUtils.d(TAG, "正则运算预防针生效。");
-            isDefend = true;
-            isConnect = false;
-            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-        }
-
-        // 查询通讯录是否有该联系人
-        boolean isPhoneInContacts = ContactUtils.getInstance(mContext).isPhoneInContacts(mContext, phoneNumber);
-        if (!isDefend) {
-            if (isPhoneInContacts) {
-                LogUtils.d(TAG, String.format("Phone %s is in contacts.", phoneNumber));
-                isDefend = true;
-                isConnect = true;
-                LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-            } else {
-                LogUtils.d(TAG, String.format("Phone %s is not in contacts.", phoneNumber));
-            }
-        }
-
-        // 检验拨不通号码群
-        if (!isDefend && MainService.isPhoneInBoBullToon(phoneNumber)) {
-            LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
-            isDefend = true;
-            isConnect = false;
-            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-        }
-
-        // 正则匹配规则名单校验
-        if (!isDefend) {
-            for (int i = 0; i < _PhoneConnectRuleModelList.size(); i++) {
-                if (_PhoneConnectRuleModelList.get(i).isEnable()) {
-                    String regex = _PhoneConnectRuleModelList.get(i).getRuleText();
-                    if (Pattern.matches(regex, phoneNumber)) {
-                        LogUtils.d(TAG, String.format("Phone Number [%s] is matched by rule : %s", phoneNumber, _PhoneConnectRuleModelList.get(i)));
-                        isDefend = true;
-                        isConnect = _PhoneConnectRuleModelList.get(i).isAllowConnection();
-                        LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (isConnect) {
-            // 如果防御结果为连接，则恢复防御盾牌最大值层数
-            mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
-            LogUtils.d(TAG, String.format("防御结果为连接，恢复防御盾牌最大值层数 %d", mSettingsModel.getDunTotalCount()));
-            saveDun();
-            SettingsActivity.notifyDunInfoUpdate();
-        } else if (isDefend) {
-            // 如果触发了以上某个防御模块，
-            // 就减少防御盾牌层数。
-            // 每校验一次规则，云盾防御层数减1
-            // 当云盾防御层数为0时，再次进行以下程序段则恢复满值防御。
-            int newDunCount = mSettingsModel.getDunCurrentCount() - 1;
-            LogUtils.d(TAG, String.format("新的防御层数预计为 %d", newDunCount));
-
-            // 保证盾值在[0，DunTotalCount]之内其他值一律重置为 DunTotalCount。
-            if (newDunCount < 0 || newDunCount > mSettingsModel.getDunTotalCount()) {
-                mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
-                LogUtils.d(TAG, String.format("盾值不在[0，%d]区间，恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount()));
-            } else {
-                mSettingsModel.setDunCurrentCount(newDunCount);
-                LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount));
-            }
-
-            saveDun();
-            SettingsActivity.notifyDunInfoUpdate();
-        }
-
-        // 返回校验结果
-        LogUtils.d(TAG, String.format("返回校验结果 isConnect == %s", isConnect));
-        return isConnect;
+        // 其他拒接
+        return false;
     }
 
-    public void add(String szPhoneConnectRule, boolean isAllowConnection, boolean isEnable) {
-        _PhoneConnectRuleModelList.add(new PhoneConnectRuleModel(szPhoneConnectRule, isAllowConnection, isEnable));
+    public void add(String phoneRuleBlack, boolean isEnable) {
+        _PhoneBlacRuleBeanList.add(new PhoneBlackRuleBean(phoneRuleBlack, isEnable));
+        PhoneBlackRuleBean.saveBeanList(mContext, _PhoneBlacRuleBeanList, PhoneBlackRuleBean.class);
     }
 
-    public ArrayList<PhoneConnectRuleModel> getPhoneBlacRuleBeanList() {
-        return _PhoneConnectRuleModelList;
-    }
-
-    public SettingsModel getSettingsModel() {
-        return mSettingsModel;
+    public ArrayList<PhoneBlackRuleBean> getPhoneBlacRuleBeanList() {
+        return _PhoneBlacRuleBeanList;
     }
 }

contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallFragment.java

@@ -0,0 +1,51 @@
+package cc.winboll.studio.contacts.fragments;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/20 12:57:00
+ * @Describe 拨号
+ */
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogView;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
+import android.widget.TextView;
+
+public class CallFragment extends Fragment {
+
+    public static final String TAG = "CallFragment";
+
+    private static final String ARG_PAGE = "ARG_PAGE";
+    private int mPage;
+
+    public static CallFragment newInstance(int page) {
+        Bundle args = new Bundle();
+        args.putInt(ARG_PAGE, page);
+        CallFragment fragment = new CallFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments()!= null) {
+            mPage = getArguments().getInt(ARG_PAGE);
+        }
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_call, container, false);
+        TextView textView = view.findViewById(R.id.page_text);
+        textView.setText("这是第 " + mPage + " 页");
+        return view;
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java

@@ -1,125 +0,0 @@
-package cc.winboll.studio.contacts.fragments;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/20 12:57:00
- * @Describe 拨号
- */
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.provider.CallLog;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.adapters.CallLogAdapter;
-import cc.winboll.studio.contacts.beans.CallLogModel;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class CallLogFragment extends Fragment {
-
-    public static final String TAG = "CallFragment";
-
-    private static final String ARG_PAGE = "ARG_PAGE";
-    private int mPage;
-    
-    private static final int REQUEST_READ_CALL_LOG = 1;
-    private RecyclerView recyclerView;
-    private CallLogAdapter callLogAdapter;
-    private List<CallLogModel> callLogList = new ArrayList<>();
-
-    public static CallLogFragment newInstance(int page) {
-        Bundle args = new Bundle();
-        args.putInt(ARG_PAGE, page);
-        CallLogFragment fragment = new CallLogFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-    
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_call_log, container, false);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments()!= null) {
-            mPage = getArguments().getInt(ARG_PAGE);
-        }
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        recyclerView = view.findViewById(R.id.recyclerView);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        callLogAdapter = new CallLogAdapter(getContext(), callLogList);
-        recyclerView.setAdapter(callLogAdapter);
-
-        if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CALL_LOG)!= PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(requireActivity(), new String[]{Manifest.permission.READ_CALL_LOG}, REQUEST_READ_CALL_LOG);
-        } else {
-            readCallLog();
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_READ_CALL_LOG) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                readCallLog();
-            }
-        }
-    }
-
-    private void readCallLog() {
-        Cursor cursor = requireContext().getContentResolver().query(
-            CallLog.Calls.CONTENT_URI,
-            null,
-            null,
-            null,
-            CallLog.Calls.DATE + " DESC");
-
-        if (cursor!= null) {
-            while (cursor.moveToNext()) {
-                String phoneNumber = cursor.getString(cursor.getColumnIndex(CallLog.Calls.NUMBER));
-                int callType = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.TYPE));
-                long callDateLong = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DATE));
-                Date callDate = new Date(callDateLong);
-
-                String callStatus = getCallStatus(callType);
-
-                callLogList.add(new CallLogModel(phoneNumber, callStatus, callDate));
-            }
-            cursor.close();
-            callLogAdapter.notifyDataSetChanged();
-        }
-    }
-
-    private String getCallStatus(int callType) {
-        switch (callType) {
-            case CallLog.Calls.OUTGOING_TYPE:
-                return "Outgoing";
-            case CallLog.Calls.INCOMING_TYPE:
-                return "Incoming";
-            case CallLog.Calls.MISSED_TYPE:
-                return "Missed";
-            default:
-                return "Unknown";
-        }
-    }
-    
-}

contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java

@@ -5,47 +5,23 @@ package cc.winboll.studio.contacts.fragments;
  * @Date 2025/02/20 12:57:50
  * @Describe 联系人
  */
-import android.Manifest;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
 import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.adapters.ContactAdapter;
-import cc.winboll.studio.contacts.beans.ContactModel;
-import com.hjq.toast.ToastUtils;
-import java.util.ArrayList;
-import java.util.List;
-
 
 public class ContactsFragment extends Fragment {
-
+    
     public static final String TAG = "ContactsFragment";
-
+    
     private static final String ARG_PAGE = "ARG_PAGE";
     private int mPage;
 
-    private static final int REQUEST_READ_CONTACTS = 1;
-    private RecyclerView recyclerView;
-    private ContactAdapter contactAdapter;
-    private List<ContactModel> contactList = new ArrayList<>();
-    private List<ContactModel> originalContactList = new ArrayList<>();
-    private EditText searchEditText;
-
     public static ContactsFragment newInstance(int page) {
         Bundle args = new Bundle();
         args.putInt(ARG_PAGE, page);
@@ -57,111 +33,18 @@ public class ContactsFragment extends Fragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
+        if (getArguments()!= null) {
             mPage = getArguments().getInt(ARG_PAGE);
         }
     }
 
     @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_contacts, container, false);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        recyclerView = view.findViewById(R.id.contacts_recycler_view);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        contactAdapter = new ContactAdapter(contactList);
-        recyclerView.setAdapter(contactAdapter);
-
-        searchEditText = view.findViewById(R.id.search_edit_text);
-        searchEditText.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    filterContacts(s.toString());
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                }
-            });
-
-        if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(requireActivity(), new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_READ_CONTACTS);
-        } else {
-            readContacts();
-        }
-
-        Button btnDial = view.findViewById(R.id.btn_dial);
-        btnDial.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View p1) {
-
-                    String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", "");
-                    //phoneNumber = "+8616769764848";
-                    ToastUtils.show(phoneNumber);
-                    Intent intent = new Intent(Intent.ACTION_CALL);
-                    intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-                    // 添加 FLAG_ACTIVITY_NEW_TASK 标志
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(intent);
-                }
-            });
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_READ_CONTACTS) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                readContacts();
-            }
-        }
-    }
-
-    private void readContacts() {
-        contactList.clear();
-        originalContactList.clear();
-        Cursor cursor = requireContext().getContentResolver().query(
-            ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
-            null,
-            null,
-            null,
-            ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC");
-
-        if (cursor != null) {
-            while (cursor.moveToNext()) {
-                String name = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
-                String number = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
-                ContactModel contact = new ContactModel(name, number);
-                contactList.add(contact);
-                originalContactList.add(contact);
-            }
-            cursor.close();
-            contactAdapter.notifyDataSetChanged();
-        }
-    }
-
-    private void filterContacts(String query) {
-        contactList.clear();
-        if (query.isEmpty()) {
-            contactList.addAll(originalContactList);
-        } else {
-            for (ContactModel contact : originalContactList) {
-                if (contact.getName().toLowerCase().contains(query.toLowerCase()) ||
-                    contact.getPinyin().toLowerCase().contains(query.toLowerCase()) ||
-                    contact.getNumber().toLowerCase().contains(query.toLowerCase())) {
-                    contactList.add(contact);
-                }
-            }
-        }
-        contactAdapter.notifyDataSetChanged();
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_contacts, container, false);
+        TextView textView = view.findViewById(R.id.page_text);
+        textView.setText("这是第 " + mPage + " 页");
+        return view;
     }
 }
-

contacts/src/main/java/cc/winboll/studio/contacts/listenphonecall/CallListenerService.java

@@ -21,8 +21,6 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import cc.winboll.studio.contacts.MainActivity;
 import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.contacts.phonecallui.PhoneCallActivity;
-import cc.winboll.studio.contacts.phonecallui.PhoneCallService;
 
 
 public class CallListenerService extends Service {
@@ -154,12 +152,9 @@ public class CallListenerService extends Service {
 
                 @Override
                 public void onClick(View view) {
-//                    Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-//                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                    CallListenerService.this.startActivity(intent);
-
-                    PhoneCallService.CallType callType = isCallingIn ? PhoneCallService.CallType.CALL_IN: PhoneCallService.CallType.CALL_OUT;
-                    PhoneCallActivity.actionStart(CallListenerService.this, callNumber, callType);
+                    Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    CallListenerService.this.startActivity(intent);
                 }
             });
     }

contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallActivity.java

@@ -57,9 +57,10 @@ public class PhoneCallActivity extends AppCompatActivity implements View.OnClick
         setContentView(R.layout.activity_phone_call);
 
         ActivityStack.getInstance().addActivity(this);
-        initData();
-        initView();
 
+        initData();
+
+        initView();
     }
 
     private void initData() {
@@ -73,9 +74,9 @@ public class PhoneCallActivity extends AppCompatActivity implements View.OnClick
 
     private void initView() {
         int uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION //hide navigationBar
-            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-            | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
+                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION //hide navigationBar
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
         getWindow().getDecorView().setSystemUiVisibility(uiOptions);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
 
@@ -93,7 +94,9 @@ public class PhoneCallActivity extends AppCompatActivity implements View.OnClick
         if (callType == PhoneCallService.CallType.CALL_IN) {
             tvCallNumberLabel.setText("来电号码");
             tvPickUp.setVisibility(View.VISIBLE);
-        } else if (callType == PhoneCallService.CallType.CALL_OUT) {
+        }
+        // 打出的电话
+        else if (callType == PhoneCallService.CallType.CALL_OUT) {
             tvCallNumberLabel.setText("呼叫号码");
             tvPickUp.setVisibility(View.GONE);
             phoneCallManager.openSpeaker();
@@ -104,13 +107,13 @@ public class PhoneCallActivity extends AppCompatActivity implements View.OnClick
 
     public void showOnLockScreen() {
         this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
-                                  WindowManager.LayoutParams.FLAG_FULLSCREEN |
-                                  WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
-                                  WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON,
-                                  WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
-                                  WindowManager.LayoutParams.FLAG_FULLSCREEN |
-                                  WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
-                                  WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+                        WindowManager.LayoutParams.FLAG_FULLSCREEN |
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+                        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON,
+                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
+                        WindowManager.LayoutParams.FLAG_FULLSCREEN |
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+                        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
     }
 
     @Override
@@ -120,18 +123,18 @@ public class PhoneCallActivity extends AppCompatActivity implements View.OnClick
             tvPickUp.setVisibility(View.GONE);
             tvCallingTime.setVisibility(View.VISIBLE);
             onGoingCallTimer.schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        runOnUiThread(new Runnable() {
-                                @SuppressLint("SetTextI18n")
-                                @Override
-                                public void run() {
-                                    callingTime++;
-                                    tvCallingTime.setText("通话中：" + getCallingTime());
-                                }
-                            });
-                    }
-                }, 0, 1000);
+                @Override
+                public void run() {
+                    runOnUiThread(new Runnable() {
+                        @SuppressLint("SetTextI18n")
+                        @Override
+                        public void run() {
+                            callingTime++;
+                            tvCallingTime.setText("通话中：" + getCallingTime());
+                        }
+                    });
+                }
+            }, 0, 1000);
         } else if (v.getId() == R.id.tv_phone_hang_up) {
             phoneCallManager.disconnect();
             stopTimer();
@@ -142,8 +145,8 @@ public class PhoneCallActivity extends AppCompatActivity implements View.OnClick
         int minute = callingTime / 60;
         int second = callingTime % 60;
         return (minute < 10 ? "0" + minute : minute) +
-            ":" +
-            (second < 10 ? "0" + second : second);
+                ":" +
+                (second < 10 ? "0" + second : second);
     }
 
     private void stopTimer() {
@@ -157,6 +160,7 @@ public class PhoneCallActivity extends AppCompatActivity implements View.OnClick
     @Override
     protected void onDestroy() {
         super.onDestroy();
+
         phoneCallManager.destroy();
     }
 }

contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallService.java

@@ -7,52 +7,28 @@ package cc.winboll.studio.contacts.phonecallui;
  * @see PhoneCallActivity
  * @see android.telecom.InCallService
  */
-import android.content.ContentResolver;
-import android.database.Cursor;
 import android.media.AudioManager;
-import android.media.MediaRecorder;
-import android.net.Uri;
 import android.os.Build;
-import android.provider.CallLog;
 import android.telecom.Call;
 import android.telecom.InCallService;
-import android.telephony.TelephonyManager;
 import androidx.annotation.RequiresApi;
 import cc.winboll.studio.contacts.ActivityStack;
 import cc.winboll.studio.contacts.beans.RingTongBean;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
-import java.io.File;
-import java.io.IOException;
 
 @RequiresApi(api = Build.VERSION_CODES.M)
 public class PhoneCallService extends InCallService {
 
     public static final String TAG = "PhoneCallService";
-
-    MediaRecorder mediaRecorder;
+    
+    private volatile int originalRingVolume;
 
     private final Call.Callback callback = new Call.Callback() {
         @Override
         public void onStateChanged(Call call, int state) {
             super.onStateChanged(call, state);
             switch (state) {
-                case TelephonyManager.CALL_STATE_OFFHOOK:
-                    {
-                        long callId = getCurrentCallId();
-                        if (callId != -1) {
-                            // 在这里可以对获取到的通话记录ID进行处理
-                            //System.out.println("当前通话记录ID: " + callId);
-
-                            // 电话接通，开始录音
-                            startRecording(callId);
-                        }
-                        break;
-                    }
-                case TelephonyManager.CALL_STATE_IDLE:
-                    // 电话挂断，停止录音
-                    stopRecording();
-                    break;
                 case Call.STATE_ACTIVE: {
                         break;
                     }
@@ -85,58 +61,25 @@ public class PhoneCallService extends InCallService {
             String phoneNumber = details.getHandle().getSchemeSpecificPart();
 
             // 记录原始铃声音量
-            //
             AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
-            int ringerVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
-            // 恢复铃声音量，预防其他意外条件导致的音量变化问题
-            //
-
-            // 读取应用配置，未配置就初始化配置文件
-            RingTongBean bean = RingTongBean.loadBean(this, RingTongBean.class);
-            if (bean == null) {
-                // 初始化配置
-                bean = new RingTongBean();
-                RingTongBean.saveBean(this, bean);
-            }
-            // 如果当前音量和应用保存的不一致就恢复为应用设定值
-            // 恢复铃声音量
-            try {
-                if (ringerVolume != bean.getStreamVolume()) {
-                    audioManager.setStreamVolume(AudioManager.STREAM_RING, bean.getStreamVolume(), 0);
-                    //audioManager.setMode(AudioManager.RINGER_MODE_NORMAL);
-                }
-            } catch (java.lang.SecurityException e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            }
-
+            originalRingVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
             // 检查电话接收规则
             if (!Rules.getInstance(this).isAllowed(phoneNumber)) {
-                // 调低音量
-                try {
-                    audioManager.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
-                    //audioManager.setMode(AudioManager.RINGER_MODE_SILENT);
-                } catch (java.lang.SecurityException e) {
-                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                }
+                // 预先静音
+                audioManager.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
                 // 断开电话
                 call.disconnect();
                 // 停顿1秒，预防第一声铃声响动
                 try {
-                    Thread.sleep(500);
+                    Thread.sleep(1000);
                 } catch (InterruptedException e) {
                     LogUtils.d(TAG, "");
                 }
                 // 恢复铃声音量
-                try {
-                    audioManager.setStreamVolume(AudioManager.STREAM_RING, bean.getStreamVolume(), 0);
-                    //audioManager.setMode(AudioManager.RINGER_MODE_NORMAL);
-                } catch (java.lang.SecurityException e) {
-                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                }
+                audioManager.setStreamVolume(AudioManager.STREAM_RING, originalRingVolume, 0);
                 // 屏蔽电话结束
                 return;
             }
-
             // 正常接听电话
             PhoneCallActivity.actionStart(this, phoneNumber, callType);
         }
@@ -145,64 +88,16 @@ public class PhoneCallService extends InCallService {
     @Override
     public void onCallRemoved(Call call) {
         super.onCallRemoved(call);
+
         call.unregisterCallback(callback);
         PhoneCallManager.call = null;
+        AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
+        // 恢复铃声音量
+        audioManager.setStreamVolume(AudioManager.STREAM_RING, originalRingVolume, 0);
     }
 
     public enum CallType {
         CALL_IN,
         CALL_OUT,
     }
-
-
-    private void startRecording(long callId) {
-        LogUtils.d(TAG, "startRecording(...)");
-        mediaRecorder = new MediaRecorder();
-        mediaRecorder.setAudioSource(MediaRecorder.AudioSource.VOICE_CALL);
-        mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
-        mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
-        mediaRecorder.setOutputFile(getOutputFilePath(callId));
-        try {
-            mediaRecorder.prepare();
-            mediaRecorder.start();
-        } catch (IOException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    private String getOutputFilePath(long callId) {
-        LogUtils.d(TAG, "getOutputFilePath(...)");
-        // 设置录音文件的保存路径
-        File file = new File(getExternalFilesDir(TAG), String.format("call_%d.mp4", callId));
-        return file.getAbsolutePath();
-    }
-
-    private void stopRecording() {
-        LogUtils.d(TAG, "stopRecording()");
-        if (mediaRecorder != null) {
-            mediaRecorder.stop();
-            mediaRecorder.release();
-            mediaRecorder = null;
-        }
-    }
-
-    private long getCurrentCallId() {
-        LogUtils.d(TAG, "getCurrentCallId()");
-        ContentResolver contentResolver = getApplicationContext().getContentResolver();
-        Uri callLogUri = Uri.parse("content://call_log/calls");
-        String[] projection = {"_id", "number", "call_type", "date"};
-        String selection = "call_type = " + CallLog.Calls.OUTGOING_TYPE + " OR call_type = " + CallLog.Calls.INCOMING_TYPE;
-        String sortOrder = "date DESC";
-
-        try {
-            Cursor cursor = contentResolver.query(callLogUri, projection, selection, null, sortOrder);
-            if (cursor != null && cursor.moveToFirst()) {
-                return cursor.getLong(cursor.getColumnIndex("_id"));
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-
-        return -1;
-    }
 }

contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java

@@ -9,9 +9,13 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.util.Log;
 import cc.winboll.studio.contacts.services.MainService;
 import com.hjq.toast.ToastUtils;
 import java.lang.ref.WeakReference;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class MainReceiver extends BroadcastReceiver {
 
@@ -39,7 +43,7 @@ public class MainReceiver extends BroadcastReceiver {
     public void registerAction(Context context) {
         IntentFilter filter=new IntentFilter();
         filter.addAction(ACTION_BOOT_COMPLETED);
-        //filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
+        //filter.addAction(Intent.ACTION_BATTERY_CHANGED);
         context.registerReceiver(this, filter);
     }
 }

contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java

@@ -15,6 +15,8 @@ import android.os.IBinder;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.SOS;
+import cc.winboll.studio.libappbase.bean.APPSOSBean;
 
 public class AssistantService extends Service {
 

contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java

@@ -11,29 +11,25 @@ package cc.winboll.studio.contacts.services;
  * https://blog.csdn.net/cyp331203/article/details/38920491
  */
 import android.app.Service;
+import cc.winboll.studio.contacts.listenphonecall.CallListenerService;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.media.AudioManager;
 import android.os.Binder;
 import android.os.IBinder;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
-import cc.winboll.studio.contacts.beans.RingTongBean;
-import cc.winboll.studio.contacts.bobulltoon.TomCat;
-import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.handlers.MainServiceHandler;
-import cc.winboll.studio.contacts.listenphonecall.CallListenerService;
 import cc.winboll.studio.contacts.receivers.MainReceiver;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.threads.MainServiceThread;
+import cc.winboll.studio.contacts.widgets.APPStatusWidget;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.sos.SOS;
-import java.util.Timer;
-import java.util.TimerTask;
-import cc.winboll.studio.libappbase.sos.WinBoll;
-import cc.winboll.studio.contacts.App;
-import cc.winboll.studio.libappbase.sos.APPModel;
+import cc.winboll.studio.libappbase.SOS;
+import cc.winboll.studio.libappbase.bean.APPSOSBean;
+import cc.winboll.studio.contacts.dun.Rules;
+import android.media.AudioManager;
+import com.hjq.toast.ToastUtils;
 
 public class MainService extends Service {
 
@@ -52,9 +48,8 @@ public class MainService extends Service {
     AssistantService mAssistantService;
     boolean isBound = false;
     MainReceiver mMainReceiver;
-    Timer mStreamVolumeCheckTimer;
-    static volatile TomCat _TomCat;
-
+    
+    
     @Override
     public IBinder onBind(Intent intent) {
         return new MyBinder();
@@ -76,37 +71,9 @@ public class MainService extends Service {
             mMyServiceConnection = new MyServiceConnection();
         }
         mMainServiceHandler = new MainServiceHandler(this);
-
-        // 铃声检查定时器
-        mStreamVolumeCheckTimer = new Timer();
-        mStreamVolumeCheckTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
-                    int ringerVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
-                    // 恢复铃声音量，预防其他意外条件导致的音量变化问题
-                    //
-
-                    // 读取应用配置，未配置就初始化配置文件
-                    RingTongBean bean = RingTongBean.loadBean(MainService.this, RingTongBean.class);
-                    if (bean == null) {
-                        // 初始化配置
-                        bean = new RingTongBean();
-                        RingTongBean.saveBean(MainService.this, bean);
-                    }
-                    // 如果当前音量和应用保存的不一致就恢复为应用设定值
-                    // 恢复铃声音量
-                    try {
-                        if (ringerVolume != bean.getStreamVolume()) {
-                            audioManager.setStreamVolume(AudioManager.STREAM_RING, bean.getStreamVolume(), 0);
-                            //audioManager.setMode(AudioManager.RINGER_MODE_NORMAL);
-                        }
-                    } catch (java.lang.SecurityException e) {
-                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                    }
-                }
-            }, 1000, 60000);
-
+        
+        
+    
         // 运行服务内容
         mainService();
     }
@@ -130,26 +97,18 @@ public class MainService extends Service {
             // 唤醒守护进程
             wakeupAndBindAssistant();
             // 召唤 WinBoll APP 绑定本服务
-            if (App.isDebuging()) {
-                WinBoll.bindToAPPBaseBeta(this, MainService.class.getName());
-            } else {
-                WinBoll.bindToAPPBase(this, MainService.class.getName());
-            }
-
-            // 初始化服务运行参数
-            _TomCat = TomCat.getInstance(this);
-            if (!_TomCat.loadPhoneBoBullToon()) {
-                LogUtils.d(TAG, "没有下载 BoBullToon 数据。BoBullToon 参数无法加载。");
-            }
+            SOS.bindToAPPService(this, new APPSOSBean(getPackageName(), MainService.class.getName()));
 
             if (mMainReceiver == null) {
                 // 注册广播接收器
                 mMainReceiver = new MainReceiver(this);
                 mMainReceiver.registerAction(this);
             }
-
-            Rules.getInstance(this).loadRules();
-
+            
+            Rules.getInstance(this);
+            //Rules.getInstance(this).add("18888888888", true);
+            //Rules.getInstance(this).add("16769764848", true);
+            
             startPhoneCallListener();
 
             MainServiceThread.getInstance(this, mMainServiceHandler).start();
@@ -158,14 +117,6 @@ public class MainService extends Service {
         }
     }
 
-    public static boolean isPhoneInBoBullToon(String phone) {
-        if (_TomCat != null) {
-            return _TomCat.isPhoneBoBullToon(phone);
-        }
-        return false;
-    }
-
-
     // 唤醒和绑定守护进程
     //
     void wakeupAndBindAssistant() {
@@ -186,7 +137,7 @@ public class MainService extends Service {
 //        LogUtils.d(TAG, "startService(intent)");
 //        bindService(new Intent(this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
     }
-
+    
     void startPhoneCallListener() {
         Intent callListener = new Intent(this, CallListenerService.class);
         startService(callListener);
@@ -217,7 +168,7 @@ public class MainService extends Service {
 
             // 停止主要进程
             MainServiceThread.getInstance(this, mMainServiceHandler).setIsExit(true);
-
+            
         }
 
         super.onDestroy();
@@ -240,11 +191,7 @@ public class MainService extends Service {
             if (mMainServiceBean.isEnable()) {
                 // 唤醒守护进程
                 wakeupAndBindAssistant();
-                if (App.isDebuging()) {
-                    SOS.sosToAppBase(getApplicationContext(), MainService.class.getName());
-                } else {
-                    SOS.sosToAppBaseBeta(getApplicationContext(), MainService.class.getName());
-                }
+                SOS.sosWinBollService(getApplicationContext(), new APPSOSBean(getPackageName(), MainService.class.getName()));
             }
             isBound = false;
             mAssistantService = null;
@@ -283,40 +230,14 @@ public class MainService extends Service {
 
     public static void stopMainService(Context context) {
         LogUtils.d(TAG, "stopMainService");
-        context.stopService(new Intent(context, MainService.class));
-    }
-
-    public static void startMainService(Context context) {
-        LogUtils.d(TAG, "startMainService");
-        context.startService(new Intent(context, MainService.class));
-    }
-
-    public static void restartMainService(Context context) {
-        LogUtils.d(TAG, "restartMainService");
-
-        MainServiceBean bean = MainServiceBean.loadBean(context, MainServiceBean.class);
-        if (bean != null && bean.isEnable()) {
-            context.stopService(new Intent(context, MainService.class));
-//            try {
-//                Thread.sleep(1000);
-//            } catch (InterruptedException e) {
-//                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//            }
-            context.startService(new Intent(context, MainService.class));
-            LogUtils.d(TAG, "已重启 MainService");
-        }
-    }
-
-    public static void stopMainServiceAndSaveStatus(Context context) {
-        LogUtils.d(TAG, "stopMainServiceAndSaveStatus");
         MainServiceBean bean = new MainServiceBean();
         bean.setIsEnable(false);
         MainServiceBean.saveBean(context, bean);
         context.stopService(new Intent(context, MainService.class));
     }
 
-    public static void startMainServiceAndSaveStatus(Context context) {
-        LogUtils.d(TAG, "startMainServiceAndSaveStatus");
+    public static void startMainService(Context context) {
+        LogUtils.d(TAG, "startMainService");
         MainServiceBean bean = new MainServiceBean();
         bean.setIsEnable(true);
         MainServiceBean.saveBean(context, bean);

contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java

@@ -6,7 +6,11 @@ package cc.winboll.studio.contacts.threads;
  */
 import android.content.Context;
 import cc.winboll.studio.contacts.handlers.MainServiceHandler;
+import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.SOS;
+import cc.winboll.studio.libappbase.bean.APPSOSBean;
+import com.hjq.toast.ToastUtils;
 import java.lang.ref.WeakReference;
 
 public class MainServiceThread extends Thread {

contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java

@@ -1,123 +0,0 @@
-package cc.winboll.studio.contacts.utils;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/06 21:08:16
- * @Describe ContactUtils
- */
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.ContactsContract;
-import cc.winboll.studio.libappbase.LogUtils;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ContactUtils {
-
-    public static final String TAG = "ContactUtils";
-
-    Map<String, String> contactMap = new HashMap<>();
-
-    static volatile ContactUtils _ContactUtils;
-    Context mContext;
-    ContactUtils(Context context) {
-        mContext = context;
-        relaodContacts();
-    }
-    public synchronized static ContactUtils getInstance(Context context) {
-        if (_ContactUtils == null) {
-            _ContactUtils = new ContactUtils(context);
-        }
-        return _ContactUtils;
-    }
-
-    public void relaodContacts() {
-        readContacts();
-    }
-
-    private void readContacts() {
-        contactMap.clear();
-        ContentResolver contentResolver = mContext.getContentResolver();
-        Cursor cursor = contentResolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
-                                              null, null, null, null);
-        if (cursor != null) {
-            while (cursor.moveToNext()) {
-                String displayName = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
-                String phoneNumber = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
-                //Map<String, String> contactMap = new HashMap<>();
-                contactMap.put(formatToSimplePhoneNumber(phoneNumber), displayName);
-            }
-            cursor.close();
-        }
-        // 此时 contactList 就是存储联系人信息的 Map 列表
-    }
-
-    public String getContactsName(String phone) {
-        String result = contactMap.get(formatToSimplePhoneNumber(phone));
-        return result == null ? "[NotInContacts]" : result;
-    }
-
-//    static String getSimplePhone(String phone) {
-//        return phone.replaceAll("[+\\s]", "");
-//    }
-
-    public static String formatToSimplePhoneNumber(String number) {
-        // 去除所有空格和非数字字符
-        return number.replaceAll("[^0-9]", "");
-    }
-
-    public static String getDisplayNameByPhone(Context context, String phoneNumber) {
-        String displayName = null;
-        ContentResolver resolver = context.getContentResolver();
-        String[] projection = {ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME};
-        Cursor cursor = resolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI, projection, ContactsContract.CommonDataKinds.Phone.NUMBER + "=?", new String[]{phoneNumber}, null);
-        if (cursor != null && cursor.moveToFirst()) {
-            displayName = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
-            cursor.close();
-        }
-        return displayName;
-    }
-
-    public static String getDisplayNameByPhoneSimple(Context context, String phoneNumber) {
-        String displayName = null;
-        ContentResolver resolver = context.getContentResolver();
-        String[] projection = {ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME};
-        Cursor cursor = resolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI, projection, ContactsContract.CommonDataKinds.Phone.NUMBER + "=?", new String[]{formatToSimplePhoneNumber(phoneNumber)}, null);
-        if (cursor != null && cursor.moveToFirst()) {
-            displayName = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
-            cursor.close();
-        }
-        return displayName;
-    }
-
-    public static boolean isPhoneInContacts(Context context, String phoneNumber) {
-        String szPhoneNumber = formatToSimplePhoneNumber(phoneNumber);
-        String szDisplayName = getDisplayNameByPhone(context, szPhoneNumber);
-        if (szDisplayName == null) {
-            LogUtils.d(TAG, String.format("Phone %s is not in contacts.", szPhoneNumber));
-            szPhoneNumber = formatToSpacePhoneNumber(szPhoneNumber);
-            szDisplayName = getDisplayNameByPhone(context, szPhoneNumber);
-            if (szDisplayName == null) {
-                LogUtils.d(TAG, String.format("Phone %s is not in contacts.", szPhoneNumber));
-                return false;
-            }
-        }
-        LogUtils.d(TAG, String.format("Phone %s is found in contacts %s.", szPhoneNumber, szDisplayName));
-        return true;
-    }
-
-    public static String formatToSpacePhoneNumber(String simpleNumber) {
-        // 去除所有空格和非数字字符
-        StringBuilder sbSpaceNumber = new StringBuilder();
-        String regex = "^1[0-9]{10}$"; 
-        if (simpleNumber.matches(regex)) {
-            sbSpaceNumber.append(simpleNumber.substring(0, 3));
-            sbSpaceNumber.append(" ");
-            sbSpaceNumber.append(simpleNumber.substring(3, 7));
-            sbSpaceNumber.append(" ");
-            sbSpaceNumber.append(simpleNumber.substring(7, 11));
-        }
-        return sbSpaceNumber.toString();
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java

@@ -1,27 +0,0 @@
-package cc.winboll.studio.contacts.utils;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/26 15:21:48
- * @Describe PhoneUtils
- */
-import android.Manifest;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import androidx.core.app.ActivityCompat;
-
-public class PhoneUtils {
-    
-    public static final String TAG = "PhoneUtils";
-    
-    public static void call(Context context, String phoneNumber) {
-        Intent intent = new Intent(Intent.ACTION_CALL);
-        intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
-        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        context.startActivity(intent);
-    }
-    
-}

contacts/src/main/java/cc/winboll/studio/contacts/utils/RegexPPiUtils.java

@@ -1,32 +0,0 @@
-package cc.winboll.studio.contacts.utils;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/12/09 19:00:21
- * @Describe .* 前置预防针
- regex pointer preventive injection
- 简称 RegexPPi
- */
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class RegexPPiUtils {
-
-    public static final String TAG = "RegexPPiUtils";
-
-    //
-    // 检验文本是否满足适合正则表达式模式计算
-    //
-    public static boolean isPPiOK(String text) {
-        //String text = "这里是一些任意的文本内容";
-        String regex = ".*";
-        Pattern pattern = Pattern.compile(regex);
-        Matcher matcher = pattern.matcher(text);
-        /*if (matcher.matches()) {
-         System.out.println("文本满足该正则表达式模式");
-         } else {
-         System.out.println("文本不满足该正则表达式模式");
-         }*/
-        return matcher.matches();
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/views/DuInfoTextView.java

@@ -1,68 +0,0 @@
-package cc.winboll.studio.contacts.views;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/02 21:11:03
- * @Describe 云盾防御信息
- */
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.widget.TextView;
-import cc.winboll.studio.contacts.beans.SettingsModel;
-import cc.winboll.studio.contacts.dun.Rules;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class DuInfoTextView extends TextView {
-    
-    public static final String TAG = "DuInfoTextView";
-    
-    public static final int MSG_NOTIFY_INFO_UPDATE = 0;
-    
-    Context mContext;
-    
-    public DuInfoTextView(android.content.Context context) {
-        super(context);
-    }
-
-    public DuInfoTextView(android.content.Context context, android.util.AttributeSet attrs) {
-        super(context, attrs);
-        initView(context);
-    }
-
-    public DuInfoTextView(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public DuInfoTextView(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    void initView(android.content.Context context) {
-        mContext = context;
-        updateInfo();
-    }
-    
-    void updateInfo() {
-        LogUtils.d(TAG, "updateInfo()");
-        SettingsModel settingsModel = Rules.getInstance(mContext).getSettingsModel();
-        String info = String.format("(云盾防御值【%d/%d】)", settingsModel.getDunCurrentCount(), settingsModel.getDunTotalCount());
-        setText(info);
-    }
-    
-    Handler mHandler = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            if(msg.what == MSG_NOTIFY_INFO_UPDATE) {
-                updateInfo();
-            }
-        }
-        
-    };
-    
-    public void notifyInfoUpdate() {
-        LogUtils.d(TAG, "notifyInfoUpdate()");
-        mHandler.sendMessage(mHandler.obtainMessage(MSG_NOTIFY_INFO_UPDATE));
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java

@@ -1,220 +0,0 @@
-package cc.winboll.studio.contacts.views;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/04 10:51:50
- * @Describe CustomHorizontalScrollView
- */
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.HorizontalScrollView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import cc.winboll.studio.contacts.R;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class LeftScrollView extends HorizontalScrollView {
-
-    public static final String TAG = "LeftScrollView";
-
-    private LinearLayout contentLayout;
-    private LinearLayout toolLayout;
-    private TextView textView;
-    private Button editButton;
-    private Button deleteButton;
-    private Button upButton;
-    private Button downButton;
-    private float mStartX;
-    private float mEndX;
-    private boolean isScrolling = false;
-    private int nScrollAcceptSize;
-
-    public LeftScrollView(Context context) {
-        super(context);
-        init();
-    }
-
-    public LeftScrollView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public LeftScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
-    public void addContentLayout(TextView textView) {
-        contentLayout.addView(textView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
-    }
-
-    public void setContentWidth(int contentWidth) {
-        LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) contentLayout.getLayoutParams();
-        layoutParams.width = contentWidth;
-        contentLayout.setLayoutParams(layoutParams);
-
-    }
-
-    private void init() {
-        View viewMain = inflate(getContext(), R.layout.view_left_scroll, null);
-
-        // 创建内容布局
-        contentLayout = viewMain.findViewById(R.id.content_layout);
-        toolLayout = viewMain.findViewById(R.id.action_layout);
-
-        //LogUtils.d(TAG, String.format("getWidth() %d", getWidth()));
-
-        addView(viewMain);
-
-        // 创建编辑按钮
-        editButton = viewMain.findViewById(R.id.edit_btn);
-        // 创建删除按钮
-        deleteButton = viewMain.findViewById(R.id.delete_btn);
-        // 向上按钮
-        upButton = viewMain.findViewById(R.id.up_btn);
-        // 向下按钮
-        downButton = viewMain.findViewById(R.id.down_btn);
-
-        // 编辑按钮点击事件
-        editButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onActionListener != null) {
-                        onActionListener.onEdit();
-                    }
-                }
-            });
-
-        // 删除按钮点击事件
-        deleteButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onActionListener != null) {
-                        onActionListener.onDelete();
-                    }
-                }
-            });
-        // 编辑按钮点击事件
-        upButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onActionListener != null) {
-                        onActionListener.onUp();
-                    }
-                }
-            });
-
-        // 删除按钮点击事件
-        downButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (onActionListener != null) {
-                        onActionListener.onDown();
-                    }
-                }
-            });
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                LogUtils.d(TAG, "ACTION_DOWN");
-                mStartX = event.getX();
-//                isScrolling = false;
-                break;
-            case MotionEvent.ACTION_MOVE:
-                //LogUtils.d(TAG, "ACTION_MOVE");
-//                float currentX = event.getX();
-//                float deltaX = mStartX - currentX;
-//                //mLastX = currentX;
-//                if (Math.abs(deltaX) > 0) {
-//                    isScrolling = true;
-//                }
-                break;
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                if (getScrollX() > 0) {
-                    LogUtils.d(TAG, "ACTION_UP");
-                    mEndX = event.getX();
-                    LogUtils.d(TAG, String.format("mStartX %f, mEndX %f", mStartX, mEndX));
-                    if (mEndX < mStartX) {
-                        LogUtils.d(TAG, String.format("mEndX >= mStartX \ngetScrollX() %d", getScrollX()));
-                        //if (getScrollX() > editButton.getWidth()) {
-                        if (Math.abs(mStartX - mEndX) > editButton.getWidth()) {
-                            smoothScrollToRight();
-                        } else {
-                            smoothScrollToLeft();
-                        }
-                    } else {
-                        LogUtils.d(TAG, String.format("mEndX >= mStartX \ngetScrollX() %d", getScrollX()));
-                        //if (getScrollX() > deleteButton.getWidth()) {
-                        if (Math.abs(mEndX - mStartX) > deleteButton.getWidth()) {
-                            smoothScrollToLeft();
-                        } else {
-                            smoothScrollToRight();
-                        }
-                    }
-                }
-                break;
-        }
-        return super.onTouchEvent(event);
-    }
-
-    void smoothScrollToRight() {
-        mEndX = 0;
-        mStartX = 0;
-        View childView = getChildAt(0);
-        if (childView != null) {
-            // 计算需要滑动到最右边的距离
-            int scrollToX = childView.getWidth() - getWidth();
-            // 确保滑动距离不小于0
-            final int scrollToX2 = Math.max(0, scrollToX);
-            // 平滑滑动到最右边
-            post(new Runnable() {
-                    @Override
-                    public void run() {
-                        smoothScrollTo(scrollToX2, 0);
-                        LogUtils.d(TAG, "smoothScrollTo(0, 0);");
-                    }
-                });
-            LogUtils.d(TAG, "smoothScrollTo(scrollToX, 0);");
-        }
-    }
-
-    void smoothScrollToLeft() {
-        mEndX = 0;
-        mStartX = 0;
-        // 在手指抬起时，使用 post 方法调用 smoothScrollTo(0, 0)
-        post(new Runnable() {
-                @Override
-                public void run() {
-                    smoothScrollTo(0, 0);
-                    LogUtils.d(TAG, "smoothScrollTo(0, 0);");
-                }
-            });
-    }
-
-    // 设置文本内容
-    public void setText(CharSequence text) {
-        textView.setText(text);
-    }
-
-    // 定义回调接口
-    public interface OnActionListener {
-        void onEdit();
-        void onDelete();
-        void onUp();
-        void onDown();
-    }
-
-    private OnActionListener onActionListener;
-
-    public void setOnActionListener(OnActionListener listener) {
-        this.onActionListener = listener;
-    }
-}
-

contacts/src/main/java/cc/winboll/studio/contacts/views/ScrollDoView.java

@@ -1,14 +0,0 @@
-package cc.winboll.studio.contacts.views;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/19 14:04:20
- * @Describe 云盾滑视度热备控件
- */
-public class ScrollDoView {
-    
-    public static final String TAG = "ScrollDoView";
-    
-    
-    
-}

contacts/src/main/res/drawable/recycler_view_border.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="#000000" /> <!-- 设置边框宽度和颜色，这里是黑色 1dp 边框 -->
-    <solid android:color="#ffffff" /> <!-- 设置背景颜色，这里是白色 -->
-</shape>
-

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

@@ -12,26 +12,16 @@
 		android:layout_height="wrap_content"
 		android:id="@+id/activitymainToolbar1"/>
 
-	<LinearLayout
-		android:orientation="vertical"
+	<androidx.viewpager.widget.ViewPager
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:padding="10dp"
-		android:layout_weight="1.0">
-
-		<androidx.viewpager.widget.ViewPager
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-            android:layout_weight="1.0"
-			android:id="@+id/viewPager"/>
-
-        <com.google.android.material.tabs.TabLayout
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:id="@+id/tabLayout"/>
-        
-	</LinearLayout>
+		android:layout_weight="1.0"
+		android:id="@+id/activitymainViewPager1"/>
 
+	<com.google.android.material.tabs.TabLayout
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:id="@+id/activitymainTabLayout1"/>
 
 </LinearLayout>
 

contacts/src/main/res/layout/activity_phone_call.xml

@@ -1,98 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical"
-	tools:context=".phonecallui.PhoneCallActivity">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".phonecallui.PhoneCallActivity">
 
-	<RelativeLayout
-		android:id="@+id/rl_user_info"
-		android:layout_width="match_parent"
-		android:layout_height="300dp"
-		android:background="@color/colorPrimaryDark"
-		android:layout_marginTop="100dp">
+    <RelativeLayout
+        android:id="@+id/rl_user_info"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:background="@color/colorPrimaryDark">
 
-		<TextView
-			android:id="@+id/tv_call_number_label"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_above="@+id/tv_call_number"
-			android:layout_marginBottom="16dp"
-			android:gravity="center"
-			android:text="来电号码"
-			android:textColor="@android:color/white"
-			android:textSize="18sp"/>
+        <TextView
+            android:id="@+id/tv_call_number_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/tv_call_number"
+            android:layout_marginBottom="16dp"
+            android:gravity="center"
+            android:text="来电号码"
+            android:textColor="@android:color/white"
+            android:textSize="18sp" />
 
-		<TextView
-			android:id="@+id/tv_call_number"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:textAlignment="center"
-			android:textColor="@android:color/white"
-			android:textSize="28sp"
-			android:textStyle="bold"
-			android:layout_centerInParent="true"
-			tools:text="133-9527-9527"/>
 
-	</RelativeLayout>
+        <TextView
+            android:id="@+id/tv_call_number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="28sp"
+            android:textStyle="bold"
+            android:layout_centerInParent="true"
+            tools:text="133-9527-9527" />
 
-	<RelativeLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:background="@android:color/white">
+    </RelativeLayout>
 
-		<TextView
-			android:id="@+id/tv_phone_calling_time"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_centerHorizontal="true"
-			android:layout_marginTop="24dp"
-			android:text="通话中：01:33"
-			android:textColor="@android:color/black"
-			android:textSize="18sp"
-			android:visibility="gone"
-			tools:visibility="visible"/>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/white">
 
-		<RelativeLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_centerInParent="true">
+        <TextView
+            android:id="@+id/tv_phone_calling_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="24dp"
+            android:text="通话中：01:33"
+            android:textColor="@android:color/black"
+            android:textSize="18sp"
+            android:visibility="gone"
+            tools:visibility="visible" />
 
-			<TextView
-				android:id="@+id/tv_phone_hang_up"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:drawablePadding="16dp"
-				android:drawableTop="@drawable/ic_phone_hang_up"
-				android:foreground="?android:attr/selectableItemBackground"
-				android:gravity="center"
-				android:padding="8dp"
-				android:text="挂  断"
-				android:textColor="@android:color/black"
-				tools:visibility="visible"/>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true">
 
-			<TextView
-				android:id="@+id/tv_phone_pick_up"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="50dp"
-				android:layout_toRightOf="@id/tv_phone_hang_up"
-				android:drawablePadding="16dp"
-				android:drawableTop="@drawable/ic_phone_pick_up"
-				android:foreground="?android:attr/selectableItemBackground"
-				android:gravity="center"
-				android:padding="8dp"
-				android:text="接  听"
-				android:textColor="@android:color/black"
-				android:visibility="gone"
-				tools:visibility="visible"/>
+            <TextView
+                android:id="@+id/tv_phone_hang_up"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="16dp"
+                android:drawableTop="@drawable/ic_phone_hang_up"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:gravity="center"
+                android:padding="8dp"
+                android:text="挂  断"
+                android:textColor="@android:color/black"
+                tools:visibility="visible" />
 
-		</RelativeLayout>
-
-	</RelativeLayout>
-
-</LinearLayout>
+            <TextView
+                android:id="@+id/tv_phone_pick_up"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="50dp"
+                android:layout_toRightOf="@id/tv_phone_hang_up"
+                android:drawablePadding="16dp"
+                android:drawableTop="@drawable/ic_phone_pick_up"
+                android:foreground="?android:attr/selectableItemBackground"
+                android:gravity="center"
+                android:padding="8dp"
+                android:text="接  听"
+                android:textColor="@android:color/black"
+                android:visibility="gone"
+                tools:visibility="visible" />
+        </RelativeLayout>
 
+    </RelativeLayout>
+</LinearLayout>

contacts/src/main/res/layout/activity_settings.xml

@@ -1,290 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	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/activitymainToolbar1"/>
+
 	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
 
-		<androidx.appcompat.widget.Toolbar
-			android:layout_width="match_parent"
+		<TextView
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:id="@+id/activitymainToolbar1"/>
+			android:text="应用权限设置："/>
 
 		<LinearLayout
-			android:orientation="vertical"
+			android:orientation="horizontal"
 			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1.0">
+			android:layout_height="wrap_content"
+			android:gravity="right">
 
-			<TextView
+			<Button
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="服务设置："/>
+				android:text="悬浮窗设置"
+				android:id="@+id/activitysettingsButton2"
+				android:onClick="onCanDrawOverlays"/>
 
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<Switch
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:text="主要服务"
-					android:id="@+id/sw_mainservice"
-					android:layout_margin="5dp"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="云盾设置："/>
-
-				<cc.winboll.studio.contacts.views.DuInfoTextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:id="@+id/tv_DunInfo"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<Switch
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:text="是否启用云盾防御"
-					android:layout_margin="5dp"
-					android:id="@+id/sw_IsEnableDun"
-					android:onClick="onSW_IsEnableDun"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="初始防御层的叠加数量："/>
-
-				<EditText
-					android:layout_width="0dp"
-					android:inputType="number"
-					android:layout_height="wrap_content"
-					android:ems="10"
-					android:layout_weight="1.0"
-					android:id="@+id/et_DunTotalCount"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="防御层每次恢复的时间间隔(秒钟)："/>
-
-				<EditText
-					android:layout_width="0dp"
-					android:inputType="number"
-					android:layout_height="wrap_content"
-					android:ems="10"
-					android:layout_weight="1.0"
-					android:id="@+id/et_DunResumeSecondCount"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="防御层每次恢复的叠加数量："/>
-
-				<EditText
-					android:layout_width="0dp"
-					android:inputType="number"
-					android:layout_height="wrap_content"
-					android:ems="10"
-					android:layout_weight="1.0"
-					android:id="@+id/et_DunResumeCount"/>
-
-			</LinearLayout>
-
-			<TextView
+			<Button
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="应用权限设置："/>
-
-			<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="悬浮窗设置"
-					android:id="@+id/activitysettingsButton2"
-					android:onClick="onCanDrawOverlays"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="默认拨号设置"
-					android:id="@+id/activitysettingsButton1"
-					android:onClick="onDefaultPhone"/>
-
-			</LinearLayout>
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="音量设置："/>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginLeft="10dp"
-					android:id="@+id/tv_volume"/>
-
-				<SeekBar
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_margin="10dp"
-					android:max="100"
-					android:id="@+id/bellvolume"/>
-
-			</LinearLayout>
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="拨不通电话记录查询："/>
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="right"
-				android:layout_margin="10dp">
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="下载 BoBullToon"
-					android:onClick="onDownloadBoBullToon"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="right|center_vertical"
-				android:layout_margin="10dp">
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="查询电话："/>
-
-				<EditText
-					android:layout_width="0dp"
-					android:inputType="phone"
-					android:layout_height="wrap_content"
-					android:ems="10"
-					android:layout_weight="1.0"
-					android:id="@+id/activitysettingsEditText1"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="查询记录"
-					android:onClick="onSearchBoBullToonPhone"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<TextView
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:text="Phone Connect Rule :"
-					android:layout_weight="1.0"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="添加新规则"
-					android:onClick="onAddNewConnectionRule"/>
-
-			</LinearLayout>
-
-			<androidx.recyclerview.widget.RecyclerView
-				android:id="@+id/recycler_view"
-				android:layout_width="match_parent"
-				android:layout_height="300dp"
-				android:background="@drawable/recycler_view_border"
-				android:layout_margin="5dp"/>
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="单元测试："/>
-
-			<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="Unit Test"
-					android:onClick="onUnitTest"/>
-
-			</LinearLayout>
+				android:text="默认拨号设置"
+				android:id="@+id/activitysettingsButton1"
+				android:onClick="onDefaultPhone"/>
 
 		</LinearLayout>
 
 	</LinearLayout>
 
-</ScrollView>
+</LinearLayout>
 

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

@@ -1,57 +0,0 @@
-<?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">
-
-	<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="onTestMain"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:gravity="center_vertical">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="测试号码："/>
-
-		<EditText
-			android:layout_width="0dp"
-			android:inputType="phone"
-			android:layout_height="wrap_content"
-			android:ems="10"
-			android:layout_weight="1.0"
-			android:id="@+id/phone_et"/>
-
-		<Button
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Test Phone"
-			android:onClick="onTestPhone"/>
-
-	</LinearLayout>
-
-	<cc.winboll.studio.libappbase.LogView
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:id="@+id/logview"/>
-
-</LinearLayout>
-

contacts/src/main/res/layout/fragment_call.xml

@@ -0,0 +1,29 @@
+<?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">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<EditText
+			android:layout_width="0dp"
+			android:ems="10"
+			android:layout_height="wrap_content"
+			android:layout_weight="1.0"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Text"
+			android:id="@+id/page_text"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+

contacts/src/main/res/layout/fragment_contacts.xml

@@ -1,36 +1,15 @@
 <?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">
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<EditText
-			android:id="@+id/search_edit_text"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:hint="Search contacts"
-			android:padding="16dp"
-			android:layout_weight="1.0"/>
-
-		<Button
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Dial"
-			android:id="@+id/btn_dial"/>
-
-	</LinearLayout>
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/contacts_recycler_view"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"/>
+    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">
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Text"
+        android:id="@+id/page_text"/>
+    
 </LinearLayout>
-

contacts/src/main/res/layout/item_call_log.xml

@@ -1,78 +0,0 @@
-<?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="wrap_content">
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<TextView
-			android:id="@+id/phone_number"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:textSize="18sp"
-			android:textStyle="bold"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<TextView
-			android:id="@+id/call_status"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textSize="14sp"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<TextView
-			android:id="@+id/call_date"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textSize="14sp"/>
-
-	</LinearLayout>
-
-	<RelativeLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:padding="10dp">
-
-		<View
-			android:layout_width="20dp"
-			android:layout_height="20dp"
-			android:background="#FFE7E7E7"
-			android:id="@+id/itemcalllogView1"
-			android:layout_alignParentLeft="true"/>
-
-		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
-			android:layout_toRightOf="@id/itemcalllogView1"
-			android:layout_toLeftOf="@id/itemcalllogView2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:id="@+id/aohpctcseekbar_dial"/>
-
-		<View
-			android:layout_width="20dp"
-			android:layout_height="20dp"
-			android:background="#FFE7E7E7"
-			android:id="@+id/itemcalllogView2"
-			android:layout_alignParentRight="true"/>
-
-	</RelativeLayout>
-
-</LinearLayout>
-

contacts/src/main/res/layout/item_contact.xml

@@ -1,67 +0,0 @@
-<?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:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical">
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<TextView
-			android:id="@+id/contact_number"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textSize="18sp"
-			android:textStyle="bold"/>
-
-		<TextView
-			android:id="@+id/contact_number"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textSize="18sp"
-			android:text="☎"
-			android:textStyle="bold"/>
-
-		<TextView
-			android:id="@+id/contact_name"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textSize="18sp"
-			android:textStyle="bold"/>
-
-	</LinearLayout>
-
-	<RelativeLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:padding="10dp">
-
-		<View
-			android:layout_width="20dp"
-			android:layout_height="20dp"
-			android:background="#FFE7E7E7"
-			android:id="@+id/itemcalllogView1"
-			android:layout_alignParentLeft="true"/>
-
-		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
-			android:layout_toRightOf="@id/itemcalllogView1"
-			android:layout_toLeftOf="@id/itemcalllogView2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:id="@+id/aohpctcseekbar_dial"/>
-
-		<View
-			android:layout_width="20dp"
-			android:layout_height="20dp"
-			android:background="#FFE7E7E7"
-			android:id="@+id/itemcalllogView2"
-			android:layout_alignParentRight="true"/>
-
-	</RelativeLayout>
-
-</LinearLayout>
-

contacts/src/main/res/layout/view_left_scroll.xml

@@ -1,52 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <!-- 内容区域 -->
-    <LinearLayout
-        android:id="@+id/content_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:background="@color/white">
-        <!-- 这里放置你的列表项内容 -->
-    </LinearLayout>
-
-    <!-- 操作按钮 -->
-    <LinearLayout
-        android:id="@+id/action_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@color/lightgray">
-
-        <Button
-            android:id="@+id/edit_btn"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:text="编辑"
-            android:background="@color/blue" />
-        <Button
-            android:id="@+id/up_btn"
-            android:layout_width="40dp"
-            android:layout_height="wrap_content"
-            android:text="△"
-            android:background="@color/green" />
-        <Button
-            android:id="@+id/down_btn"
-            android:layout_width="40dp"
-            android:layout_height="wrap_content"
-            android:text="▽"
-            android:background="@color/green" />
-        <Button
-            android:id="@+id/delete_btn"
-            android:layout_width="80dp"
-            android:layout_height="wrap_content"
-            android:text="删除"
-            android:background="@color/red" />
-    </LinearLayout>
-</LinearLayout>

contacts/src/main/res/layout/view_phone_connect_rule.xml

@@ -1,44 +0,0 @@
-<?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="wrap_content"
-	android:padding="16dp">
-
-	<EditText
-		android:id="@+id/edit_text"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:hint="请输入规则文本"/>
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:gravity="right|center_vertical">
-
-		<CheckBox
-			android:id="@+id/checkbox_allow"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="允许连接"/>
-
-        <CheckBox
-            android:id="@+id/checkbox_enable"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="启用"/>
-
-        <Button
-            android:id="@+id/button_confirm"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="确定"/>
-        
-	</LinearLayout>
-
-
-</LinearLayout>
-

contacts/src/main/res/layout/view_phone_connect_rule_simple.xml

@@ -1,16 +0,0 @@
-<?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:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="horizontal"
-	android:padding="2dp">
-
-	<cc.winboll.studio.contacts.views.LeftScrollView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/scrollView"/>
-
-</LinearLayout>
-

contacts/src/main/res/layout/view_phone_connect_rule_simple2.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<HorizontalScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none"
-    android:id="@+id/scrollView">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <!-- 内容区域 -->
-        <LinearLayout
-            android:id="@+id/content_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:background="@color/white">
-            <!-- 这里放置你的列表项内容 -->
-
-            <TextView
-                android:id="@+id/text_view"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textSize="16sp"/>
-        </LinearLayout>
-
-        <!-- 操作按钮 -->
-        <LinearLayout
-            android:id="@+id/action_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:background="@color/lightgray">
-
-            <Button
-                android:id="@+id/edit_btn"
-                android:layout_width="80dp"
-                android:layout_height="match_parent"
-                android:text="编辑"
-                android:background="@color/blue" />
-
-            <Button
-                android:id="@+id/delete_btn"
-                android:layout_width="80dp"
-                android:layout_height="match_parent"
-                android:text="删除"
-                android:background="@color/red" />
-        </LinearLayout>
-    </LinearLayout>
-</HorizontalScrollView>

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

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/item_call"
+        android:title="CallActivity"/>
+
     <item
         android:id="@+id/item_settings"
-        android:title="Settings"
-        app:showAsAction="ifRoom"/>
+        android:title="SettingsActivity"/>
 </menu>

contacts/src/main/res/values/colors.xml

@@ -4,10 +4,4 @@
     <color name="colorPrimary">#FF196ABC</color>
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>
-    <color name="blue">#FF379AFF</color>
-    <color name="green">#FF69E551</color>
-    <color name="red">#FFE55151</color>
-    <color name="white">#FFFFFFFF</color>
-    <color name="lightgray">#FFE0E0E0</color>
-    
 </resources>

libaes/build.gradle

@@ -4,14 +4,12 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
-    namespace 'cc.winboll.studio.libaes'
-    
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 29
     }
     buildTypes {
         release {
@@ -19,30 +17,40 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-    //api 'cc.winboll.studio:winboll-shared:1.6.5'
-    
-    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/baoyongzhang/android-PullRefreshLayout
-    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    
-    api 'cc.winboll.studio:libapputils:9.2.1'
-    api 'cc.winboll.studio:libappbase:1.0.3'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // 吐司类库
+    api 'com.github.getActivity:ToastUtils:10.5'
+    
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    api 'com.github.getActivity:XXPermissions:18.63'
+    // 下拉控件
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    // 拼音搜索
+    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
+    api 'com.github.open-android:pinyin4j:2.5.0'
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+    // 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    // 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 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jan 19 04:58:59 GMT 2025
-stageCount=3
+#Wed Apr 02 20:08:50 HKT 2025
+stageCount=6
 libraryProject=libaes
-baseVersion=7.6
-publishVersion=7.6.2
-buildCount=4
-baseBetaVersion=7.6.3
+baseVersion=15.2
+publishVersion=15.2.5
+buildCount=0
+baseBetaVersion=15.2.6

libaes/src/main/AndroidManifest.xml

@@ -5,16 +5,27 @@
 
     <application>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity"/>
+        <activity android:name="cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity"
+            android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.activitys.AboutActivity"/>
+        <activity android:name="cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity"
+            android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity"/>
+        <activity android:name="cc.winboll.studio.libaes.unittests.TestAToolbarActivity"
+            android:exported="true"/>
+
+        <activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"
+            android:exported="true"/>
+
+        <service android:name="cc.winboll.studio.libaes.winboll.WinBollClientService"
+            android:exported="true"/>
+
+        <service android:name="cc.winboll.studio.libaes.winboll.AssistantService"
+            android:exported="true"/>
+
+        <service android:name="cc.winboll.studio.libaes.winboll.WinBollMail"
+            android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestAToolbarActivity"/>
-            
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"/>
-        
     </application>
 
 </manifest>

libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java

@@ -27,18 +27,20 @@ import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
-import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
 
-public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener {
 
     public static final String TAG = "DrawerFragmentActivity";
 
     static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
     static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";
 
-    protected Context mContext;
+    //protected Context mContext;
     ActivityType mActivityType;
     ActionBarDrawerToggle mActionBarDrawerToggle;
     DrawerLayout mDrawerLayout;
@@ -58,7 +60,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        mContext = this;
+        //mContext = this;
         mThemeType = getThemeType();
         setThemeStyle();
         super.onCreate(savedInstanceState);
@@ -72,7 +74,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.onDestroy();
     }
 
-    @Override
+    /*@Override
     public Intent getIntent() {
         // TODO: Implement this method
         return super.getIntent();
@@ -80,7 +82,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     public Context getContext() {
         return this.mContext;
-    }
+    }*/
 
     @Override
     public MenuInflater getMenuInflater() {
@@ -88,20 +90,20 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         return super.getMenuInflater();
     }
 
-    public void setSubtitle(CharSequence context) {
+    /*public void setSubtitle(CharSequence context) {
         // TODO: Implement this method
         getSupportActionBar().setSubtitle(context);
-    }
+    }*/
 
     @Override
     public void recreate() {
         super.recreate();
     }
 
-    @Override
+    /*@Override
     public boolean moveTaskToBack(boolean nonRoot) {
         return super.moveTaskToBack(nonRoot);
-    }
+    }*/
 
     @Override
     public void startActivity(Intent intent) {
@@ -113,7 +115,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         super.startActivityForResult(intent, requestCode, options);
     }
 
-    @Override
+    /*@Override
     public FragmentManager getSupportFragmentManager() {
         return super.getSupportFragmentManager();
     }
@@ -131,7 +133,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     public void setTitle(int resId) {
         // TODO: Implement this method
         getSupportActionBar().setTitle(resId);
-    }
+    }*/
 
     @Override
     public SharedPreferences getSharedPreferences(String name, int mode) {
@@ -151,7 +153,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
 
     void setThemeStyle() {
         //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(this));
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     boolean checkThemeStyleChange() {
@@ -163,7 +165,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
          SHAREDPREFERENCES_NAME, MODE_PRIVATE);
          return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
          */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(this));
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     @Override
@@ -174,6 +176,8 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
             for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
                 getString(i);
             }
+        } else if (R.id.item_log == item.getItemId()) {
+            GlobalApplication.getWinBollActivityManager().startLogActivity(this);
         } else if (R.id.item_about == item.getItemId()) {
             LogUtils.d(TAG, "onAbout");
         } else if (android.R.id.home == item.getItemId()) {

libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java

@@ -8,7 +8,7 @@ package cc.winboll.studio.libaes.beans;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libapputils.bean.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 public class AESThemeBean extends BaseBean {
@@ -16,7 +16,7 @@ public class AESThemeBean extends BaseBean {
     public static final String TAG = "AESThemeBean";
 
     public enum ThemeType {
-        DEFAULT("默认主题"),
+        AES("默认主题"),
         DEPTH("深奥主题"),
         SKY("天空主题"),
         GOLDEN("辉煌主题"),
@@ -42,7 +42,7 @@ public class AESThemeBean extends BaseBean {
     }
     
     // 保存当前主题
-    int currentThemeStyleID = getThemeStyleID(ThemeType.DEFAULT);
+    int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
     
     public AESThemeBean() {
     }
@@ -99,7 +99,7 @@ public class AESThemeBean extends BaseBean {
     }
 
     public static int getThemeStyleID(ThemeType themeType) {
-        int themeStyleID = R.style.DefaultAESTheme;
+        int themeStyleID = R.style.AESTheme;
         if (AESThemeBean.ThemeType.DEPTH == themeType) {
             themeStyleID = R.style.DepthAESTheme;
         } else if (AESThemeBean.ThemeType.SKY == themeType) {
@@ -110,15 +110,15 @@ public class AESThemeBean extends BaseBean {
             themeStyleID = R.style.MemorAESTheme;
         } else if (AESThemeBean.ThemeType.TAO == themeType) {
             themeStyleID = R.style.TaoAESTheme;
-        } else if (AESThemeBean.ThemeType.DEFAULT == themeType) {
-            themeStyleID = R.style.DefaultAESTheme;
+        } else if (AESThemeBean.ThemeType.AES == themeType) {
+            themeStyleID = R.style.AESTheme;
         }
         //LogUtils.d(TAG, "themeStyleID " + Integer.toString(themeStyleID));
         return themeStyleID;
     }
 
     public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
-        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.DEFAULT;
+        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES;
         if (R.style.DepthAESTheme == nThemeStyleID) {
             themeStyle = AESThemeBean.ThemeType.DEPTH ;
         } else if (R.style.SkyAESTheme == nThemeStyleID) {
@@ -129,8 +129,8 @@ public class AESThemeBean extends BaseBean {
             themeStyle = AESThemeBean.ThemeType.MEMOR ;
         } else if (R.style.TaoAESTheme == nThemeStyleID) {
             themeStyle = AESThemeBean.ThemeType.TAO ;
-        } else if (R.style.DefaultAESTheme == nThemeStyleID) {
-            themeStyle = AESThemeBean.ThemeType.DEFAULT;
+        } else if (R.style.AESTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.AES;
         }
         //LogUtils.d(TAG, "themeStyle " + Integer.toString(themeStyle.ordinal()));
         return themeStyle;

libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java

@@ -5,7 +5,7 @@ import android.content.DialogInterface;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
-import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.text.Collator;

libaes/src/main/java/cc/winboll/studio/libaes/unittests/LibraryActivity.java

@@ -1,170 +0,0 @@
-package cc.winboll.studio.libaes.unittests;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/06/14 03:43:23
- * @Describe AES类库主窗口
- */
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Toast;
-import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.beans.DrawerMenuBean;
-import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
-import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
-import cc.winboll.studio.libapputils.log.LogUtils;
-import com.a4455jkjh.colorpicker.ColorPickerDialog;
-import java.util.ArrayList;
-
-public class LibraryActivity extends DrawerFragmentActivity {
-
-    public static final String TAG = "LibraryActivity";
-
-    TestAButtonFragment mTestAButtonFragment;
-    TestViewPageFragment mTestViewPageFragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (mTestAButtonFragment == null) {
-            mTestAButtonFragment = new TestAButtonFragment();
-            addFragment(mTestAButtonFragment);
-        }
-        showFragment(mTestAButtonFragment);
-        setSubtitle(TAG);
-    }
-
-    @Override
-    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.initDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "initDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.reinitDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "reinitDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public DrawerFragmentActivity.ActivityType initActivityType() {
-        return DrawerFragmentActivity.ActivityType.Main;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_library, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        super.onItemClick(parent, view, position, id);
-        switch (position) {
-            case 0 : {
-                    if (mTestAButtonFragment == null) {
-                        mTestAButtonFragment = new TestAButtonFragment();
-                        addFragment(mTestAButtonFragment);
-                    }
-                    showFragment(mTestAButtonFragment);
-                    break;
-                }
-            case 1 : {
-                    if (mTestViewPageFragment == null) {
-                        mTestViewPageFragment = new TestViewPageFragment();
-                        addFragment(mTestViewPageFragment);
-                    }
-                    showFragment(mTestViewPageFragment);
-                    break;
-                }
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int nItemId = item.getItemId();
-//        if (item.getItemId() == R.id.item_log) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
-//        } else 
-        if (nItemId == R.id.item_atoast) {
-            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
-        } else if (nItemId == R.id.item_atoolbar) {
-            Intent intent = new Intent(this, TestAToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_asupporttoolbar) {
-            Intent intent = new Intent(this, TestASupportToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_colordialog) {
-            ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary));
-            dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
-
-                    @Override
-                    public void beforeColorChanged() {
-                    }
-
-                    @Override
-                    public void onColorChanged(int color) {
-
-                    }
-
-                    @Override
-                    public void afterColorChanged() {
-                    }
-
-
-                });
-            dlg.show();
-
-        } else if (nItemId ==  R.id.item_dialogstoragepath) {
-            final StoragePathDialog dialog = new StoragePathDialog(this, 0);
-            dialog.setOnOKClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        dialog.dismiss();
-                    }
-                });
-            dialog.show();
-
-        } else if (nItemId ==  R.id.item_localfileselectdialog) {
-            final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this);
-            dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() {
-                    @Override
-                    public void onOKClick(String sz) {
-                        Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
-                        //dialog.dismiss();
-                    }
-                });
-            dialog.open();
-
-        } else if (nItemId ==  R.id.item_secondarylibraryactivity) {
-            Intent intent = new Intent(this, SecondaryLibraryActivity.class);
-            startActivity(intent);
-        } else if (nItemId ==  R.id.item_drawerfragmentactivity) {
-            Intent intent = new Intent(this, TestDrawerFragmentActivity.class);
-            startActivity(intent);
-        } 
-//        else if (nItemId ==  R.id.item_about) {
-//            Intent intent = new Intent(this, AboutActivity.class);
-//            startActivity(intent);
-//        }
-
-        return super.onOptionsItemSelected(item);
-    }
-}

libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java

@@ -1,23 +1,35 @@
 package cc.winboll.studio.libaes.unittests;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2024/06/15 00:58:10
  * @Describe 第二级窗口
  */
-public class SecondaryLibraryActivity extends DrawerFragmentActivity {
+public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBollActivity {
 
     public static final String TAG = "SecondaryLibraryActivity";
 
     SecondaryLibraryFragment mSecondaryLibraryFragment;
 
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return null;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -43,7 +55,7 @@ public class SecondaryLibraryActivity extends DrawerFragmentActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int nItemId = item.getItemId();
         if (nItemId == R.id.item_test) {
-            Toast.makeText(getApplication(), "item_test", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(), "item_test", Toast.LENGTH_SHORT).show();
         }
         return super.onOptionsItemSelected(item);
     }

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java

@@ -9,11 +9,11 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.views.AButton;
-import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import com.hjq.toast.ToastUtils;
 
 public class TestAButtonFragment extends Fragment {
 
@@ -28,7 +28,7 @@ public class TestAButtonFragment extends Fragment {
                 @Override
                 public void onClick(View view) {
                     LogUtils.d(TAG, "onClick");
-                    Toast.makeText(getActivity(), "AButton", Toast.LENGTH_SHORT).show();
+                    ToastUtils.show("AButton");
                 }
 
             });

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java

@@ -5,19 +5,27 @@ package cc.winboll.studio.libaes.unittests;
  * @Date 2024/07/16 01:14:00
  * @Describe TestASupportToolbarActivity
  */
-import android.content.Context;
-import android.content.SharedPreferences;
+import android.app.Activity;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 
-public class TestASupportToolbarActivity extends AppCompatActivity {
+public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBollActivity  {
 
     public static final String TAG = "TestASupportToolbarActivity";
 
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java

@@ -10,11 +10,22 @@ import android.os.Bundle;
 import android.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 
-public class TestAToolbarActivity extends Activity {
+public class TestAToolbarActivity extends Activity implements IWinBollActivity {
 
     public static final String TAG = "TestAToolbarActivity";
     
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         AESThemeUtil.applyAppTheme(this);

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java

@@ -4,26 +4,40 @@ package cc.winboll.studio.libaes.unittests;
  * @Author ZhanGSKen@QQ.COM
  * @Date 2024/06/30 15:00:51
  */
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.Toast;
+import android.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.beans.DrawerMenuBean;
-import cc.winboll.studio.libapputils.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
 import java.util.ArrayList;
 
-public class TestDrawerFragmentActivity extends DrawerFragmentActivity {
+public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return null;
+    }
 
     public static final String TAG = "TestDrawerFragmentActivity";
 
     TestFragment1 mTestFragment1;
     TestFragment2 mTestFragment2;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -66,7 +80,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity {
         super.onItemClick(parent, view, position, id);
         switch (position) {
             case 0 : {
-                    Toast.makeText(getContext(), "0", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplicationContext(), "0", Toast.LENGTH_SHORT).show();
                     //LogUtils.d(TAG, "MenuItem 1");
                     showFragment(mTestFragment1);
                     break;

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java

@@ -5,6 +5,7 @@ package cc.winboll.studio.libaes.unittests;
  * @Date 2024/07/16 01:35:56
  * @Describe TestViewPageFragment
  */
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,12 +18,17 @@ import androidx.viewpager.widget.ViewPager;
 import cc.winboll.studio.libaes.ImagePagerAdapter;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
+import cc.winboll.studio.libappbase.LogView;
+import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 import java.util.List;
 
 public class TestViewPageFragment extends Fragment implements ViewPager.OnPageChangeListener, View.OnClickListener {
 
     public static final String TAG = "TestViewPageFragment";
+    
+    Context mContext;
+    LogView mLogView;
 
     private ViewPager viewPager;
     private List<View> views; //用来存放放进ViewPager里面的布局
@@ -36,6 +42,10 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mView = inflater.inflate(R.layout.fragment_viewpage, container, false);
+        mContext = getActivity();
+        
+        mLogView = mView.findViewById(R.id.logview);
+        mLogView.start();
 
         //viewPager = findViewById(R.id.activitymainViewPager1);
         initData();
@@ -60,12 +70,13 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
         initPoint();//初始化页面下方的点
         viewPager.setOnPageChangeListener(this);
         initAOHPCTCSeekBar();
+        initAOHPCTCSeekBar2();
     }
 
     //初始化所要显示的布局
     void initData() {
         ViewPager viewPager = mView.findViewById(R.id.fragmentviewpageViewPager1);
-        LayoutInflater inflater = LayoutInflater.from(getActivity());
+        LayoutInflater inflater = LayoutInflater.from(mContext);
         View view1 = inflater.inflate(R.layout.viewpage_atickprogressbar, viewPager, false);
         View view2 = inflater.inflate(R.layout.viewpage_acard, viewPager, false);
         View view3 = inflater.inflate(R.layout.viewpage_aohpctccard, viewPager, false);
@@ -185,14 +196,31 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
     }
 
     void initAOHPCTCSeekBar() {
-        AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1);
-        seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher));
-        seekbar.setThumbOffset(10);
+        AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1);
+        seekbar.setThumb(mContext.getDrawable(R.drawable.ic_launcher));
+        //seekbar.setThumbOffset(200);
+        //seekbar.setThumbOffset(1);
+        seekbar.setBlurRightDP(50);
         seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
 
                 @Override
                 public void onOHPCommit() {
-                    Toast.makeText(getActivity(), "onOHPCommit ", Toast.LENGTH_SHORT).show();
+                    ToastUtils.show("onOHPCommit");
+                }
+            });
+    }
+    
+    void initAOHPCTCSeekBar2() {
+        AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2);
+        seekbar.setThumb(mContext.getDrawable(R.drawable.ic_call));
+        //seekbar.setThumbOffset(200);
+        //seekbar.setThumbOffset(1);
+        seekbar.setBlurRightDP(50);
+        seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
+
+                @Override
+                public void onOHPCommit() {
+                    ToastUtils.show("onOHPCommit 2");
                 }
             });
     }

libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java

@@ -11,8 +11,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
 
 public class AESThemeUtil {
 
@@ -25,7 +25,7 @@ public class AESThemeUtil {
 
     public static <T extends Context> int getThemeTypeID(T context) {
         AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
-        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT): bean.getCurrentThemeTypeID();
+        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
     }
     
     public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
@@ -41,9 +41,9 @@ public class AESThemeUtil {
         activity.setTheme(getThemeTypeID(activity));
     }
 
-    public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
+    /*public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
         activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
-    }
+    }*/
 
     public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
@@ -53,9 +53,9 @@ public class AESThemeUtil {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
     }
 
-    public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+    /*public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
         activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
-    }
+    }*/
 
     public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
@@ -65,9 +65,9 @@ public class AESThemeUtil {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
     }
 
-    public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
+    /*public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
         activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
-    }
+    }*/
 
     public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) {
         int nThemeStyleID;
@@ -92,7 +92,7 @@ public class AESThemeUtil {
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         }
@@ -123,7 +123,7 @@ public class AESThemeUtil {
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
             saveThemeStyleID(activity, nThemeStyleID);
             return true;
         }
@@ -131,7 +131,7 @@ public class AESThemeUtil {
         return false;
     }
 
-    public static <T extends WinBollActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
+    public static <T extends AppCompatActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
         int nThemeStyleID;
         if (R.id.item_depththeme == item.getItemId()) {
             nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
@@ -154,7 +154,38 @@ public class AESThemeUtil {
             saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
             return true;
         } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        }
+
+        return false;
+    }
+    
+    public static <T extends DrawerFragmentActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
+        int nThemeStyleID;
+        if (R.id.item_depththeme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_skytheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_goldentheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_memortheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_taotheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
+            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
+            return true;
+        } else if (R.id.item_defaulttheme == item.getItemId()) {
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
             saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
             return true;
         }

libaes/src/main/java/cc/winboll/studio/libaes/utils/AppVersionUtils.java

@@ -0,0 +1,162 @@
+package cc.winboll.studio.libaes.utils;
+
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2024/08/12 14:45:35
+ * @Describe 应用版本工具集
+ */
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class AppVersionUtils {
+
+    public static final String TAG = "AppVersionUtils";
+
+    //
+    // 检查新版本是否成立
+    // szCurrentCode : 当前版本应用包名
+    // szNextCode : 新版本应用包名
+    // 返回 ：情况1：当前版本是发布版
+    //       返回 true (新版本 > 当前版本)
+    //       情况1：当前版本是Beta版
+    //       true 新版本 == 当前版本
+    //
+    public static boolean isHasNewVersion2(String szCurrentName, String szNextName) {
+        LogUtils.d(TAG, String.format("isHasNewVersion2\nszCurrentName : %s\nszNextName : %s", szCurrentName, szNextName));
+        //szCurrentName = "AES_6.2.0-beta0_3234.apk";
+        //szNextName = "AES_6.1.12.apk";
+        //szCurrentName = "AES_6.2.0-beta0_3234.apk";
+        //szNextName = "AES_6.2.0.apk";
+        //szCurrentName = "AES_6.2.0-beta0_3234.apk";
+        //szNextName = "AES_6.2.2.apk";
+        //szCurrentName = "AES_6.2.0-beta0_3234.apk";
+        //szNextName = "AES_6.2.0.apk";
+        //szCurrentName = "AES_6.1.0.apk";
+        //szNextName = "AES_6.2.0.apk";
+        //LogUtils.d(TAG, "szCurrentName : " + szCurrentName);
+        //LogUtils.d(TAG, "szNextName : " + szNextName);
+
+        //boolean isVersionNewer = false;
+        //if(szCurrentName.equals(szNextName)) {
+        //    isVersionNewer = false;
+        //} else {
+        //ToastUtils.show("szCurrent : " + szCurrent + "\nszNext : " + szNext);
+        //int nApk = szNextName.lastIndexOf(".apk");
+        //ToastUtils.show("nApk : " + Integer.toString(nApk));
+        //String szNextNoApkName = szNextName.substring(0, nApk);
+        //ToastUtils.show("szNextNoApkName : " + szNextNoApkName);
+        //String szCurrentNoApkName = szCurrentName.substring(0, szNextNoApkName.length());
+        //ToastUtils.show("szCurrentNoApkName : " + szCurrentNoApkName);
+        //String str1 = "3.4.50";
+        //String str2 = "3.3.60";
+        //String str1 = getCodeInPackageName(szCurrentName);
+        //String str2 = getCodeInPackageName(szNextName);
+        //String str1 = getCodeInPackageName(szNextName);
+        //String str2 = getCodeInPackageName(szCurrentName);
+        //Boolean isVersionNewer2 = checkNewVersion(str1,str2);
+        //ToastUtils.show("isVersionNewer2 : " + Boolean.toString(isVersionNewer2));
+        //ToastUtils.show(checkNewVersion(getCodeInPackageName(szCurrentName), getCodeInPackageName(szNextName)));
+        //return checkNewVersion(getCodeInPackageName(szCurrentName), getCodeInPackageName(szNextName));
+        //}
+        //return isVersionNewer;
+        if (checkNewVersion(getCodeInPackageName(szCurrentName), getCodeInPackageName(szNextName))) {
+            // 比 AES_6.2.0.apk 版本大，如 AES_6.2.1.apk。
+            // 比 AES_6.2.0-beta0_3234.apk 大，如 AES_6.2.1.apk。
+            //LogUtils.d(TAG, "App newer stage version is released. Release name : " + szNextName);
+            return true;
+        } 
+        if (szCurrentName.matches(".*_\\d+\\.\\d+\\.\\d+-beta.*\\.apk")) {
+            String szCurrentReleasePackageName = getReleasePackageName(szCurrentName);
+            //LogUtils.d(TAG, "szCurrentReleasePackageName : " + szCurrentReleasePackageName);
+            if (szCurrentReleasePackageName.equals(szNextName)) {
+                // 与 AES_6.2.0-beta0_3234.apk 版本相同，如 AES_6.2.0.apk。
+                //LogUtils.d(TAG, "App stage version is released. Release name : " + szNextName);
+                return true;
+            }
+        }
+        //LogUtils.d(TAG, "App version is the newest. ");
+        return false;
+    }
+
+    public static boolean isHasNewStageReleaseVersion(String szCurrentName, String szNextName) {
+        LogUtils.d(TAG, String.format("isHasNewStageReleaseVersion\nszCurrentName : %s\nszNextName : %s", szCurrentName, szNextName));
+        //szCurrentName = "AES_6.2.12.apk";
+        //szNextName = "AES_6.3.12.apk";
+        if (checkNewVersion(getCodeInPackageName(szCurrentName), getCodeInPackageName(szNextName))) {
+            // 比 AES_6.2.0.apk 版本大，如 AES_6.2.1.apk。
+            //LogUtils.d(TAG, "App newer stage version is released. Release name : " + szNextName);
+            return true;
+        }
+        return false;
+    }
+
+    //
+    // 检查新版本是否成立
+    // szCurrentCode : 当前版本
+    // szNextCode : 新版本
+    // 返回 ：true 新版本 > 当前版本
+    //
+    public static Boolean checkNewVersion(String szCurrentCode, String szNextCode) {
+        if (szCurrentCode == null || szCurrentCode.equals("") || szNextCode == null || szNextCode.equals("")) {
+            LogUtils.d(TAG, String.format("checkNewVersion unexpected parameters:\nszCurrentCode : %s\nszNextCode : %s", szCurrentCode, szNextCode));
+            return false;
+        }
+        boolean isNew = false;
+        String[] appVersionCurrent = szCurrentCode.split("\\.");
+        String[] appVersionNext = szNextCode.split("\\.");
+        //根据位数最短的判断
+        int lim = appVersionCurrent.length > appVersionNext.length ? appVersionNext.length : appVersionCurrent.length;
+        //根据位数循环判断各个版本
+        for (int i = 0; i < lim; i++) {
+            if (Integer.parseInt(appVersionNext[i]) > Integer.parseInt(appVersionCurrent[i])) {
+                isNew = true;
+                return isNew;
+            } else if (Integer.parseInt(appVersionNext[i]) == Integer.parseInt(appVersionCurrent[i])) {
+                continue ;
+            } else {
+                isNew = false;
+                return isNew;
+            }
+        }
+        return isNew;
+    }
+
+    //
+    // 截取应用包名称版本号信息
+    // 如 ：AppUtils_7.0.4-beta1_0120.apk 版本号为 7.0.4
+    // 如 ：AppUtils_7.0.4.apk 版本号为 7.0.4
+    //
+    public static String getCodeInPackageName(String apkName) {
+        LogUtils.d(TAG, String.format("getCodeInPackageName apkName : %s", apkName));
+        //String apkName = "AppUtils_7.0.0.apk";
+        Pattern pattern = Pattern.compile("\\d+\\.\\d+\\.\\d+");
+        Matcher matcher = pattern.matcher(apkName);
+        if (matcher.find()) {
+            String version = matcher.group();
+            LogUtils.d(TAG, String.format("version is %s", version));
+            return version;
+            //System.out.println("Version number: " + version); // 输出：7.0.0
+        }
+        LogUtils.d(TAG, String.format("No result."));
+        return "";
+    }
+
+    //
+    // 根据Beta版名称生成发布版应用包名称
+    // 如 AppUtils_7.0.4-beta1_0120.apk
+    // 发布版名称就为AppUtils_7.0.4.apk
+    //
+    public static String getReleasePackageName(String szBetaPackageName) {
+        //String szBetaPackageName = "AppUtils_7.0.4-beta1_0120.apk";
+        Pattern pattern = Pattern.compile(".*\\d+\\.\\d+\\.\\d+");
+        Matcher matcher = pattern.matcher(szBetaPackageName);
+        if (matcher.find()) {
+            String szReleasePackageName = matcher.group();
+            return szReleasePackageName + ".apk";
+            //System.out.println("Version number: " + version); // 输出：7.0.0
+        }
+        return "";
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java

@@ -6,24 +6,30 @@ package cc.winboll.studio.libaes.views;
  * @Describe AOneHundredPercantClickToCommitSeekBar
  */
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.SeekBar;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class AOHPCTCSeekBar extends SeekBar {
 
     public static final String TAG = "AOHPCTCSeekBar";
 
-    // 可开始拉动的起始位置(百分比值)
-    static final int ENABLE_POST_PERCENT_X = 20;
-    // 最小拉动值，滑块拉动值要超过这个值，确定事件才会提交。
-    static final int TO_MIN_VALUE = 15;
+    volatile int thumbWidth = 1;
+    volatile int progressBarWidth = 1;
+    // 设置按钮模糊右边边缘像素
+    volatile int blurRightDP = 1;
+    // 是否从起点拉动的标志
+    volatile boolean isStartSeek = false;
+
     // 外部接口对象，确定事件提交会调用该对象的方法
     OnOHPCListener mOnOHPCListener;
-    // 是否从起点拉动的标志
-    boolean mIsStartTo = false;
-    // 拉动的滑动值
-    int mnTo = 0;
+
+
+    public void setBlurRightDP(int blurRight) {
+        this.blurRightDP = blurRight;
+    }
 
     public void setOnOHPCListener(OnOHPCListener listener) {
         mOnOHPCListener = listener;
@@ -35,83 +41,68 @@ public class AOHPCTCSeekBar extends SeekBar {
 
     public AOHPCTCSeekBar(Context context) {
         super(context);
+        initView(context);
     }
 
     public AOHPCTCSeekBar(Context context, AttributeSet attrs) {
         super(context, attrs);
-
-        //LogUtils.d(TAG, "AOHPCTCSeekBar(...)");
-
-        // 获得TypedArray
-        //TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AToolbar);
-        // 获得attrs.xml里面的属性值,格式为:名称_属性名,后面是默认值
-        //int colorBackgroud = a.getColor(R.styleable.ACard_backgroudColor, context.getColor(R.color.colorACardBackgroung));
-        //int centerColor = a.getColor(R.styleable.AToolbar_centerColor, context.getColor(R.color.colorAToolbarCenterColor));
-        //int endColor = a.getColor(R.styleable.AToolbar_endColor, context.getColor(R.color.colorAToolbarEndColor));
-        //float tSize = a.getDimension(R.styleable.CustomView_tSize, 35);
-        //p.setColor(tColor);
-        //p.setTextSize(tSize);
-        //Drawable drawable = context.getDrawable(R.drawable.frame_atoolbar);
-
-        //setBackground(context.getDrawable(R.drawable.acard_frame_main));
-
-        // 返回一个绑定资源结束的信号给资源
-        //a.recycle();
+        initView(context);
     }
 
     public AOHPCTCSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        initView(context);
     }
 
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
+    void initView(Context context) {
     }
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            //LogUtils.d(TAG, "ACTION_DOWN");
-            // 有效的拖动起始位置(ENABLE_POST_PERCENT_X)%
-            int nEnablePostX = ((getRight() - getLeft()) * ENABLE_POST_PERCENT_X / 100) + getLeft();
-
-            if ((getLeft() < event.getX())
-                && (event.getX() < nEnablePostX)) {
-                //LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX()));
-                mIsStartTo = true;
-                return super.dispatchTouchEvent(event);
-            }
-            if (!mIsStartTo) {
-                resetView();
-                return false;
+            if (thumbWidth + blurRightDP > event.getX() && event.getX() > 0) {
+                getParent().requestDisallowInterceptTouchEvent(true);
+                isStartSeek = true;
             }
         } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-            //LogUtils.d(TAG, "ACTION_MOVE");
-            if (mIsStartTo) {
-                mnTo++;
+            if (isStartSeek) {
+                super.dispatchTouchEvent(event);
             }
-        } else if (event.getAction() == MotionEvent.ACTION_UP) {
-            //LogUtils.d(TAG, Integer.toString(getProgress()));
-            // 提交100%确定事件
-            if ((getProgress() == 100) && (mnTo > TO_MIN_VALUE)) {
-                //LogUtils.d(TAG, "Commit mnTo is " + Integer.toString(mnTo));
+        } else if (event.getAction() == MotionEvent.ACTION_UP 
+                   || event.getAction() == MotionEvent.ACTION_CANCEL) {
+            getParent().requestDisallowInterceptTouchEvent(false);
+            if (getProgress() == progressBarWidth) {
                 mOnOHPCListener.onOHPCommit();
-                //resetView();
-                //return true;
             }
-            resetView();
-            return false;
+            // 重置控件状态
+            setProgress(0);
+            isStartSeek = false;
         }
-        //LogUtils.d(TAG, "dispatchTouchEvent End");
-        return super.dispatchTouchEvent(event);
+        return true;
     }
 
-    // 重置控件状态
-    //
-    void resetView() {
-        setProgress(0);
-        mnTo = 0;
-        mIsStartTo = false;
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int width = MeasureSpec.getSize(widthMeasureSpec);
+        //int height = MeasureSpec.getSize(heightMeasureSpec);
+        //LogUtils.d(TAG, String.format("width %d height %d", width, height));
+
+        // 获取SeekBar的图标宽度
+        Drawable thumbDrawable = getThumb();
+        if (thumbDrawable != null) {
+            // 获取图标宽度
+            thumbWidth = thumbDrawable.getIntrinsicWidth();
+        }
+
+        // 获取进度条宽度
+        progressBarWidth = width;
+
+        //LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth));
+
+        // 设置图标位置
+        setThumbOffset(0);
+        // 设置进度条刻度
+        setMax(progressBarWidth);
     }
 }

libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java

@@ -0,0 +1,143 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/01/20 14:19:02
+ * @Describe 应用信息类
+ */
+import cc.winboll.studio.libaes.R;
+import java.io.Serializable;
+
+public class APPInfo implements Serializable {
+
+    public static final String TAG = "APPInfo";
+
+    // 应用名称
+    String appName;
+    // 应用图标
+    int appIcon;
+    // 应用描述
+    String appDescription;
+    // 应用Git仓库地址
+    String appGitName;
+    // 应用Git仓库拥有者
+    String appGitOwner;
+    // 应用Git仓库分支
+    String appGitAPPBranch;
+    // 应用Git仓库子项目文件夹
+    String appGitAPPSubProjectFolder;
+    // 应用主页
+    String appHomePage;
+    // 应用包名称
+    String appAPKName;
+    // 应用包存储文件夹名称
+    String appAPKFolderName;
+
+    public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appGitOwner, String appGitAPPBranch, String appGitAPPSubProjectFolder, String appHomePage, String appAPKName, String appAPKFolderName) {
+        this.appName = appName;
+        this.appIcon = appIcon;
+        this.appDescription = appDescription;
+        this.appGitName = appGitName;
+        this.appGitOwner = appGitOwner;
+        this.appGitAPPBranch = appGitAPPBranch;
+        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
+        this.appHomePage = appHomePage;
+        this.appAPKName = appAPKName;
+        this.appAPKFolderName = appAPKFolderName;
+    }
+
+    public APPInfo() {
+        String szBranchName = "app";
+        this.appName = "APP";
+        this.appIcon = R.drawable.ic_launcher;
+        this.appDescription = "APP Description";
+        this.appGitName = "APP";
+        this.appGitOwner = "Studio";
+        this.appGitAPPBranch = szBranchName;
+        this.appGitAPPSubProjectFolder = szBranchName;
+        this.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP";
+        this.appAPKName = "APP";
+        this.appAPKFolderName = "APP";
+    }
+
+    public void setAppGitOwner(String appGitOwner) {
+        this.appGitOwner = appGitOwner;
+    }
+
+    public String getAppGitOwner() {
+        return appGitOwner;
+    }
+
+    public void setAppGitAPPBranch(String appGitAPPBranch) {
+        this.appGitAPPBranch = appGitAPPBranch;
+    }
+
+    public String getAppGitAPPBranch() {
+        return appGitAPPBranch;
+    }
+
+    public void setAppGitAPPSubProjectFolder(String appGitAPPSubProjectFolder) {
+        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
+    }
+
+    public String getAppGitAPPSubProjectFolder() {
+        return appGitAPPSubProjectFolder;
+    }
+
+    public void setAppIcon(int appIcon) {
+        this.appIcon = appIcon;
+    }
+
+    public int getAppIcon() {
+        return appIcon;
+    }
+
+    public void setAppDescription(String appDescription) {
+        this.appDescription = appDescription;
+    }
+
+    public String getAppDescription() {
+        return appDescription;
+    }
+
+    public void setAppAPKFolderName(String appAPKFolderName) {
+        this.appAPKFolderName = appAPKFolderName;
+    }
+
+    public String getAppAPKFolderName() {
+        return appAPKFolderName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppGitName(String appGitName) {
+        this.appGitName = appGitName;
+    }
+
+    public String getAppGitName() {
+        return appGitName;
+    }
+
+    public void setAppHomePage(String appHomePage) {
+        this.appHomePage = appHomePage;
+    }
+
+    public String getAppHomePage() {
+        return appHomePage;
+    }
+
+    public void setAppAPKName(String appAPKName) {
+        this.appAPKName = appAPKName;
+    }
+
+    public String getAppAPKName() {
+        return appAPKName;
+    }
+}
+

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java

@@ -0,0 +1,397 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 15:08:52
+ * @Describe WinBoll应用介绍视图
+ */
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
+import android.net.Uri;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.utils.AppVersionUtils;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libapputils.utils.PrefUtils;
+import com.hjq.toast.ToastUtils;
+import java.io.IOException;
+import mehdi.sakout.aboutpage.AboutPage;
+import mehdi.sakout.aboutpage.Element;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Credentials;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class AboutView extends LinearLayout {
+
+    public static final String TAG = "AboutView";
+
+    public static final int MSG_APPUPDATE_CHECKED = 0;
+
+    Context mContext;
+    APPInfo mAPPInfo;
+
+    WinBollServiceStatusView mWinBollServiceStatusView;
+    OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
+    String mszAppName = "";
+    String mszAppAPKFolderName = "";
+    String mszAppAPKName = "";
+    String mszAppGitName = "";
+    String mszAppVersionName = "";
+    String mszCurrentAppPackageName = "";
+    volatile String mszNewestAppPackageName = "";
+    String mszAppDescription = "";
+    String mszHomePage = "";
+    String mszGitea = "";
+    int mnAppIcon = 0;
+    String mszWinBollServerHost;
+    String mszReleaseAPKName;
+    EditText metDevUserName;
+    EditText metDevUserPassword;
+
+    public AboutView(Context context, APPInfo appInfo) {
+        super(context);
+        mContext = context;
+
+        setAPPInfo(appInfo);
+        initView(context);
+    }
+
+    public AboutView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+
+        initView(context, attrs);
+    }
+
+    public void setAPPInfo(APPInfo appInfo) {
+        mAPPInfo = appInfo;
+    }
+
+    APPInfo createAppInfo(Context context, AttributeSet attrs) {
+        APPInfo appInfo = new APPInfo();
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.AboutView);
+        appInfo.setAppName(typedArray.getString(R.styleable.AboutView_app_name));
+        appInfo.setAppAPKFolderName(typedArray.getString(R.styleable.AboutView_app_apkfoldername));
+        appInfo.setAppAPKName(typedArray.getString(R.styleable.AboutView_app_apkname));
+        appInfo.setAppGitName(typedArray.getString(R.styleable.AboutView_app_gitname));
+        appInfo.setAppGitOwner(typedArray.getString(R.styleable.AboutView_app_gitowner));
+        appInfo.setAppGitAPPBranch(typedArray.getString(R.styleable.AboutView_app_gitappbranch));
+        appInfo.setAppGitAPPSubProjectFolder(typedArray.getString(R.styleable.AboutView_app_gitappsubprojectfolder));
+        appInfo.setAppDescription(typedArray.getString(R.styleable.AboutView_appdescription));
+        appInfo.setAppIcon(typedArray.getResourceId(R.styleable.AboutView_appicon, R.drawable.ic_winboll));
+        // 返回一个绑定资源结束的信号给资源
+        typedArray.recycle();
+        return appInfo;
+    }
+
+    void initView(Context context) {
+        mszAppName = mAPPInfo.getAppName();
+        mszAppAPKFolderName = mAPPInfo.getAppAPKFolderName();
+        mszAppAPKName = mAPPInfo.getAppAPKName();
+        mszAppGitName = mAPPInfo.getAppGitName();
+        mszAppDescription = mAPPInfo.getAppDescription();
+        mnAppIcon = mAPPInfo.getAppIcon();
+
+        mszWinBollServerHost = GlobalApplication.isDebuging() ?  "https://dev.winboll.cc": "https://www.winboll.cc";
+
+        try {
+            mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+        mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
+        mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
+        if (mAPPInfo.getAppGitAPPBranch().equals("")) {
+            mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName;
+        } else {
+            mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
+        }
+
+
+        if (GlobalApplication.isDebuging()) {
+            LayoutInflater inflater = LayoutInflater.from(mContext);
+            View addedView = inflater.inflate(R.layout.view_about_dev, this, false);
+            LinearLayout llMain = addedView.findViewById(R.id.viewaboutdevLinearLayout1);
+            metDevUserName = addedView.findViewById(R.id.viewaboutdevEditText1);
+            metDevUserPassword = addedView.findViewById(R.id.viewaboutdevEditText2);
+            metDevUserName.setText(PrefUtils.getString(mContext, "metDevUserName", ""));
+            metDevUserPassword.setText(PrefUtils.getString(mContext, "metDevUserPassword", ""));
+            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
+            mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBollServiceStatusView1);
+            mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
+            mWinBollServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
+            //llMain.addView(mDevelopHostConnectionStatusView);
+            llMain.addView(createAboutPage());
+            addView(addedView);
+        } else {
+            LayoutInflater inflater = LayoutInflater.from(mContext);
+            View addedView = inflater.inflate(R.layout.view_about_www, this, false);
+            LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1);
+            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
+            mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBollServiceStatusView1);
+            mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
+            mWinBollServiceStatusView.setAuthInfo("", "");
+            //llMain.addView(mDevelopHostConnectionStatusView);
+            llMain.addView(createAboutPage());
+            addView(addedView);
+        }
+
+        // 初始化标题栏
+        //setSubtitle(getContext().getString(R.string.text_about));
+
+//        LinearLayout llMain = findViewById(R.id.viewaboutLinearLayout1);
+//        llMain.addView(createAboutPage());
+
+        // 就读取正式版应用包版本号，设置 Release 应用包文件名
+        String szReleaseAppVersionName = "";
+        try {
+            //LogUtils.d(TAG, String.format("mContext.getPackageName() %s", mContext.getPackageName()));
+            String szSubBetaSuffix = subBetaSuffix(mContext.getPackageName());
+            //LogUtils.d(TAG, String.format("szSubBetaSuffix : %s", szSubBetaSuffix));
+            szReleaseAppVersionName = mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+        mszReleaseAPKName = mszAppAPKName + "_" + szReleaseAppVersionName + ".apk";
+
+    }
+
+    void initView(Context context, AttributeSet attrs) {
+        mAPPInfo = createAppInfo(context, attrs);
+        initView(context);
+    }
+
+    public static String subBetaSuffix(String input) {
+        if (input.endsWith(".beta")) {
+            return input.substring(0, input.length() - ".beta".length());
+        }
+        return input;
+    }
+
+    android.os.Handler mHandler = new android.os.Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what) {
+                case MSG_APPUPDATE_CHECKED : {
+                        /*//检查当前应用包文件名是否是测试版，如果是就忽略检查
+                         if(mszCurrentAppPackageName.matches(".*_\\d+\\.\\d+\\.\\d+-beta.*\\.apk")) {
+                         ToastUtils.show("APP is the beta Version. Version check ignore.");
+                         return;
+                         }*/
+
+//                        if (!AppVersionUtils.isHasNewStageReleaseVersion(mszReleaseAPKName, mszNewestAppPackageName)) {
+//                            ToastUtils.delayedShow("Current app is the newest.", 5000);
+//                        } 
+                        if (!AppVersionUtils.isHasNewVersion2(mszCurrentAppPackageName, mszNewestAppPackageName)) {
+                            ToastUtils.show("Current app is the newest.");
+                        } else {
+                            String szMsg = "Current app is :\n[ " + mszCurrentAppPackageName
+                                + " ]\nThe last app is :\n[ " + mszNewestAppPackageName
+                                + " ]\nIs download the last app?";
+                            YesNoAlertDialog.show(mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
+                        }
+                        break;
+                    }
+            }
+        }
+    };
+
+    protected View createAboutPage() {
+        // 定义应用调试按钮
+        //
+        Element elementAppMode;
+        if (GlobalApplication.isDebuging()) {
+            elementAppMode = new Element(mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
+            elementAppMode.setOnClickListener(mAppNormalOnClickListener);
+        } else {
+            elementAppMode = new Element(mContext.getString(R.string.app_debug), R.drawable.ic_winboll);
+            elementAppMode.setOnClickListener(mAppDebugOnClickListener);
+        }
+        // 定义 GitWeb 按钮
+        //
+        Element elementGitWeb = new Element(mContext.getString(R.string.gitea_home), R.drawable.ic_winboll);
+        elementGitWeb.setOnClickListener(mGitWebOnClickListener);
+        // 定义检查更新按钮
+        //
+        Element elementAppUpdate = new Element(mContext.getString(R.string.app_update), R.drawable.ic_winboll);
+        elementAppUpdate.setOnClickListener(mAppUpdateOnClickListener);
+
+        String szAppInfo = "";
+        try {
+            szAppInfo = mszAppName + " "
+                + mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName
+                + "\n" + mszAppDescription;
+        } catch (PackageManager.NameNotFoundException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+        View aboutPage = new AboutPage(mContext)
+            .setDescription(szAppInfo)
+            //.isRTL(false)
+            //.setCustomFont(String) // or Typeface
+            .setImage(mnAppIcon)
+            //.addItem(versionElement)
+            //.addItem(adsElement)
+            //.addGroup("Connect with us")
+            .addEmail("ZhanGSKen@AliYun.Com")
+            .addWebsite(mszHomePage)
+            .addItem(elementAppMode)
+            .addItem(elementGitWeb)
+            .addItem(elementAppUpdate)
+            //.addFacebook("the.medy")
+            //.addTwitter("medyo80")
+            //.addYoutube("UCdPQtdWIsg7_pi4mrRu46vA")
+            //.addPlayStore("com.ideashower.readitlater.pro")
+            //.addGitHub("medyo")
+            //.addInstagram("medyo80")
+            .create();
+        return aboutPage;
+    }
+
+    View.OnClickListener mAppDebugOnClickListener = new View.OnClickListener(){
+        @Override
+        public void onClick(View view) {
+            //ToastUtils.show("mAppDebugOnClickListener");
+            setApp2DebugMode(mContext);
+        }
+    };
+
+    View.OnClickListener mAppNormalOnClickListener = new View.OnClickListener(){
+        @Override
+        public void onClick(View view) {
+            //ToastUtils.show("mAppNormalOnClickListener");
+            setApp2NormalMode(mContext);
+        }
+    };
+
+    public static void setApp2DebugMode(Context context) {
+        Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+        if (intent != null) {
+            //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            GlobalApplication.setIsDebuging(true);
+            GlobalApplication.saveDebugStatus();
+
+            GlobalApplication.getWinBollActivityManager().finishAll();
+            context.startActivity(intent);
+        } 
+    }
+
+    public static void setApp2NormalMode(Context context) {
+        Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+        if (intent != null) {
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            GlobalApplication.setIsDebuging(false);
+            GlobalApplication.saveDebugStatus();
+
+            GlobalApplication.getWinBollActivityManager().finishAll();
+            context.startActivity(intent);
+        } 
+    }
+
+    View.OnClickListener mGitWebOnClickListener = new View.OnClickListener(){
+        @Override
+        public void onClick(View view) {
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mszGitea));
+            mContext.startActivity(browserIntent);
+        }
+    };
+
+    View.OnClickListener mAppUpdateOnClickListener = new View.OnClickListener(){
+        @Override
+        public void onClick(View view) {
+            ToastUtils.show("Start app update checking.");
+            new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        String szUrl = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
+                        // 构建包含认证信息的请求
+                        String credential = "";
+                        if (GlobalApplication.isDebuging()) {
+                            credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
+                            PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
+                            PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
+                        } else {
+                            String username = "WinBoll";
+                            String password = "WinBollPowerByZhanGSKen";
+                            credential = Credentials.basic(username, password);
+                        }
+                        
+                        Request request = new Request.Builder()
+                            .url(szUrl)
+                            .header("Accept", "text/plain") // 设置正确的Content-Type头
+                            .header("Authorization", credential)
+                            .build();
+                        OkHttpClient client = new OkHttpClient();
+                        Call call = client.newCall(request);
+                        call.enqueue(new Callback() {
+                                @Override
+                                public void onFailure(Call call, IOException e) {
+                                    // 处理网络请求失败
+                                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                                }
+
+                                @Override
+                                public void onResponse(Call call, Response response) throws IOException {
+                                    if (!response.isSuccessful()) {
+                                        LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace());
+                                        return;
+                                    }
+
+                                    try {
+                                        // 读取响应体作为字符串，注意这里可能需要解码
+                                        String text = response.body().string();
+                                        org.jsoup.nodes.Document doc = org.jsoup.Jsoup.parse(text);
+                                        LogUtils.v(TAG, doc.text());
+
+                                        // 使用id选择器找到具有特定id的元素
+                                        org.jsoup.nodes.Element elementWithId = doc.select("#LastRelease").first(); // 获取第一个匹配的元素
+
+                                        // 提取并打印元素的文本内容
+                                        mszNewestAppPackageName = elementWithId.text();
+                                        //ToastUtils.delayedShow(text + "\n" + mszNewestAppPackageName, 5000);
+
+                                        mHandler.sendMessage(mHandler.obtainMessage(MSG_APPUPDATE_CHECKED));
+                                    } catch (Exception e) {
+                                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                                    }
+                                }
+                            });
+                    }
+                }).start();
+        }
+    };
+
+    YesNoAlertDialog.OnDialogResultListener mIsDownlaodUpdateListener = new YesNoAlertDialog.OnDialogResultListener() {
+        @Override
+        public void onYes() {
+            String szUrl = mszWinBollServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName;
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(szUrl));
+            mContext.startActivity(browserIntent);
+        }
+
+        @Override
+        public void onNo() {
+        }
+    };
+
+    public interface OnRequestDevUserInfoAutofillListener {
+        void requestAutofill(EditText etDevUserName, EditText etDevUserPassword);
+    }
+
+    public void setOnRequestDevUserInfoAutofillListener(OnRequestDevUserInfoAutofillListener l) {
+        mOnRequestDevUserInfoAutofillListener = l;
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java

@@ -0,0 +1,96 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 19:12:12
+ * @Describe 应用主要服务组件类守护进程服务组件类
+ */
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import cc.winboll.studio.libaes.winboll.WinBollClientService;
+import cc.winboll.studio.libappbase.utils.ServiceUtils;
+
+public class AssistantService extends Service {
+
+    public final static String TAG = "AssistantService";
+
+    WinBollClientServiceBean mWinBollServiceBean;
+    MyServiceConnection mMyServiceConnection;
+    volatile boolean mIsServiceRunning;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+        }
+        // 设置运行参数
+        mIsServiceRunning = false;
+        run();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        run();
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        mIsServiceRunning = false;
+        super.onDestroy();
+    }
+
+    //
+    // 运行服务内容
+    //
+    void run() {
+        mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        if (mWinBollServiceBean.isEnable()) {
+            if (mIsServiceRunning == false) {
+                // 设置运行状态
+                mIsServiceRunning = true;
+                // 唤醒和绑定主进程
+                wakeupAndBindMain();
+            }
+        }
+    }
+
+    //
+    // 唤醒和绑定主进程
+    //
+    void wakeupAndBindMain() {
+        if (ServiceUtils.isServiceRunning(getApplicationContext(), WinBollClientService.class.getName()) == false) {
+            startForegroundService(new Intent(AssistantService.this, WinBollClientService.class));
+        }
+
+        bindService(new Intent(AssistantService.this, WinBollClientService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+    }
+
+    //
+    // 主进程与守护进程连接时需要用到此类
+    //
+    class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mWinBollServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(AssistantService.this);
+            if (mWinBollServiceBean.isEnable()) {
+                wakeupAndBindMain();
+            }
+        }
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java

@@ -0,0 +1,35 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 19:11:27
+ * @Describe WinBoll UI 状态图标枚举
+ */
+import cc.winboll.studio.libaes.R;
+
+public enum EWUIStatusIconDrawable {
+    NORMAL(0),
+    NEWS(1)
+    ;
+
+    static final String TAG = "WUIStatusIconDrawable";
+
+    static String[] _mlistCNName = { "正常", "新的消息" };
+
+    private int value = 0;
+    private EWUIStatusIconDrawable(int value) {    //必须是private的，否则编译错误
+        this.value = value;
+    }
+
+    public static int getIconDrawableId(EWUIStatusIconDrawable drawableId) {
+        int res;
+        switch(drawableId){
+            case NEWS :
+                res = R.drawable.ic_winbollbeta;
+                break;
+            default :
+                res = R.drawable.ic_winboll;
+        }
+        return res;
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBollClientServiceBinder.java

@@ -0,0 +1,17 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 19:08:45
+ * @Describe WinBollService 服务 Binder。
+ */
+import android.graphics.drawable.Drawable;
+
+public interface IWinBollClientServiceBinder {
+
+    public static final String TAG = "IWinBollClientServiceBinder";
+
+    public WinBollClientService getService();
+
+    public Drawable getCurrentStatusIconDrawable();
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientService.java

@@ -0,0 +1,192 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 19:06:54
+ * @Describe WinBoll 客户端服务
+ */
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.graphics.drawable.Drawable;
+import android.os.IBinder;
+import cc.winboll.studio.libaes.winboll.AssistantService;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ServiceUtils;
+import cc.winboll.studio.libapputils.utils.PrefUtils;
+import com.hjq.toast.ToastUtils;
+
+public class WinBollClientService extends Service implements IWinBollClientServiceBinder {
+
+    public static final String TAG = "WinBollClientService";
+
+    WinBollClientServiceBean mWinBollClientServiceBean;
+    MyServiceConnection mMyServiceConnection;
+    volatile boolean mIsWinBollClientThreadRunning;
+    volatile boolean mIsEnableService;
+    volatile WinBollClientThread mWinBollClientThread;
+
+    public boolean isWinBollClientThreadRunning() {
+        return mIsWinBollClientThreadRunning;
+    }
+
+    @Override
+    public WinBollClientService getService() {
+        return WinBollClientService.this;
+    }
+
+    @Override
+    public Drawable getCurrentStatusIconDrawable() {
+        return mIsWinBollClientThreadRunning ?
+            getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NORMAL))
+            : getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NEWS));
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        //ToastUtils.show("onCreate");
+        super.onCreate();
+        mWinBollClientThread = null;
+        mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        mIsEnableService = mWinBollClientServiceBean.isEnable();
+
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+        }
+
+        // 由系统启动时，应用可以通过下面函数实例化实际服务进程。
+        runMainThread();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        //ToastUtils.show("onStartCommand");
+        // 由应用 Intent 启动时，应用可以通过下面函数实例化实际服务进程。
+        runMainThread();
+
+        // 返回运行参数持久化存储后，服务状态控制参数
+        // 无论 Intent 传入如何，服务状态一直以持久化存储后的参数控制，
+        // PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBollServiceBean，
+        //     不过本服务的应用方向会变得繁琐，
+        //     现阶段只要满足手机端启动与停止本服务，WinBoll 客户端实例运行在手机端就可以了。
+        return mIsEnableService ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
+    }
+
+    synchronized void runMainThread() {
+        if (mWinBollClientThread == null) {
+            //ToastUtils.show("runMainThread()");
+            mWinBollClientThread = new WinBollClientThread();
+            mWinBollClientThread.start();
+        }
+    }
+
+    void syncWinBollClientThreadStatus() {
+        mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        mIsEnableService = mWinBollClientServiceBean.isEnable();
+        LogUtils.d(TAG, String.format("mIsEnableService %s", mIsEnableService));
+    }
+
+
+    // 唤醒和绑定守护进程
+    //
+    void wakeupAndBindAssistant() {
+        if (ServiceUtils.isServiceRunning(getApplicationContext(), AssistantService.class.getName()) == false) {
+            startService(new Intent(WinBollClientService.this, AssistantService.class));
+            //LogUtils.d(TAG, "call wakeupAndBindAssistant() : Binding... AssistantService");
+            bindService(new Intent(WinBollClientService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
+        }
+    }
+
+    // 主进程与守护进程连接时需要用到此类
+    //
+    private class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {            
+            mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(WinBollClientService.this);
+            if (mWinBollClientServiceBean.isEnable()) {
+                // 唤醒守护进程
+                wakeupAndBindAssistant();
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        //ToastUtils.show("onDestroy");
+    }
+
+    @Override
+    public void onStart(Intent intent, int startId) {
+        super.onStart(intent, startId);
+    }
+
+    void setWinBollServiceEnableStatus(boolean isEnable) {
+        WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(this);
+        bean.setIsEnable(isEnable);
+        WinBollClientServiceBean.saveWinBollServiceBean(this, bean);
+    }
+
+    boolean getWinBollServiceEnableStatus(Context context) {
+        mWinBollClientServiceBean = WinBollClientServiceBean.loadWinBollClientServiceBean(context);
+        return mWinBollClientServiceBean.isEnable();
+    }
+
+    /*public interface OnServiceStatusChangeListener {
+     void onServerStatusChange(boolean isServiceAlive);
+     }
+
+     public void setOnServerStatusChangeListener(OnServiceStatusChangeListener l) {
+     mOnServerStatusChangeListener = l;
+     }*/
+
+    class WinBollClientThread extends Thread {
+        @Override
+        public void run() {
+            super.run();
+            LogUtils.d(TAG, "run syncWinBollClientThreadStatus");
+            syncWinBollClientThreadStatus();
+            if (mIsEnableService) {
+                if (mIsWinBollClientThreadRunning == false) {
+                    // 设置运行状态
+                    mIsWinBollClientThreadRunning = true;
+                    LogUtils.d(TAG, "WinBollClientThread run()");
+
+                    // 唤醒守护进程
+                    //wakeupAndBindAssistant();
+                    
+                    while (mIsEnableService) {
+                        // 显示运行状态
+                        WinBollServiceStatusView.startConnection();
+                        LogUtils.d(TAG, String.format("while mIsEnableService is %s", mIsEnableService));
+                        
+                        try {
+                            Thread.sleep(10 * 1000);
+                        } catch (InterruptedException e) {
+                            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                        }
+                        syncWinBollClientThreadStatus();
+                    }
+
+                    // 服务进程退出, 重置进程运行状态
+                    WinBollServiceStatusView.stopConnection();
+                    mIsWinBollClientThreadRunning = false;
+                    mWinBollClientThread = null;
+                }
+            }
+        }
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollClientServiceBean.java

@@ -0,0 +1,78 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 19:05:15
+ * @Describe WinBollService 运行参数配置
+ */
+import android.content.Context;
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class WinBollClientServiceBean extends BaseBean {
+
+    public static final String TAG = "WinBollClientServiceBean";
+
+    volatile boolean isEnable;
+
+    public WinBollClientServiceBean() {
+        isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return WinBollClientServiceBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        WinBollClientServiceBean bean = this;
+        jsonWriter.name("isEnable").value(bean.isEnable());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+
+    public static WinBollClientServiceBean loadWinBollClientServiceBean(Context context) {
+        WinBollClientServiceBean bean = WinBollClientServiceBean.loadBean(context, WinBollClientServiceBean.class);
+        return bean == null ? new WinBollClientServiceBean() : bean;
+    }
+
+    public static boolean saveWinBollServiceBean(WinBollClientService service, WinBollClientServiceBean bean) {
+        return WinBollClientServiceBean.saveBean(service, bean);
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollMail.java

@@ -0,0 +1,22 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 19:13:20
+ * @Describe WinBoll 邮件服务
+ */
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class WinBollMail extends Service {
+
+    public static final String TAG = "WinBollMail";
+
+    @Override
+    public IBinder onBind(Intent intent) {
+
+        return null;
+    }
+
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServerConnectionThread.java

@@ -0,0 +1,106 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/29 15:57:28
+ * @Describe WinBoll 服务器服务情况测试访问进程。
+ */
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.IOException;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Credentials;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+// 新增自定义回调接口
+interface TextCallback {
+    void onSuccess(String text);
+    void onFailure(Exception e);
+}
+
+public class WinBollServerConnectionThread extends Thread {
+
+    public static final String TAG = "WinBollClientService";
+
+    private final String url;
+    private final String username;
+    private final String password;
+    private final int connectTimeout;
+    private final int readTimeout;
+    private final int maxRetries;
+    private final TextCallback callback; // 新增回调成员变量
+
+    // 新增带回调的构造函数
+    public WinBollServerConnectionThread(String url, String username, String password, TextCallback callback) {
+        this(url, username, password, 10000, 10000, 5, callback);
+    }
+
+    // 修改原有构造函数，添加回调参数
+    public WinBollServerConnectionThread(String url, String username, String password, 
+                                             int connectTimeout, int readTimeout, int maxRetries, TextCallback callback) {
+        this.url = url;
+        this.username = username;
+        this.password = password;
+        this.connectTimeout = connectTimeout;
+        this.readTimeout = readTimeout;
+        this.maxRetries = maxRetries;
+        this.callback = callback;
+    }
+
+    @Override
+    public void run() {
+        LogUtils.d(TAG, String.format("run() url %s\nusername %s\npassword %s", url, username, password));
+        String credential = Credentials.basic(username, password);
+        LogUtils.d(TAG, String.format("credential %s", credential));
+
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder()
+            .url(url)
+            .header("Accept", "text/plain")
+            .header("Authorization", credential)
+            .build();
+            
+        Call call = client.newCall(request);
+        call.enqueue(new Callback() {
+                @Override
+                public void onFailure(Call call, IOException e) {
+                    // 优先调用自定义回调
+                    if (callback != null) {
+                        callback.onFailure(e);
+                    } else {
+                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                    }
+                }
+
+                @Override
+                public void onResponse(Call call, Response response) throws IOException {
+                    if (!response.isSuccessful()) {
+                        if (callback != null) {
+                            callback.onFailure(new Exception("Unexpected code " + response));
+                        } else {
+                            LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace());
+                        }
+                        return;
+                    }
+
+                    try {
+                        String text = response.body().string();
+                        // 优先调用自定义回调
+                        if (callback != null) {
+                            callback.onSuccess(text);
+                        } else {
+                            LogUtils.d(TAG, text);
+                        }
+                    } catch (Exception e) {
+                        if (callback != null) {
+                            callback.onFailure(e);
+                        } else {
+                            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                        }
+                    }
+                }
+            });
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java

@@ -0,0 +1,473 @@
+package cc.winboll.studio.libaes.winboll;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 17:41:55
+ * @Describe WinBoll 服务主机连接状态视图
+ */
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import cc.winboll.studio.libaes.winboll.WinBollClientService;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.R;
+import cc.winboll.studio.libapputils.utils.PrefUtils;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+//import okhttp3.Authenticator;
+//import okhttp3.Credentials;
+//import okhttp3.OkHttpClient;
+//import okhttp3.Request;
+//import okhttp3.Response;
+//import okhttp3.Route;
+
+public class WinBollServiceStatusView extends LinearLayout {
+
+    public static final String TAG = "WinBollServiceStatusView";
+
+    public static final int MSG_CONNECTION_INFO = 0;
+    public static final int MSG_UPDATE_CONNECTION_STATUS = 1;
+
+    static WinBollServiceStatusView _WinBollServiceStatusView;
+    Context mContext;
+    //boolean mIsConnected;
+    volatile ConnectionThread mConnectionThread;
+
+    String mszServerHost;
+    WinBollClientService mWinBollService;
+    ImageView mImageView;
+    TextView mTextView;
+    WinBollServiceViewHandler mWinBollServiceViewHandler;
+    //WebView mWebView;
+    static volatile ConnectionStatus mConnectionStatus;
+    View.OnClickListener mViewOnClickListener;
+    static String _mUserName;
+    static String _mPassword;
+
+    static enum ConnectionStatus {
+        DISCONNECTED,
+        START_CONNECT,
+        CONNECTING,
+        CONNECTED;
+    };
+
+    boolean isBound = false;
+    ServiceConnection connection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            IWinBollClientServiceBinder binder = (IWinBollClientServiceBinder) service;
+            mWinBollService = binder.getService();
+            isBound = true;
+            // 可以在这里调用Service的方法进行通信，比如获取数据
+            mImageView.setBackgroundDrawable(mWinBollService.getCurrentStatusIconDrawable());
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            isBound = false;
+        }
+    };
+
+    public WinBollServiceStatusView(Context context) {
+        super(context);
+        mContext = context;
+        initView();
+    }
+
+    public WinBollServiceStatusView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+        initView();
+    }
+
+    public WinBollServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContext = context;
+        initView();
+    }
+
+    public WinBollServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        mContext = context;
+        initView();
+    }
+
+    ConnectionStatus getConnectionStatus() {
+        return false ?
+            ConnectionStatus.CONNECTED 
+            : ConnectionStatus.DISCONNECTED;
+    }
+
+    void initView() {
+        _WinBollServiceStatusView = this;
+
+        mImageView = new ImageView(mContext);
+        setImageViewByConnection(mImageView, false);
+        mConnectionStatus = getConnectionStatus();
+        //mIsConnected = false;
+        //mWinBollServerHostConnectionStatus = WinBollServerHostConnectionStatus.DISCONNECTED;
+        //ToastUtils.show("initView()");
+
+        mViewOnClickListener = new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                LogUtils.d(TAG, "onClick()");
+                if (mConnectionStatus == ConnectionStatus.CONNECTED) {
+                    LogUtils.d(TAG, "Click to stop service.");
+                    WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
+                    bean.setIsEnable(false);
+                    WinBollClientServiceBean.saveBean(mContext, bean);
+                    Intent intent = new Intent(mContext, WinBollClientService.class);
+                    mContext.stopService(intent);
+                    //stopConnectionThread();
+                    mTextView.setText("");
+                    setImageViewByConnection(mImageView, false);
+                    mConnectionStatus = ConnectionStatus.DISCONNECTED;
+                } else if (mConnectionStatus == ConnectionStatus.DISCONNECTED) {
+                    LogUtils.d(TAG, "Click to start service.");
+                    WinBollClientServiceBean bean = WinBollClientServiceBean.loadWinBollClientServiceBean(mContext);
+                    bean.setIsEnable(true);
+                    WinBollClientServiceBean.saveBean(mContext, bean);
+                    Intent intent = new Intent(mContext, WinBollClientService.class);
+                    mContext.startService(intent);
+                    //startConnectionThread();
+                }
+            }
+        };
+        setOnClickListener(mViewOnClickListener);
+        addView(mImageView);
+        mTextView = new TextView(mContext);
+        mWinBollServiceViewHandler = new WinBollServiceViewHandler(this);
+        addView(mTextView);
+        /*mWebView = new WebView(mContext);
+         mWebView.setWebViewClient(new WebViewClient() {
+         @Override
+         public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) {
+         // 弹出系统基本HTTP验证窗口
+         handler.proceed("username", "password");
+         }
+         });
+         addView(mWebView);*/
+    }
+
+    void checkWinBollServerStatusAndUpdateCurrentView() {
+        LogUtils.d(TAG, "checkWinBollServerStatusAndUpdateCurrentView()");
+        /*if (getConnectionStatus() == ConnectionStatus.CONNECTED) {
+         mConnectionStatus = ConnectionStatus.CONNECTED;
+         } else {
+         mConnectionStatus = ConnectionStatus.DISCONNECTED;
+         }*/
+    }
+
+    public void setServerHost(String szWinBollServerHost) {
+        mszServerHost = szWinBollServerHost;
+    }
+
+    public void setAuthInfo(String username, String password) {
+        _mUserName = username;
+        _mPassword = password;
+    }
+
+    void setImageViewByConnection(ImageView imageView, boolean isConnected) {
+        //mIsConnected = isConnected;
+        // 获取vector drawable
+        Drawable drawable = mContext.getDrawable(isConnected ? R.drawable.ic_dev_connected : R.drawable.ic_dev_disconnected);
+        if (drawable != null) {
+            imageView.setImageDrawable(drawable);
+        }
+    }
+
+    TextCallback apiTextCallback = new TextCallback() {
+        @Override
+        public void onSuccess(String text) {
+            // 处理成功响应
+            LogUtils.d(TAG, text);
+        }
+
+        @Override
+        public void onFailure(Exception e) {
+            // 处理失败情况
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+    };
+
+    TextCallback cipTextCallback = new TextCallback() {
+        @Override
+        public void onSuccess(String text) {
+            // 处理成功响应
+            LogUtils.d(TAG, text);
+            LogUtils.d(TAG, "Develop Host Connection IP is : " + text);
+            mConnectionStatus = ConnectionStatus.CONNECTED;
+            // 获取当前时间
+            LocalDateTime now = LocalDateTime.now();
+            // 定义时间格式
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+            // 按照指定格式格式化时间并输出
+            String formattedDateTime = now.format(formatter);
+            String msg = "ClientIP<" + formattedDateTime + ">: " + text;
+            mWinBollServiceViewHandler.postMessageText(msg);
+            mWinBollServiceViewHandler.postMessageConnectionStatus(true);
+
+        }
+
+        @Override
+        public void onFailure(Exception e) {
+            // 处理失败情况
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            // 处理网络请求失败
+            setImageViewByConnection(mImageView, false);
+            mWinBollServiceViewHandler.postMessageText(e.getMessage());
+            mWinBollServiceViewHandler.postMessageConnectionStatus(false);
+        }
+    };
+
+    public void requestAPIWithBasicAuth() {
+        String targetUrl = "https://" + (GlobalApplication.isDebuging() ?"dev.winboll": "winboll") + ".cc/api/"; // 替换为实际测试的URL
+        requestWithBasicAuth(targetUrl, apiTextCallback);
+    }
+
+    public void requestCIPWithBasicAuth() {
+        String targetUrl = mszServerHost + "/cip/?simple=true";
+        requestWithBasicAuth(targetUrl, cipTextCallback);
+    }
+
+    public void requestWithBasicAuth(String targetUrl, TextCallback callback) {
+        String username = "";
+        String password = "";
+        if (GlobalApplication.isDebuging()) {
+            username = PrefUtils.getString(mContext, "metDevUserName", "");
+            password = PrefUtils.getString(mContext, "metDevUserPassword", "");
+        } else {
+            username = "WinBoll";
+            password = "WinBollPowerByZhanGSKen";
+        }
+        
+        LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl));
+        WinBollServerConnectionThread thread = new WinBollServerConnectionThread(
+            targetUrl,
+            username,
+            password,
+            cipTextCallback
+        );
+        thread.start();
+    }
+
+    /*void requestWithBasicAuth(final WinBollServiceViewHandler textViewHandler, String targetUrl, final String username, final String password) {
+     // 用户名和密码，替换为实际的认证信息
+     //String username = "your_username";
+     //String password = "your_password";
+     LogUtils.d(TAG, "requestWithBasicAuth(...)");
+     LogUtils.d(TAG, String.format("targetUrl %s", targetUrl));
+
+     // 构建包含认证信息的请求
+     String credential = Credentials.basic(username, password);
+     LogUtils.d(TAG, String.format("credential %s", credential));
+
+     OkHttpClient client = new OkHttpClient();
+     Request request = new Request.Builder()
+     .url(targetUrl)
+     .header("Accept", "text/plain") // 设置正确的Content-Type头
+     .header("Authorization", credential)
+     .build();
+
+     Call call = client.newCall(request);
+     call.enqueue(new Callback() {
+     @Override
+     public void onFailure(Call call, IOException e) {
+     // 处理网络请求失败
+     setImageViewByConnection(mImageView, false);
+     textViewHandler.postMessageText(e.getMessage());
+     textViewHandler.postMessageConnectionStatus(false);
+     LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+     //String sz = "请求失败，状态码: " + response.code();
+     //setImageViewByConnection(mImageView, false);
+     //LogUtils.d(TAG, sz);
+     }
+
+     @Override
+     public void onResponse(Call call, Response response) throws IOException {
+     if (!response.isSuccessful()) {
+     setImageViewByConnection(mImageView, false);
+     textViewHandler.postMessageText("Unexpected code " + response);
+     textViewHandler.postMessageConnectionStatus(false);
+     LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace());
+     return;
+     }
+
+     try {
+     // 读取响应体作为字符串，注意这里可能需要解码
+     String text = response.body().string();
+     LogUtils.d(TAG, "Develop Host Connection IP is : " + text);
+     mConnectionStatus = ConnectionStatus.CONNECTED;
+     // 获取当前时间
+     LocalDateTime now = LocalDateTime.now();
+     // 定义时间格式
+     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+     // 按照指定格式格式化时间并输出
+     String formattedDateTime = now.format(formatter);
+     textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + text);
+     textViewHandler.postMessageConnectionStatus(true);
+
+     //org.jsoup.nodes.Document doc = org.jsoup.Jsoup.parse(text);
+     //LogUtils.d(TAG, doc.text());
+
+     // 使用id选择器找到具有特定id的元素
+     //org.jsoup.nodes.Element elementWithId = doc.select("#LastRelease").first(); // 获取第一个匹配的元素
+
+     // 提取并打印元素的文本内容
+     //mszNewestAppPackageName = elementWithId.text();
+     //ToastUtils.delayedShow(text + "\n" + mszNewestAppPackageName, 5000);
+
+     //mHandler.sendMessage(mHandler.obtainMessage(MSG_APPUPDATE_CHECKED));
+     //System.out.println(response.body().string());
+     //                        mConnectionStatus = ConnectionStatus.CONNECTED;
+     //                        // 获取当前时间
+     //                        LocalDateTime now = LocalDateTime.now();
+     //
+     //                        // 定义时间格式
+     //                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+     //                        // 按照指定格式格式化时间并输出
+     //                        String formattedDateTime = now.format(formatter);
+     //                        //System.out.println(formattedDateTime);
+     //                        textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + response.body().string());
+     //                        textViewHandler.postMessageConnectionStatus(true);
+     } catch (Exception e) {
+     LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+     }
+     }
+     });
+
+     }*/
+
+    class WinBollServiceViewHandler extends Handler {
+        WinBollServiceStatusView mDevelopHostConnectionStatusView;
+
+        public WinBollServiceViewHandler(WinBollServiceStatusView view) {
+            mDevelopHostConnectionStatusView = view;
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (msg.what == MSG_CONNECTION_INFO) {
+                mDevelopHostConnectionStatusView.mTextView.setText((String)msg.obj);
+            } else if (msg.what == MSG_UPDATE_CONNECTION_STATUS) {
+                mDevelopHostConnectionStatusView.setImageViewByConnection(mImageView, (boolean)msg.obj);
+                mDevelopHostConnectionStatusView.mConnectionStatus = ((boolean)msg.obj) ? ConnectionStatus.CONNECTED : ConnectionStatus.DISCONNECTED;
+            }
+            super.handleMessage(msg);
+        }
+
+        void postMessageText(String szMSG) {
+            Message msg = new Message();
+            msg.what = MSG_CONNECTION_INFO;
+            msg.obj = szMSG;
+            sendMessage(msg);
+        }
+
+        void postMessageConnectionStatus(boolean isConnected) {
+            Message msg = new Message();
+            msg.what = MSG_UPDATE_CONNECTION_STATUS;
+            msg.obj = isConnected;
+            sendMessage(msg);
+        }
+    }
+
+    public static void startConnection() {
+        if (_WinBollServiceStatusView != null) {
+            _WinBollServiceStatusView.startConnectionThread();
+        }
+    }
+
+    public static void stopConnection() {
+        if (_WinBollServiceStatusView != null) {
+            _WinBollServiceStatusView.stopConnectionThread();
+        }
+    }
+
+    void startConnectionThread() {
+        if (mConnectionStatus == ConnectionStatus.DISCONNECTED) {
+            mConnectionStatus = ConnectionStatus.START_CONNECT;
+            LogUtils.d(TAG, "startConnectionThread");
+            if (mConnectionThread != null) {
+                LogUtils.d(TAG, "mConnectionThread != null");
+                mConnectionThread.mIsExist = true;
+            }
+            mConnectionThread = new ConnectionThread();
+            mConnectionThread.start();
+        } else if (mConnectionStatus == ConnectionStatus.CONNECTING) {
+            //LogUtils.d(TAG, "mConnectionStatus == ConnectionStatus.CONNECTING");
+        } else if (mConnectionStatus == ConnectionStatus.CONNECTED) {
+            //LogUtils.d(TAG, "mConnectionStatus == ConnectionStatus.CONNECTED");
+        } else {
+            LogUtils.d(TAG, String.format("Unknow mConnectionStatus %s, can not start ConnectionThread.", mConnectionStatus));
+        }
+    }
+
+    void stopConnectionThread() {
+        LogUtils.d(TAG, "stopConnectionThread");
+        if (mConnectionThread != null) {
+            LogUtils.d(TAG, "mConnectionThread != null");
+            mConnectionThread.mIsExist = true;
+            mConnectionThread = null;
+        }
+    }
+
+
+
+    class ConnectionThread extends Thread {
+
+        public volatile boolean mIsExist;
+
+        //DevelopHostConnectionStatusViewHandler mDevelopHostConnectionStatusViewHandler;
+
+        //public ConnectionThread(DevelopHostConnectionStatusViewHandler developHostConnectionStatusViewHandler) {
+        //mDevelopHostConnectionStatusViewHandler = developHostConnectionStatusViewHandler;
+        //}
+        public ConnectionThread() {
+            mIsExist = false;
+        }
+
+        @Override
+        public void run() {
+            super.run();
+            while (mIsExist == false) {
+                if (mConnectionStatus == ConnectionStatus.START_CONNECT) {
+                    mConnectionStatus = ConnectionStatus.CONNECTING;
+                    //requestAPIWithBasicAuth();
+                    requestCIPWithBasicAuth();
+                } else if (mConnectionStatus == ConnectionStatus.CONNECTED
+                           || mConnectionStatus == ConnectionStatus.DISCONNECTED) {
+                    //ToastUtils.show("mWinBollServerHostConnectionStatus " + mConnectionStatus);
+                    LogUtils.d(TAG, String.format("mConnectionStatus done %s", mConnectionStatus));
+                } else {
+                    LogUtils.d(TAG, String.format("mConnectionStatus unknow %s", mConnectionStatus));
+                }
+
+                try {
+                    Thread.sleep(5 * 1000);
+                } catch (InterruptedException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                }
+            }
+            //ToastUtils.show("ConnectionThread exit.");
+            LogUtils.d(TAG, "ConnectionThread exit.");
+        }
+    }
+
+    /*WinBollService.OnServiceStatusChangeListener mOnServerStatusChangeListener = new WinBollService.OnServiceStatusChangeListener(){
+     @Override
+     public void onServerStatusChange(boolean isServiceAlive) {
+     }
+     };*/
+}

libaes/src/main/res/drawable/bg_shadow.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 阴影部分 --> 
+    <!-- 个人觉得更形象的表达：top代表下边的阴影高度，left代表右边的阴影宽度。其实也就是相对应的offset，solid中的颜色是阴影的颜色，也可以设置角度等等 --> 
+    <item 
+        android:left="2dp" 
+        android:top="2dp" 
+        android:right="2dp" 
+        android:bottom="2dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="#0F000000" 
+                android:startColor="#0F000000" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+    <!-- 背景部分 --> 
+    <!-- 形象的表达：bottom代表背景部分在上边缘超出阴影的高度，right代表背景部分在左边超出阴影的宽度（相对应的offset） --> 
+    <item 
+        android:left="3dp" 
+        android:top="3dp" 
+        android:right="3dp" 
+        android:bottom="5dp"> 
+        <shape android:shape="rectangle" > 
+            <gradient 
+                android:angle="270" 
+                android:endColor="@color/colorAccent" 
+                android:startColor="@color/colorAccent" /> 
+            <corners 
+                android:bottomLeftRadius="6dip" 
+                android:bottomRightRadius="6dip" 
+                android:topLeftRadius="6dip" 
+                android:topRightRadius="6dip" /> 
+        </shape> 
+    </item> 
+</layer-list>

libaes/src/main/res/drawable/ic_dev_connected.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,12V14H5V12H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3,15V17H5V15H3M14,15H20V19H14V15M3,18V20H5V18H3M6,18V20H8V18H6M9,18V20H11V18H9Z"/>
+
+</vector>

libaes/src/main/res/drawable/ic_dev_disconnected.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3.88,13.46L2.46,14.88L4.59,17L2.46,19.12L3.88,20.54L6,18.41L8.12,20.54L9.54,19.12L7.41,17L9.54,14.88L8.12,13.46L6,15.59L3.88,13.46M14,15H20V19H14V15Z"/>
+
+</vector>

libaes/src/main/res/drawable/ic_email.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M22,6C22,4.9 21.1,4 20,4H4C2.9,4 2,4.9 2,6V18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V6M20,6L12,11L4,6H20M20,18H4V8L12,13L20,8V18Z"/>
+
+</vector>