<autoinstaller>APK 15.2.0 release Publish.

README.md

@@ -9,8 +9,8 @@
 
 ## WinBoll 项目组研发计划
 致力于把 WinBoll-APP 应用在手机端 Android 项目开发。
-也在探索 https://gitea.winboll.cc/<WinBoll 项目组>/WinBoll-APP.git 应用于 WinBoll-APP APK 分发。
-更想进阶 https://github.com/<WinBoll 项目组>/WinBoll-APP.git 应用于 WinBoll-APP Beta APK 分发。
+也在探索 https://gitea.winboll.cc/<WinBoll 项目组>/APP.git 应用于 WinBoll-APP APK 分发。
+更想进阶 https://github.com/<WinBoll 项目组>/APP.git 应用于 WinBoll-APP Beta APK 分发。
 
 ## WinBoll-APP 汗下...
 #### ☁应用何置如此呢。且观用户云云。
@@ -55,10 +55,10 @@
 ☁ WinBoll 主机建立 1Panel Gitea 应用。
 ☁ WinBoll 主机设置 WinBoll 应用为非登录状态。
 ☁ WinBoll 主机建立 WinBoll 账户与 WinBoll 用户组。
-☁ WinBoll 账户 User ID 为： winboll。
-☁ WinBoll 用户组 Group ID 为： winboll。
+☁ WinBoll 账户 User ID 为： J。
+☁ WinBoll 用户组 Group ID 为： Studio。
 ☁ WinBoll 主机 WinBoll 1Panel Gitea 建立 WinBoll 工作组。
-☁ WinBoll 主机 WinBoll 1Panel Gitea 用户项目 APK 编译输出目录为 /sdcard/<用户名>/WinBoll/app/
+☁ WinBoll 主机 WinBoll 1Panel Gitea 用户项目 APK 编译输出目录为 /sdcard/WinBollStudio/<用户名>/APKs/
 ☁ WinBoll 项目配置文件示例为 "<WinBoll 项目根目录>/.winboll/winboll.properties-demo"(WinBoll 项目已设置)
 ☁ WinBoll 项目配置文件为 "<WinBoll 项目根目录>/.winboll/winboll.properties"
 ☁ WinBoll 项目配置文件设定为源码提交时忽略。(WinBoll 项目已设置)
@@ -72,17 +72,17 @@
 ☁ MySQL winbollclient 数据库中
    WinBoll 客户端用户信息设定为：
    <用户名, 验证密码, 验证邮箱, 验证手机, 唯一存储令牌Token, 备用验证邮箱>。
-☁ WinBoll 项目源码仓库托管在 WinBoll 1Panel Gitea 目录 /opt/1panel/apps/gitea/gitea/data/git/repositories/winboll/winboll.git中。
+☁ WinBoll 项目源码仓库托管在 WinBoll 1Panel Gitea 目录 /opt/1panel/apps/gitea/gitea/data/git/repositories/studio/app.git中。
 ☁ WinBoll 主机提供 WinBoll 1Panel Gitea 应用的 WinBoll 项目源码仓库存取功能。（Gitea 应用已提供）
 ☁ WinBoll 主机提供 WinBoll Gitea 项目仓库存档功能。（Gitea 应用已提供）
 ☁ 提供 WinBoll 客户端用户登录功能。（Gitea 应用已提供）
 
 ### ☁ 看远方 ☁ ###
 ### ☁ 心忧虑 ☁ WinBoll-APP 应用前置需求
-☁ WinBoll-APP WinBoll 项目根目录设定为手机的 /sdcard/WinBoll 目录。（需要用户手动建立文件夹）
+☁ WinBoll-APP WinBoll 项目根目录设定为手机的 /sdcard/WinBollStudio/Sources 目录。（需要用户手动建立文件夹）
 ☁ WinBoll-APP 具有手机 /sdcard/WinBoll 目录的存储权限。（需要手机操作系统授权）
-☁ WinBoll-APP WinBoll 项目仓库源码存储路径为 /sdcard/WinBoll/repositories/winboll.git（需要用户手动建立文件夹）
-☁ WinBoll-APP 项目 APK 编译输出目录为 /sdcard/WinBoll/app/
+☁ WinBoll-APP WinBoll 项目仓库源码存储路径为 /sdcard/WinBollStudio/Sources/APP.git（需要用户手动建立文件夹）
+☁ WinBoll-APP 项目 APK 编译输出目录为 /sdcard/WinBollStudio/APKs/
 ☁ WinBoll-APP 应用签名验证可定制化。（WinBoll 项目已提供）
 ☁ WinBoll-APP 与系列衍生 APP 应用共享 cc.winboll.studio 命名空间资源。（WinBoll 项目已提供）
 ☁ WinBoll-APP 用户客户端信息存储在命名空间为 WinBoll APP MySQLLite 应用的 winbollappclient 数据库中。
@@ -92,7 +92,7 @@
 
 ### ☁ 云游四方 ☁ ###
 ### ☁ 呔！ ☁ WinBoll-APP 应用需求规划
-☁ WinBoll-APP 提供手机目录 /sdcard/WinBoll 的 WinBoll 项目源码管理功能。 
+☁ WinBoll-APP 提供手机目录 /sdcard/WinBollStudio/Sources 的 WinBoll 项目源码管理功能。 
 
 ### ☁ 吁！ ☁ WinBoll-APP 共享计划前景
 ☁ WinBoll-APP 将会实现 https://winboll.cc/api 访问功能。

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:09:04 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

@@ -6,16 +6,17 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.appcompat.widget.Toolbar
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activityassetshtmlToolbar1"/>
+		android:id="@+id/toolbar"/>
 
-	<cc.winboll.studio.libapputils.view.SimpleWebView
+	<LinearLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1.0"
-		android:id="@+id/activityassetshtmlSimpleWebView1"/>
+		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,12 @@ 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"
+        exclude group: "com.android.support:animated-vector-drawable:28.0.0"
+    }
     // https://mvnrepository.com/artifact/com.android.support/support-compat
     api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
@@ -66,6 +67,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
+#Wed Apr 02 12:22:30 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=11
+buildCount=20
 baseBetaVersion=15.0.1

androidxdemo/build.gradle

@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
-        minSdkVersion 26
+        minSdkVersion 24
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
@@ -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.5'
+    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
+#Wed Apr 02 12:13:40 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=8
+buildCount=16
 baseBetaVersion=15.0.1

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

@@ -14,6 +14,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.ViewGroup;
@@ -21,7 +22,9 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.androidxdemo.R;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import com.hjq.toast.ToastUtils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -46,6 +49,14 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+        
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        ToastUtils.setView(R.layout.view_toast);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        
         //CrashHandler.getInstance().registerGlobal(this);
         //CrashHandler.getInstance().registerPart(this);
     }

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogView;
+import com.hjq.toast.ToastUtils;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -18,6 +19,8 @@ public class MainActivity extends AppCompatActivity {
 		setSupportActionBar(toolbar);
 
         mLogView = findViewById(R.id.logview);
+        
+        ToastUtils.show("onCreate");
     }
 
     @Override

app/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.app"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 24
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.8" 
+        versionName "15.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,14 +41,32 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }
 
 dependencies {
-	api project(':winboll-shared')
-    api fileTree(dir: 'libs', include: ['*.jar'])
+	api fileTree(dir: 'libs', include: ['*.jar'])
+    // 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.github.getActivity:ToastUtils:10.5'
+    // 网络连接类库
+    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:libaes:15.2.4'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

app/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jan 05 07:55:24 HKT 2025
-stageCount=17
-libraryProject=winboll-shared
-baseVersion=1.8
-publishVersion=1.8.16
+#Tue Apr 01 13:50:28 HKT 2025
+stageCount=2
+libraryProject=
+baseVersion=15.0
+publishVersion=15.0.1
 buildCount=0
-baseBetaVersion=1.8.17
+baseBetaVersion=15.0.2

app/src/beta/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">WinBoll-APP+</string>
+    <string name="app_name">APP+</string>
 
 </resources>

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_winboll"
         android:label="@string/app_name"
-        android:theme="@style/WinBoll.SupportThemeNoActionBar"
+        android:theme="@style/AESTheme"
         android:supportsRtl="true">
 
         <activity
@@ -42,6 +42,7 @@
 
         </provider>
 
+        <activity android:name=".AboutActivity"/>
 
     </application>
 

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

@@ -0,0 +1,88 @@
+package cc.winboll.studio.app;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 23:52:29
+ * @Describe 应用介绍窗口
+ */
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.app.R;
+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);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    public AboutView CreateAboutView() {
+        String szBranchName = "app";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("APP");
+        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
+        appInfo.setAppDescription("WinBoll APP");
+        appInfo.setAppGitName("APP");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
+        appInfo.setAppAPKName("APP");
+        appInfo.setAppAPKFolderName("APP");
+        return new AboutView(mContext, appInfo);
+    }
+}

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

@@ -5,20 +5,26 @@ package cc.winboll.studio.app;
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */
-import cc.winboll.studio.shared.app.WinBollApplication;
-import cc.winboll.studio.shared.log.LogUtils;
+import android.view.Gravity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import com.hjq.toast.ToastUtils;
 
-public class App extends WinBollApplication {
+public class App extends GlobalApplication {
 
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
-        // 必须在调用基类前设置应用调试标志，
-        // 这样可以预先设置日志与数据的存储根目录。
-        //setIsDebug(BuildConfig.DEBUG);
         super.onCreate();
-        LogUtils.d(TAG, "onCreate");
-    }
 
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.toast_custom_view);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+
+        getWinBollActivityManager().setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
+    }
 }

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

@@ -1,98 +1,26 @@
 package cc.winboll.studio.app;
 
+import android.app.Activity;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.shared.app.WinBollActivity;
-import cc.winboll.studio.shared.app.WinBollActivityManager;
-import cc.winboll.studio.shared.app.WinBollApplication;
-import cc.winboll.studio.shared.log.LogUtils;
-import cc.winboll.studio.shared.util.UriUtils;
-import cc.winboll.studio.shared.view.StringToQrCodeView;
-import cc.winboll.studio.shared.view.YesNoAlertDialog;
-import cc.winboll.studio.unittest.UnitTestActivity;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.UUID;
+import cc.winboll.studio.app.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
 
-final public class MainActivity extends WinBollActivity {
+final public class MainActivity extends WinBollActivity implements IWinBollActivity {
 
 	public static final String TAG = "MainActivity";
 
-    public static final int REQUEST_HOME_ACTIVITY = 0;
-    public static final int REQUEST_ABOUT_ACTIVITY = 1;
+    Toolbar mToolbar;
 
     @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
-        if (prosessIntents(getIntent())) return;
-        // 以下正常创建主窗口
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        // 设置 WinBoll 应用 UI 类型
-        WinBollApplication.setWinBollUI_TYPE(WinBollApplication.WinBollUI_TYPE.Aplication);
-        //ToastUtils.show("WinBollUI_TYPE " + WinBollApplication.getWinBollUI_TYPE());
-        LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        setSubTitle("");
-    }
-
-    //
-    // 处理传入的 Intent 数据
-    //
-    boolean prosessIntents(Intent intent) {
-        if (intent == null 
-            || intent.getAction() == null
-            || intent.getAction().equals(""))
-            return false;
-
-        if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) {
-            try {
-                WinBollActivity clazzActivity = UnitTestActivity.class.newInstance();
-                String tag = clazzActivity.getTag();
-                LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
-                Intent subIntent = new Intent(this, UnitTestActivity.class);
-                subIntent.setAction(intent.getAction());
-                File file = new File(getCacheDir(), UUID.randomUUID().toString());
-                //取出文件uri
-                Uri uri = intent.getData();
-                if (uri == null) {
-                    uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-                }
-                //获取文件真实地址
-                String szSrcPath = UriUtils.getFileFromUri(getApplication(), uri);
-                if (TextUtils.isEmpty(szSrcPath)) {
-                    return false;
-                }
-
-                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
-                //startWinBollActivity(subIntent, tag);
-                WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class);
-            } catch (IllegalAccessException | InstantiationException | IOException e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                // 函数处理异常返回失败
-                return false;
-            }
-        } else {
-            LogUtils.d(TAG, "prosessIntents|" + intent.getAction() + "|yet");
-            return false;
-        }
-        return true;
+    public Activity getActivity() {
+        return this;
     }
 
     @Override
@@ -100,10 +28,25 @@ final public class MainActivity extends WinBollActivity {
         return TAG;
     }
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreate(Bundle savedInstanceState)");
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(TAG);
+    }
 
     @Override
-    protected boolean isAddWinBollToolBar() {
-        return true;
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
     }
 
     @Override
@@ -116,7 +59,7 @@ final public class MainActivity extends WinBollActivity {
 
             @Override
             public void onYes() {
-                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+                App.getWinBollActivityManager().finishAll();
             }
 
             @Override
@@ -126,43 +69,23 @@ final public class MainActivity extends WinBollActivity {
         YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener);
     }
 
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activitymainToolbar1);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_winboll_app_main, menu);
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.item_unittest) {
-            WinBollActivityManager.getInstance(this).startWinBollActivity(this, UnitTestActivity.class);
+        if (item.getItemId() == R.id.item_log) {
+            App.getWinBollActivityManager().startLogActivity(this);
+        } else if (item.getItemId() == R.id.item_about) {
+            App.getWinBollActivityManager().startWinBollActivity(this, AboutActivity.class);
         } else if (item.getItemId() == R.id.item_exit) {
             exit();
             return true;
         }
         return super.onOptionsItemSelected(item);
     }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (resultCode) {
-            case REQUEST_HOME_ACTIVITY : {
-                    LogUtils.d(TAG, "REQUEST_HOME_ACTIVITY");
-                    break;
-                }
-            case REQUEST_ABOUT_ACTIVITY : {
-                    LogUtils.d(TAG, "REQUEST_ABOUT_ACTIVITY");
-                    break;
-                }
-            default : {
-                    super.onActivityResult(requestCode, resultCode, data);
-                }
-        }
-    }
 }

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

@@ -0,0 +1,66 @@
+package cc.winboll.studio.app;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/01 12:55:32
+ * @Describe 应用窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libaes.beans.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+
+public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
+
+    public static final String TAG = "WinBollActivity";
+
+    protected volatile AESThemeBean.ThemeType mThemeType;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        mThemeType = getThemeType();
+        super.onCreate(savedInstanceState);
+        App.getWinBollActivityManager().add(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        App.getWinBollActivityManager().registeRemove(this);
+    }
+    
+    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);
+    }
+}

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <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>

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

@@ -5,10 +5,10 @@
 	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"/>
+    <cc.winboll.studio.libaes.views.ASupportToolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		xmlns:app="http://schemas.android.com/apk/res-auto"

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

@@ -1,6 +1,9 @@
 <?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_log"
+        android:title="Log"/>
     <item
         android:id="@+id/item_about"
         android:title="About"/>

app/src/main/res/menu/toolbar_winboll_app_main.xml

@@ -1,5 +0,0 @@
-<?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">
-
-</menu>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">WinBoll-APP</string>
+    <string name="app_name">APP</string>
 
 </resources>

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

apputils/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.apputils"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "9.2" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,15 +41,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }
 
 dependencies {
 	api project(':libapputils')
-    api 'cc.winboll.studio:libappbase:1.0.3'
     api fileTree(dir: 'libs', include: ['*.jar'])
 }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Jan 18 13:03:10 HKT 2025
+#Sat Mar 29 12:14:55 HKT 2025
 stageCount=2
 libraryProject=libapputils
-baseVersion=9.2
-publishVersion=9.2.1
+baseVersion=15.2
+publishVersion=15.2.1
 buildCount=0
-baseBetaVersion=9.2.2
+baseBetaVersion=15.2.2

apputils/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_winboll"
         android:label="@string/app_name"
-        android:theme="@style/WinBoll.SupportThemeNoActionBar"
+        android:theme="@style/MyUtilsTheme"
         android:supportsRtl="true">
 
         <activity
@@ -27,9 +27,13 @@
 
         </activity>
 
-        <activity android:name=".TestWinBollActivity"/>
+        <activity android:name=".TestStringToQRCodeViewActivity"/>
 
-        <activity android:name=".TestStringToQrCodeViewActivity"/>
+        <activity android:name=".TestBBMorseCodeActivity"/>
+
+        <activity android:name=".AssetsHtmlActivity"/>
+
+        <activity android:name=".QRCodeDecodeActivity"/>
 
     </application>
 

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

@@ -5,27 +5,16 @@ package cc.winboll.studio.apputils;
  * @Date 2024/12/08 15:10:51
  * @Describe 全局应用类
  */
-import android.view.Gravity;
-import cc.winboll.studio.libapputils.app.WinBollApplication;
-import com.hjq.toast.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
+import android.app.Application;
+import android.content.Context;
+import cc.winboll.studio.libappbase.GlobalApplication;
 
-public class App extends WinBollApplication {
+public class App extends GlobalApplication {
 
     public static final String TAG = "App";
 
-    public static final String _ACTION_DEBUGVIEW = WinBollApplication.class.getName() + "_ACTION_DEBUGVIEW";
-
     @Override
     public void onCreate() {
         super.onCreate();
-        // 初始化 Toast 框架
-        //
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
-
 }

apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java

@@ -1,59 +1,53 @@
-package cc.winboll.studio.libapputils.activities;
+package cc.winboll.studio.apputils;
 
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2025/01/03 11:02:49
  * @Describe 一个可以浏览随 APP 附带的 Html 文档的窗口
  */
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libapputils.R;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
-import cc.winboll.studio.libapputils.log.LogUtils;
-import cc.winboll.studio.libapputils.view.SimpleWebView;
-import com.hjq.toast.ToastUtils;
+import android.widget.Toolbar;
+import cc.winboll.studio.apputils.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libapputils.views.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;
-import android.os.PersistableBundle;
 
-public class AssetsHtmlActivity extends WinBollActivity {
+public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollActivity {
 
-    public static final String TAG = "AssetsHtmlActivity";
-    
-    public static final String EXTRA_HTMLFILENAME = "EXTRA_HTMLFILENAME";
-    
-    String mszHelpIndexFilePath = "";
-    Uri mszHelpIndexFileUri;
-    Context mContext;
-
-    // Assets 文件夹里的 Html 文件的名称
-    String mszHtmlFileName;
+    @Override
+    public Activity getActivity() {
+        return super.getActivity();
+    }
 
     @Override
     public String getTag() {
         return TAG;
     }
 
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
 
+    public static final String TAG = "AssetsHtmlActivity";
 
-    @Override
-    protected boolean isAddWinBollToolBar() {
-        return false;
-    }
+    public static final String EXTRA_HTMLFILENAME = "EXTRA_HTMLFILENAME";
 
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activityassetshtmlToolbar1);
-    }
+    String mszHelpIndexFilePath = "";
+    Uri mszHelpIndexFileUri;
+    Context mContext;
+
+    // Assets 文件夹里的 Html 文件的名称
+    String mszHtmlFileName;
+//
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -73,6 +67,10 @@ public class AssetsHtmlActivity extends WinBollActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_assetshtml);
 
+        // 初始化工具栏
+        Toolbar mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+
         mszHtmlFileName = "index.html";
 
         Intent intent = getIntent();
@@ -81,7 +79,7 @@ public class AssetsHtmlActivity extends WinBollActivity {
             if (szTemp != null && !szTemp.trim().equals("")) {
                 mszHtmlFileName = szTemp.trim();
             }
-            ToastUtils.show(mszHtmlFileName);
+            //ToastUtils.show(mszHtmlFileName);
         }
 
         // 与其他应用分享 html 帮助
@@ -107,13 +105,6 @@ public class AssetsHtmlActivity extends WinBollActivity {
 //        myWebView.loadUrl(mszHelpIndexFileUri.toString());
     }
 
-    @Override
-    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
-        super.onPostCreate(savedInstanceState, persistentState);
-        setSubTitle(mszHtmlFileName);
-        //setSubTitle(TAG);
-    }
-
     //
     void initWebViewFromAssets(String szHtmlFileName) {
         try {

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

@@ -1,38 +1,60 @@
 package cc.winboll.studio.apputils;
 
+import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
-import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.log.LogActivity;
-import cc.winboll.studio.libapputils.log.LogUtils;
-import com.hjq.toast.ToastUtils;
+import android.widget.Toolbar;
+import cc.winboll.studio.apputils.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import java.util.List;
+import java.util.Set;
 
-final public class MainActivity extends WinBollActivity {
+final public class MainActivity extends Activity {
 
 	public static final String TAG = "MainActivity";
 
     public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
 
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
+    Toolbar mToolbar;
+    LogView mLogView;
+//
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        //Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
-        //setActionBar(toolbar);
+        mLogView = findViewById(R.id.logview);
+        mLogView.start();
+
+        // 初始化工具栏
+        mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+//        if (isEnableDisplayHomeAsUp()) {
+//            // 显示后退按钮
+//            getActionBar().setDisplayHomeAsUpEnabled(true);
+//        }
+//        getActionBar().setSubtitle(getTag());
+
+        checkResolveActivity();
+        archiveInstance();
+
+
 
         // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
         //if (prosessIntents(getIntent())) return;
@@ -44,44 +66,94 @@ final public class MainActivity extends WinBollActivity {
 //        LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG));
     }
 
+    boolean checkResolveActivity() {
+        PackageManager packageManager = getPackageManager();
+        //Intent intent = new Intent("your_action_here");
+        Intent intent = getIntent();
+        if (intent != null) {
+            List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+            if (resolveInfoList.size() > 0) {
+                // 传入的Intent action在Activity清单的intent-filter的action节点里有定义
+                if (intent.getAction() != null) {
+//                    if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) {
+//                        App.setIsDebug(true);
+//                        //ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction());
+//
+//                    }
+                }
+                return true;
+            } else {
+                // 传入的Intent action在Activity清单的intent-filter的action节点里没有定义
+                //ToastUtils.show("false : " + intent.getAction());
+                return false;
+            }
+
+        }
+
+        // action在清单文件中没有声明
+        ToastUtils.show("false");
+        return false;
+    }
+
+    void archiveInstance() {
+        Intent intent = getIntent();
+        StringBuilder sb = new StringBuilder("\n### Archive Instance ###\n");
+
+        if (intent != null) {
+            ComponentName componentName = intent.getComponent();
+            if (componentName != null) {
+                String packageName = componentName.getPackageName();
+                //Log.d("AppStarter", "启动本应用的应用包名: " + packageName);
+                sb.append("启动本应用的应用包名: \n" + packageName);
+            }
+
+            sb.append("\nImplicit Intent Tracker ：\n接收到的 Intent 动作: \n" + intent.getAction());
+            Set<String> categories = intent.getCategories();
+            if (categories != null) {
+                for (String category : categories) {
+                    sb.append("\n接收到的 Intent 类别 :\n" + category);
+                }
+            }
+            Uri data = intent.getData();
+            if (data != null) {
+                sb.append("\n接收到的 Intent 数据 :\n" + data.toString());
+            }
+        } else {
+            sb.append("Intent is null.");
+        }
+        sb.append("\n\n");
+        LogUtils.d(TAG, sb.toString());
+    }
+
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        // 缓存当前 activity
+        //WinBollActivityManager.getInstance(this).add(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        //WinBollActivityManager.getInstance(this).registeRemove(this);
+        super.onDestroy();
+    }
+
     public void onTestLogClick(View view) {
         LogUtils.d(TAG, "onTestLogClick");
         Toast.makeText(getApplication(), "onTestLogClick", Toast.LENGTH_SHORT).show();
     }
 
-    public void onLogUtilsClick(View view) {
-        Intent intent = new Intent(this, LogActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-        startActivity(intent);
-    }
+    public void onTestLogActivity(View view) {
+//        Intent intent = new Intent(this, LogActivity.class);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+//        startActivity(intent);
 
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-//        setSubTitle("");
+        //WinBollActivityManager.getInstance().printAvtivityListInfo();
+        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
     }
 
-    @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);
-//    }
-
     //
     // 处理传入的 Intent 数据
     //
@@ -125,58 +197,107 @@ final public class MainActivity extends WinBollActivity {
         return true;
     }
 
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected boolean isAddWinBollToolBar() {
-        return true;
-    }
-
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activitymainToolbar1);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        //ToastUtils.show("onCreateOptionsMenu");
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
+//        if (isAddWinBollToolBar()) {
+//            //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()");
+//            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
+//        }
+        if (App.isDebuging()) {
+            getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
+        }
+
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.item_testwinboll) {
-            WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestWinBollActivity.class);
+        if (item.getItemId() == R.id.item_exit) {
+            //exit();
+            return true;
         } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
-            WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
+            Intent intent = new Intent(this, TestStringToQRCodeViewActivity.class);
+            startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
+            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
         } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
             Intent intent = new Intent(this, QRCodeDecodeActivity.class);
             startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
+        } else if (item.getItemId() == R.id.item_testcrashreport) {
+            for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
+                getString(i);
+            }
+            return true;
+        } else if (item.getItemId() == R.id.item_log) {
+            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
+            return true;
+        } else if (item.getItemId() == R.id.item_exitdebug) {
+            //AboutView.setApp2NormalMode(this);
+            return true;
+        } else if (item.getItemId() == android.R.id.home) {
+            //WinBollActivityManager.getInstance(this).finish(this);
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    public void onTestJavascriptHtmlActivity(View view) {
+//    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 void onBackPressed() {
+//        if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) {
+//            exit();
+//        } else {
+//            WinBollActivityManager.getInstance(this).finish(this);
+//            super.onBackPressed();
+//        }
+    }
+
+    
+    public void onTestAssetsHtmlActivity(View view) {
         Intent intent = new Intent(this, AssetsHtmlActivity.class);
         intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        startActivity(intent);
+        //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case REQUEST_QRCODEDECODE_ACTIVITY : {
-                    String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
-                    ToastUtils.show(text);
-                    break;
-                }
-            default : {
-                    ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
-                    super.onActivityResult(requestCode, resultCode, data);
-                }
-        }
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
     }
+
+    /*@Override
+     protected void onActivithyResult(int requestCode, int resultCode, Intent data) {
+     switch (requestCode) {
+     case REQUEST_QRCODEDECODE_ACTIVITY : {
+     if (data != null) {
+     String text = data.getStringExtra(QRCodeDecodeActivity.EXTRA_RESULT);
+     ToastUtils.show(text);
+     }
+     break;
+     }
+     default : {
+     //ToastUtils.show(String.format("%d, %d", requestCode, resultCode));
+     super.prosessActivityResult(requestCode, resultCode, data);
+     }
+     }
+     }*/
 }

apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java

@@ -1,72 +1,59 @@
-package cc.winboll.studio.libapputils.activities;
+package cc.winboll.studio.apputils;
 
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2025/01/18 10:32:21
  * @Describe 二维码扫码解码窗口
  */
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.widget.TextView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import cc.winboll.studio.libapputils.R;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
+import android.widget.Toolbar;
+import cc.winboll.studio.apputils.R;
 import com.google.zxing.ResultPoint;
 import com.journeyapps.barcodescanner.BarcodeCallback;
 import com.journeyapps.barcodescanner.BarcodeResult;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 import java.util.List;
 
-public class QRCodeDecodeActivity extends WinBollActivity {
+public class QRCodeDecodeActivity extends Activity {
 
     public static final String TAG = "QRCodeDecodeActivity";
-    public static final String EXTRA_RESULT = "EXTRA_RESULT";
 
+    public static final String EXTRA_RESULT = "EXTRA_RESULT";
     private static final int REQUEST_CAMERA_PERMISSION = 1;
+
     TextView resultTextView;
     DecoratedBarcodeView barcodeView;
-    
-    @Override
-    public String getTag() {
-        return TAG;
-    }
 
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-
-    @Override
-    protected boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activityqrcodedecodeToolbar1);
-    }
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_qrcodedecode);
-        resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
+
+        // 初始化工具栏
+//        Toolbar mToolbar = findViewById(R.id.toolbar);
+//        setActionBar(mToolbar);
+
+        //resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
         barcodeView = findViewById(R.id.activityqrcodedecodeDecoratedBarcodeView1);
         // 请求相机权限
-        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
-            != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this,
-                                              new String[]{android.Manifest.permission.CAMERA},
-                                              REQUEST_CAMERA_PERMISSION);
-        } else {
-            startScanning();
-        }
-
-        
+//        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
+//            != PackageManager.PERMISSION_GRANTED) {
+//            ActivityCompat.requestPermissions(this,
+//                                              new String[]{android.Manifest.permission.CAMERA},
+//                                              REQUEST_CAMERA_PERMISSION);
+//        } else {
+//            startScanning();
+//        }
+        startScanning();
     }
 
     private void startScanning() {

apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java

@@ -0,0 +1,20 @@
+package cc.winboll.studio.apputils;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/23 16:14:45
+ */
+import android.app.Activity;
+import android.os.Bundle;
+
+public class TestBBMorseCodeActivity extends Activity {
+
+    public static final String TAG = "TestBBMorseCodeActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_testbbmorsecode);
+
+    }
+}

apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java

@@ -1,50 +0,0 @@
-package cc.winboll.studio.apputils;
-
-import android.os.Bundle;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
-import cc.winboll.studio.libapputils.view.StringToQrCodeView;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/01/17 19:50:46
- */
-public class TestStringToQrCodeViewActivity extends WinBollActivity {
-    
-    public static final String TAG = "TestStringToQrCodeViewActivity";
-    
-    StringToQrCodeView mStringToQrCodeView;
-    
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
-    }
-
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-    @Override
-    protected boolean isAddWinBollToolBar() {
-        return true;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_teststringtoqrcodeview);
-        mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        setSubTitle(TAG);
-    }
-}

apputils/src/main/java/cc/winboll/studio/apputils/TestWinBollActivity.java

@@ -1,52 +0,0 @@
-package cc.winboll.studio.apputils;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/01/13 15:09:46
- */
-public class TestWinBollActivity extends WinBollActivity {
-
-    public static final String TAG = "TestWinBollActivity";
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected Toolbar initToolBar() {
-        return findViewById(R.id.activitytestwinbollToolbar1);
-    }
-
-    @Override
-    protected boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-    @Override
-    protected boolean isAddWinBollToolBar() {
-        return true;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_testwinboll);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        setSubTitle(TAG);
-    }
-    
-    
-}

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

@@ -0,0 +1,52 @@
+package cc.winboll.studio.apputils;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/28 17:11:37
+ * @Describe 应用活动窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.v7.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+
+public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity {
+
+    public static final String TAG = "WinBollActivityBase";
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    WinBollActivityManager getWinBollActivityManager() {
+        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWinBollActivityManager().add(this);
+    }
+
+    @Override
+    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
+        super.onPostCreate(savedInstanceState, persistentState);
+    }
+
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        getWinBollActivityManager().registeRemove(this);
+    }
+}

apputils/src/main/res/layout/activity_assetshtml.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/toolbar"/>
+
+    <cc.winboll.studio.libapputils.views.SimpleWebView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1.0"
+        android:id="@+id/activityassetshtmlSimpleWebView1"/>
+
+</LinearLayout>
+

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

@@ -5,10 +5,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.appcompat.widget.Toolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activitymainToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -27,32 +27,39 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="TestLog"
-                android:textAllCaps="false"
+				android:textAllCaps="false"
 				android:onClick="onTestLogClick"/>
 
 			<Button
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="LogUtils"
+				android:text="TestLogActivity"
 				android:textAllCaps="false"
-				android:onClick="onLogUtilsClick"/>
+				android:onClick="onTestLogActivity"/>
 
 		</LinearLayout>
 
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="right">
+		<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:textAllCaps="false"
-                android:text="Test Javascript Html Activity"
-                android:onClick="onTestJavascriptHtmlActivity"/>
+			<Button
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAllCaps="false"
+				android:text="TestAssetsHtmlActivity"
+				android:onClick="onTestAssetsHtmlActivity"/>
 
-        </LinearLayout>
+		</LinearLayout>
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:text="Button"
+			android:id="@+id/logview"
+			android:layout_weight="1.0"/>
 
 	</LinearLayout>
 

apputils/src/main/res/layout/activity_qrcodedecode.xml

@@ -0,0 +1,20 @@
+<?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">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="QRCodeDecodeActivity"/>
+
+    <com.journeyapps.barcodescanner.DecoratedBarcodeView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/activityqrcodedecodeDecoratedBarcodeView1"/>
+
+</LinearLayout>
+

apputils/src/main/res/layout/activity_testbbmorsecode.xml

@@ -0,0 +1,9 @@
+<?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>

apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml

@@ -6,10 +6,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.appcompat.widget.Toolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activityteststringtoqrcodeviewToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		android:orientation="vertical"
@@ -17,7 +17,7 @@
 		android:layout_height="0dp"
 		android:layout_weight="1.0">
 
-		<cc.winboll.studio.libapputils.view.StringToQrCodeView
+		<cc.winboll.studio.libapputils.views.StringToQrCodeView
 			android:layout_width="300dp"
 			android:layout_height="300dp"
 			android:id="@+id/activityteststringtoqrcodeviewStringToQrCodeView1"/>

apputils/src/main/res/layout/activity_testwinboll.xml

@@ -7,7 +7,7 @@
 	android:layout_height="match_parent"
 	android:background="#FF36B5B3">
 
-	<androidx.appcompat.widget.Toolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/activitytestwinbollToolbar1"/>

apputils/src/main/res/layout/view_toast.xml

@@ -1,32 +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="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/shape_gradient"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="10dp">
-    
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:src="@drawable/ic_launcher"/>
-
-        <TextView
-            android:id="@android:id/message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:textColor="#FF000000"
-            android:textSize="16sp"/>
-
-    </LinearLayout>
-
-</LinearLayout>

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

@@ -1,16 +1,13 @@
 <?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_testwinboll"
-        android:title="TestWinBollActivity"
-        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/item_teststringtoqrcodeview"
-        android:title="TestStringToQrCodeViewActivity"
-        app:showAsAction="ifRoom"/>
+        android:title="TestStringToQRCodeViewActivity"/>
     <item
         android:id="@+id/item_testqrcodedecodeactivity"
-        android:title="TestQRCodeDecodeActivity"
-        app:showAsAction="ifRoom"/>
+        android:title="TestQRCodeDecodeActivity"/>
+    <item
+        android:id="@+id/item_testcrashreport"
+        android:title="TestCrashReportActivity"/>
 </menu>

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

@@ -4,7 +4,4 @@
     <color name="colorPrimary">#FF196ABC</color>
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>
-    <color name="colorToastFrame">#FFA9A9A9</color>
-    <color name="colorToastShadow">#FF000000</color>
-    <color name="colorToastBackgroung">#FFFFFFFF</color>
 </resources>

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

@@ -1,3 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <style name="MyUtilsTheme" parent="UtilsTheme">
+        <item name="attrColorPrimary">@color/colorPrimary</item>
+        <item name="themeGlobalCrashActivity">@style/MyUtilsGlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="MyUtilsGlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+        <item name="colorTittle">#FFF2F2F2</item>
+        <item name="colorTittleBackgound">#FF55ABF8</item>
+        <item name="colorText">#FF55ABF8</item>
+        <item name="colorTextBackgound">#FFF2F2F2</item>
+	</style>
 </resources>

autoinstaller/build.gradle

@@ -18,18 +18,18 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.autoinstaller"
-        minSdkVersion 24
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 2
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "5.0" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,30 +41,33 @@ 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.1.0'
-    api 'io.github.medyo:android-about-page:2.0.0'
-    api 'com.github.getActivity:ToastUtils:10.5'
-    api 'com.jcraft:jsch:0.1.55'
-    api 'org.jsoup:jsoup:1.13.1'
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'androidx.fragment:fragment:1.0.0'
-    api 'com.google.android.material:material:1.0.0'
-    
-    api 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
-    api 'androidx.lifecycle:lifecycle-livedata:1.0.0'
-    
-    //api 'cc.winboll.studio:libaes:6.3.2'
-    //api 'cc.winboll.studio:libapputils:8.3.8'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // 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.github.getActivity:ToastUtils:10.5'
+    // 网络连接类库
+    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:libaes:15.2.5'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 02:39:56 HKT 2025
-stageCount=4
+#Wed Apr 02 21:25:51 HKT 2025
+stageCount=1
 libraryProject=
-baseVersion=5.0
-publishVersion=5.0.3
+baseVersion=15.2
+publishVersion=15.2.0
 buildCount=0
-baseBetaVersion=5.0.4
+baseBetaVersion=15.2.1

autoinstaller/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
         android:persistent="true"
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.Application">
+        android:theme="@style/MyAppTheme">
 
         <activity
             android:name=".MainActivity"

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

@@ -6,21 +6,22 @@ package cc.winboll.studio.autoinstaller;
  * @Describe 全局应用类
  */
 import android.view.Gravity;
+import cc.winboll.studio.autoinstaller.R;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
-import cc.winboll.studio.shared.app.WinBollApplication;
 
-public class App extends WinBollApplication {
+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.toast_custom_view);
+        ToastUtils.setView(R.layout.view_toast);
         //ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/FileListener.java

@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller;
 
 import android.os.FileObserver;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class FileListener extends FileObserver {
 	public final static String TAG = "FileListener";

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

@@ -12,15 +12,15 @@ import android.widget.RadioButton;
 import android.widget.SimpleAdapter;
 import android.widget.Switch;
 import android.widget.TextClock;
-import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
-import cc.winboll.studio.shared.log.LogView;
 import cc.winboll.studio.autoinstaller.MainActivity;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.APKModel;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
 import cc.winboll.studio.autoinstaller.views.ListViewForScrollView;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
 import java.util.ArrayList;
@@ -31,7 +31,8 @@ public class MainActivity extends Activity {
     public static final String TAG = "MainActivity";
 
     private static final int INSTALL_PERMISSION_CODE = 1;
-
+    
+    ArrayList<APKModel> _APKModelList = new ArrayList<APKModel>();
     LogView mLogView;
     TextClock mTextClock;
     EditText mEditText;
@@ -131,14 +132,24 @@ public class MainActivity extends Activity {
 
     }
 
+    String getLastApkPackageName() {
+        APKModel.loadBeanList(this, _APKModelList, APKModel.class);
+        if (_APKModelList.size() > 0) {
+            return _APKModelList.get(_APKModelList.size() - 1).getApkPackageName();
+        }
+        return "";
+    }
+
     public void onOpenAPP(View view) {
-        if (mszInstalledPackageName.trim().equals("")) {
+        String szInstalledPackageName = getLastApkPackageName();
+        if (szInstalledPackageName.trim().equals("")) {
             ToastUtils.show("Installed APP package name is null.");
             return;
         }
 
         Intent intent = getPackageManager().getLaunchIntentForPackage(mszInstalledPackageName);
         if (intent != null) {
+            //ToastUtils.show("startActivity");
             startActivity(intent);
         } else {
             // 若没能获取到启动意图，可进行相应提示等操作，比如跳转到应用商店让用户下载该应用（示例）
@@ -195,7 +206,7 @@ public class MainActivity extends Activity {
             //
             if (szFilePath.trim().equals("")) {
                 sw.setChecked(false);
-                Toast.makeText(getApplication(), "监控路径为空。", Toast.LENGTH_SHORT).show();
+                ToastUtils.show("监控路径为空。");
                 return;
             }
 
@@ -251,8 +262,6 @@ public class MainActivity extends Activity {
         Intent intentService = new Intent(MainActivity.this, MainService.class);
         //intentService.putExtra(MainService.EXTRA_APKFILEPATH, szAPKFilePath);
         startService(intentService);
-
-
     }
 
     /*

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java

@@ -1,56 +1,57 @@
-package cc.winboll.studio.libapputils.bean;
+package cc.winboll.studio.autoinstaller.models;
 
 /**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/12/25 12:38:07
- * @Describe 应用调试配置类
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/02 20:50:29
+ * @Describe 监控的 APK 安装文件对应的应用信息数据模型
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-public class DebugBean extends BaseBean {
+public class APKModel extends BaseBean {
 
-    public static final String TAG = "DebugBean";
+    public static final String TAG = "APPModel";
 
-    // 应用是否处于正在调试状态
-    //
-    boolean isDebuging = false;
-    
-    public DebugBean() {
-        this.isDebuging = false;
+    // 每次更新的 APK 文件对应的应用包名称
+    String apkPackageName;
+
+    public APKModel() {
+        this.apkPackageName = "";
     }
 
-    public DebugBean(boolean isDebuging) {
-        this.isDebuging = isDebuging;
+    public APKModel(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
     }
 
-    public void setIsDebuging(boolean isDebuging) {
-        this.isDebuging = isDebuging;
+    public void setApkPackageName(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
     }
 
-    public boolean isDebuging() {
-        return isDebuging;
+    public String getApkPackageName() {
+        return apkPackageName;
     }
 
+
+
     @Override
     public String getName() {
-        return DebugBean.class.getName();
+        return APKModel.class.getName();
     }
 
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        DebugBean bean = this;
-        jsonWriter.name("isDebuging").value(bean.isDebuging());
+        jsonWriter.name("appPackageName").value(getApkPackageName());
 
     }
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("isDebuging")) {
-                setIsDebuging(jsonReader.nextBoolean());
+            if (name.equals("appPackageName")) {
+                setApkPackageName(jsonReader.nextString());
             } else {
                 return false;
             }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.autoinstaller.beans;
+package cc.winboll.studio.autoinstaller.models;
 
 /**
  * @Author ZhanGSKen@QQ.COM
@@ -8,13 +8,13 @@ package cc.winboll.studio.autoinstaller.beans;
 import android.content.Context;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.FileUtil;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.IOException;
 import java.io.Serializable;
 import java.io.StringReader;
 import java.io.StringWriter;
-import cc.winboll.studio.shared.log.LogUtils;
 
 public class AppConfigs implements Serializable {
 

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

@@ -4,9 +4,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 /**
  * @Author ZhanGSKen@QQ.COM

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

@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;
 
 /**

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

@@ -12,23 +12,26 @@ import android.os.IBinder;
 import android.os.Message;
 import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
 import cc.winboll.studio.autoinstaller.FileListener;
 import cc.winboll.studio.autoinstaller.MainActivity;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.APKModel;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.AssistantService;
 import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
 import cc.winboll.studio.autoinstaller.utils.PackageUtil;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;
+import cc.winboll.studio.libappbase.LogUtils;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 
 public class MainService extends Service {
 
     public static String TAG = "MainService";
 
+    ArrayList<APKModel> _APKModelList = new ArrayList<APKModel>();
     private static boolean _mIsServiceAlive;
     //String mszAPKFilePath;
     //String mszAPKFileName;
@@ -75,6 +78,7 @@ public class MainService extends Service {
                 startWatchingFile(appConfigs.getWatchingFilePath());
 
                 LogUtils.d(TAG, "running...");
+                ToastUtils.show("running...");
 
             } else {
                 LogUtils.d(TAG, "_mIsServiceAlive is " + Boolean.toString(_mIsServiceAlive));
@@ -176,6 +180,9 @@ public class MainService extends Service {
     // 调用[应用信息查看器]打开应用包
     //
     private void installAPK(String szAPKFilePath) {
+        String szAPKPackageName = PackageUtil.getPackageNameFromApk(this, szAPKFilePath);
+        saveAPKInfo(szAPKPackageName);
+        
         long nTimeNow = System.currentTimeMillis();
         /*SimpleDateFormat dateFormat = new SimpleDateFormat(
          "yyyy-MM-dd HH:mm:ss", Locale.getDefault());
@@ -210,15 +217,24 @@ public class MainService extends Service {
     //
     void installAPK2(String szAPKFilePath) {
         LogUtils.d(TAG, "installAPK2()");
+        String szAPKPackageName = PackageUtil.getPackageNameFromApk(this, szAPKFilePath);
+        saveAPKInfo(szAPKPackageName);
+        
         Intent intent = new Intent(this, MainActivity.class);
         intent.setAction(MainActivity.ACTION_NEW_INSTALLTASK);
-        intent.putExtra(MainActivity.EXTRA_INSTALLED_PACKAGENAME, PackageUtil.getPackageNameFromApk(this, szAPKFilePath));
+        intent.putExtra(MainActivity.EXTRA_INSTALLED_PACKAGENAME, szAPKPackageName);
         intent.putExtra(MainActivity.EXTRA_INSTALLED_APKFILEPATH, szAPKFilePath);
         // Intent.ACTION_VIEW);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         this.startActivity(intent);
     }
 
+    void saveAPKInfo(String szApkPackageName) {
+        APKModel.loadBeanList(this, _APKModelList, APKModel.class);
+        _APKModelList.add(new APKModel(szApkPackageName));
+        APKModel.saveBeanList(this, _APKModelList, APKModel.class);
+    }
+
     // 
     //
     static class MyHandler extends Handler {

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java

@@ -8,7 +8,7 @@ package cc.winboll.studio.autoinstaller.utils;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class PackageUtil {
 

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

@@ -132,7 +132,7 @@
 
 	</LinearLayout>
 
-	<cc.winboll.studio.shared.log.LogView
+	<cc.winboll.studio.libappbase.LogView
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="200dp"

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

@@ -0,0 +1,13 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="MyAppTheme" parent="APPBaseTheme">
+        <item name="attrColorPrimary">@color/colorPrimary</item>
+        <item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme">
+        <item name="colorTittle">#FFFFFFFF</item>
+        <item name="colorTittleBackgound">#FF00A4B3</item>
+        <item name="colorText">#FFFFFFFF</item>
+        <item name="colorTextBackgound">#FF000000</item>
+	</style>
+</resources>

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

@@ -1,14 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Application" parent="android:Theme.Material.Light.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="android:colorPrimary">@color/purple_500</item>
-        
-        <!-- Secondary brand color. -->
-        <item name="android:colorSecondary">@color/teal_200</item>
-        
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/purple_700</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>

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