diff --git a/LICENSE-Private-Demo b/LICENSE-Private-Demo
new file mode 100644
index 0000000..dc5f366
--- /dev/null
+++ b/LICENSE-Private-Demo
@@ -0,0 +1,97 @@
+# WinBoLL 源码 LICENSE-Private-Demo 规范说明书
+
+# LICENSE-Private-Demo
+
+# WinBoLL 源码公共转私有继承开发规范守则
+
+## 核心声明
+
+本文档**唯一核心设计目的**：通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。
+
+## 一、文件宗旨与风险防控说明
+
+本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标：
+
+1. 严格隔离公共开源分支与私有开发分支，通过授权文件标记实现分支属性一眼可辨，杜绝人为操作混淆
+
+2. **重点防控人为操作导致的私有分支代码违规合并、回合、推送至公共 ****`winboll`**** 主流分支**，从流程上封堵合并风险
+
+3. 明确所有开发提交者的操作责任，违规合并公共分支的行为由操作人承担全部代码泄露、合规风险
+
+4. 规范私有分支初始化全流程，保证私有分支仅可单向同步公共分支更新，禁止任何反向代码流入公共分支
+
+## 二、公私分支授权标识文件定义（风控核心依据）
+
+### 1. 公共开源分支唯一标识
+
+**文件名：LICENSE**
+
+- 仅允许存在于公共主流分支 `winboll` 及官方公共衍生分支
+
+- 标识当前分支为**开源公开可贡献分支**，遵循原开源授权协议
+
+- **严禁私有分支内保留、恢复此文件**，出现即判定分支属性异常
+
+### 2. 私有开发分支唯一标识
+
+**文件名：LICENSE-Private**
+
+- 仅允许存在于私有开发分支，**绝对禁止出现在公共 ****`winboll`**** 分支**
+
+- 标识当前分支为**私有闭源分支**，代码仅限内部使用，禁止公开、禁止对外贡献
+
+- 为本分支私有属性的法定判定依据，也是禁止合并至公共分支的核心标记
+
+## 三、分支管理与合并风控规则（强制遵守）
+
+1. **公共主流分支**：固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。
+
+2. **私有开发分支**：统一从 `winboll` 分支检出，命名固定格式为 `private-demo-*`，与公共分支物理隔离。
+
+3. **核心合并风控铁则**
+
+    - 私有分支 → 公共分支：**永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**
+
+    - 公共分支 → 私有分支：允许正常拉取、同步上游更新，不影响私有开发迭代
+
+4. 所有仓库提交者、合并操作者，均视为已阅读并完全认可本规则，**人为执行私有分支向公共分支的合并操作，由操作人承担全部代码泄露、合规违约、项目安全风险**。
+
+## 四、公共转私有标准化操作步骤（锁死合并风险）
+
+请严格按顺序执行，每一步均为风控必要环节，不可跳过、不可修改顺序。
+
+1. 基于公共主流分支 `winboll`，新建私有开发分支，严格使用 `private-demo-*` 命名，从名称上明确分支私有属性，避免人为混淆。
+
+2. 本地仓库切换至新建私有分支，确认当前分支名称、检出来源无误。
+
+3. **永久删除项目根目录公共授权文件 ****`LICENSE`**，彻底移除公共分支标识，断绝误合并的标识漏洞。
+
+4. 将本规范文件 `LICENSE-Private-Demo` 复制并重命名为 `LICENSE-Private`，作为私有分支生效授权文件。
+
+5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**：
+
+    > 初始化私有开发分支，已切换私有授权文件，本分支禁止任何人为合并、推送至 winboll 公共分支
+    > 
+    > 
+
+6. 提交完成后，本分支正式转为私有开发状态，后续所有代码提交、分支合并、版本迭代，均严禁指向公共 `winboll` 分支。
+
+## 五、人为操作责任界定（核心补充条款）
+
+1. 本分支所有开发者、代码提交者、分支合并操作者，均视为**完全知晓本分支的私有属性与合并禁令**，自愿遵守本规范全部约束。
+
+2. **无论故意或过失，凡是人为执行私有分支向公共 ****`winboll`**** 分支的合并、推送、PR 提交、代码回合操作，全部责任由执行操作的本人独立承担**，项目方不承担任何因人为违规操作导致的代码泄露、开源合规、版本污染风险。
+
+3. 仓库管理员需严格校验合并请求的分支标识与授权文件，发现带有 `LICENSE-Private` 标记的分支申请合并至公共分支，一律直接拒绝，并记录操作人信息。
+
+4. 分支属性校验以根目录授权文件为唯一标准：只要分支内存在 `LICENSE-Private` 文件，就绝对禁止向公共分支发起任何合并操作。
+
+## 六、分支状态校验与异常处理
+
+- 合规公共分支：仅存在 `LICENSE`，无 `LICENSE-Private`
+
+- 合规私有分支：仅存在 `LICENSE-Private`，无 `LICENSE`
+
+- 异常状态：两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作
+
+> （注：文档部分内容可能由 AI 生成）
diff --git a/LICENSE-Private-Demo_docs/LICENSE-Private-Demo b/LICENSE-Private-Demo_docs/LICENSE-Private-Demo
new file mode 100644
index 0000000..dc5f366
--- /dev/null
+++ b/LICENSE-Private-Demo_docs/LICENSE-Private-Demo
@@ -0,0 +1,97 @@
+# WinBoLL 源码 LICENSE-Private-Demo 规范说明书
+
+# LICENSE-Private-Demo
+
+# WinBoLL 源码公共转私有继承开发规范守则
+
+## 核心声明
+
+本文档**唯一核心设计目的**：通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。
+
+## 一、文件宗旨与风险防控说明
+
+本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标：
+
+1. 严格隔离公共开源分支与私有开发分支，通过授权文件标记实现分支属性一眼可辨，杜绝人为操作混淆
+
+2. **重点防控人为操作导致的私有分支代码违规合并、回合、推送至公共 ****`winboll`**** 主流分支**，从流程上封堵合并风险
+
+3. 明确所有开发提交者的操作责任，违规合并公共分支的行为由操作人承担全部代码泄露、合规风险
+
+4. 规范私有分支初始化全流程，保证私有分支仅可单向同步公共分支更新，禁止任何反向代码流入公共分支
+
+## 二、公私分支授权标识文件定义（风控核心依据）
+
+### 1. 公共开源分支唯一标识
+
+**文件名：LICENSE**
+
+- 仅允许存在于公共主流分支 `winboll` 及官方公共衍生分支
+
+- 标识当前分支为**开源公开可贡献分支**，遵循原开源授权协议
+
+- **严禁私有分支内保留、恢复此文件**，出现即判定分支属性异常
+
+### 2. 私有开发分支唯一标识
+
+**文件名：LICENSE-Private**
+
+- 仅允许存在于私有开发分支，**绝对禁止出现在公共 ****`winboll`**** 分支**
+
+- 标识当前分支为**私有闭源分支**，代码仅限内部使用，禁止公开、禁止对外贡献
+
+- 为本分支私有属性的法定判定依据，也是禁止合并至公共分支的核心标记
+
+## 三、分支管理与合并风控规则（强制遵守）
+
+1. **公共主流分支**：固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。
+
+2. **私有开发分支**：统一从 `winboll` 分支检出，命名固定格式为 `private-demo-*`，与公共分支物理隔离。
+
+3. **核心合并风控铁则**
+
+    - 私有分支 → 公共分支：**永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**
+
+    - 公共分支 → 私有分支：允许正常拉取、同步上游更新，不影响私有开发迭代
+
+4. 所有仓库提交者、合并操作者，均视为已阅读并完全认可本规则，**人为执行私有分支向公共分支的合并操作，由操作人承担全部代码泄露、合规违约、项目安全风险**。
+
+## 四、公共转私有标准化操作步骤（锁死合并风险）
+
+请严格按顺序执行，每一步均为风控必要环节，不可跳过、不可修改顺序。
+
+1. 基于公共主流分支 `winboll`，新建私有开发分支，严格使用 `private-demo-*` 命名，从名称上明确分支私有属性，避免人为混淆。
+
+2. 本地仓库切换至新建私有分支，确认当前分支名称、检出来源无误。
+
+3. **永久删除项目根目录公共授权文件 ****`LICENSE`**，彻底移除公共分支标识，断绝误合并的标识漏洞。
+
+4. 将本规范文件 `LICENSE-Private-Demo` 复制并重命名为 `LICENSE-Private`，作为私有分支生效授权文件。
+
+5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**：
+
+    > 初始化私有开发分支，已切换私有授权文件，本分支禁止任何人为合并、推送至 winboll 公共分支
+    > 
+    > 
+
+6. 提交完成后，本分支正式转为私有开发状态，后续所有代码提交、分支合并、版本迭代，均严禁指向公共 `winboll` 分支。
+
+## 五、人为操作责任界定（核心补充条款）
+
+1. 本分支所有开发者、代码提交者、分支合并操作者，均视为**完全知晓本分支的私有属性与合并禁令**，自愿遵守本规范全部约束。
+
+2. **无论故意或过失，凡是人为执行私有分支向公共 ****`winboll`**** 分支的合并、推送、PR 提交、代码回合操作，全部责任由执行操作的本人独立承担**，项目方不承担任何因人为违规操作导致的代码泄露、开源合规、版本污染风险。
+
+3. 仓库管理员需严格校验合并请求的分支标识与授权文件，发现带有 `LICENSE-Private` 标记的分支申请合并至公共分支，一律直接拒绝，并记录操作人信息。
+
+4. 分支属性校验以根目录授权文件为唯一标准：只要分支内存在 `LICENSE-Private` 文件，就绝对禁止向公共分支发起任何合并操作。
+
+## 六、分支状态校验与异常处理
+
+- 合规公共分支：仅存在 `LICENSE`，无 `LICENSE-Private`
+
+- 合规私有分支：仅存在 `LICENSE-Private`，无 `LICENSE`
+
+- 异常状态：两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作
+
+> （注：文档部分内容可能由 AI 生成）
diff --git a/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.docx b/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.docx
new file mode 100644
index 0000000..0859049
Binary files /dev/null and b/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.docx differ
diff --git a/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.pdf b/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.pdf
new file mode 100644
index 0000000..10c3c11
Binary files /dev/null and b/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.pdf differ
diff --git a/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.txt b/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.txt
new file mode 100644
index 0000000..e191e48
--- /dev/null
+++ b/LICENSE-Private-Demo_docs/WinBoLL_源码_LICENSE-Private-Demo_规范说明书.txt
@@ -0,0 +1,97 @@
+# WinBoLL 源码 LICENSE\-Private\-Demo 规范说明书
+
+# LICENSE\-Private\-Demo
+
+# WinBoLL 源码公共转私有继承开发规范守则
+
+## 核心声明
+
+本文档**唯一核心设计目的**：通过文件标识、分支隔离、操作规范、责任界定四重约束，**从根源规避私有开发分支代码被人为合并、推送、提交至公共开源主流分支的风险**，明确人为操作失误、违规合并的全部责任归属，同时保证私有分支可正常同步、拉取公共主流分支的上游更新。
+
+## 一、文件宗旨与风险防控说明
+
+本文件为 WinBoLL 项目公共开源分支转为私有独立分支开发的**强制标准化操作手册与责任界定文件**，核心风控目标：
+
+1. 严格隔离公共开源分支与私有开发分支，通过授权文件标记实现分支属性一眼可辨，杜绝人为操作混淆
+
+2. **重点防控人为操作导致的私有分支代码违规合并、回合、推送至公共 ****`winboll`**** 主流分支**，从流程上封堵合并风险
+
+3. 明确所有开发提交者的操作责任，违规合并公共分支的行为由操作人承担全部代码泄露、合规风险
+
+4. 规范私有分支初始化全流程，保证私有分支仅可单向同步公共分支更新，禁止任何反向代码流入公共分支
+
+## 二、公私分支授权标识文件定义（风控核心依据）
+
+### 1\. 公共开源分支唯一标识
+
+**文件名：LICENSE**
+
+- 仅允许存在于公共主流分支 `winboll` 及官方公共衍生分支
+
+- 标识当前分支为**开源公开可贡献分支**，遵循原开源授权协议
+
+- **严禁私有分支内保留、恢复此文件**，出现即判定分支属性异常
+
+### 2\. 私有开发分支唯一标识
+
+**文件名：LICENSE\-Private**
+
+- 仅允许存在于私有开发分支，**绝对禁止出现在公共 ****`winboll`**** 分支**
+
+- 标识当前分支为**私有闭源分支**，代码仅限内部使用，禁止公开、禁止对外贡献
+
+- 为本分支私有属性的法定判定依据，也是禁止合并至公共分支的核心标记
+
+## 三、分支管理与合并风控规则（强制遵守）
+
+1. **公共主流分支**：固定为 `winboll`，为项目唯一开源主线，仅保留 `LICENSE` 文件，**禁止接收任何私有分支的合并、提交、推送请求**。
+
+2. **私有开发分支**：统一从 `winboll` 分支检出，命名固定格式为 `private\-demo\-\*`，与公共分支物理隔离。
+
+3. **核心合并风控铁则**
+
+    - 私有分支 → 公共分支：**永久禁止任何形式的合并、推送、PR 提交、代码回合，人为操作也绝不允许**
+
+    - 公共分支 → 私有分支：允许正常拉取、同步上游更新，不影响私有开发迭代
+
+4. 所有仓库提交者、合并操作者，均视为已阅读并完全认可本规则，**人为执行私有分支向公共分支的合并操作，由操作人承担全部代码泄露、合规违约、项目安全风险**。
+
+## 四、公共转私有标准化操作步骤（锁死合并风险）
+
+请严格按顺序执行，每一步均为风控必要环节，不可跳过、不可修改顺序。
+
+1. 基于公共主流分支 `winboll`，新建私有开发分支，严格使用 `private\-demo\-\*` 命名，从名称上明确分支私有属性，避免人为混淆。
+
+2. 本地仓库切换至新建私有分支，确认当前分支名称、检出来源无误。
+
+3. **永久删除项目根目录公共授权文件 ****`LICENSE`**，彻底移除公共分支标识，断绝误合并的标识漏洞。
+
+4. 将本规范文件 `LICENSE\-Private\-Demo` 复制并重命名为 `LICENSE\-Private`，作为私有分支生效授权文件。
+
+5. 将以上所有变更执行一次性 Git 提交，**提交信息必须固定使用以下内容，不可修改**：
+
+    > 初始化私有开发分支，已切换私有授权文件，本分支禁止任何人为合并、推送至 winboll 公共分支
+    > 
+    > 
+
+6. 提交完成后，本分支正式转为私有开发状态，后续所有代码提交、分支合并、版本迭代，均严禁指向公共 `winboll` 分支。
+
+## 五、人为操作责任界定（核心补充条款）
+
+1. 本分支所有开发者、代码提交者、分支合并操作者，均视为**完全知晓本分支的私有属性与合并禁令**，自愿遵守本规范全部约束。
+
+2. **无论故意或过失，凡是人为执行私有分支向公共 ****`winboll`**** 分支的合并、推送、PR 提交、代码回合操作，全部责任由执行操作的本人独立承担**，项目方不承担任何因人为违规操作导致的代码泄露、开源合规、版本污染风险。
+
+3. 仓库管理员需严格校验合并请求的分支标识与授权文件，发现带有 `LICENSE\-Private` 标记的分支申请合并至公共分支，一律直接拒绝，并记录操作人信息。
+
+4. 分支属性校验以根目录授权文件为唯一标准：只要分支内存在 `LICENSE\-Private` 文件，就绝对禁止向公共分支发起任何合并操作。
+
+## 六、分支状态校验与异常处理
+
+- 合规公共分支：仅存在 `LICENSE`，无 `LICENSE\-Private`
+
+- 合规私有分支：仅存在 `LICENSE\-Private`，无 `LICENSE`
+
+- 异常状态：两个文件同时存在 / 均不存在 → 立即停止开发与提交，按本规范重置分支状态，严禁执行任何合并操作
+
+> （注：文档部分内容可能由 AI 生成）
diff --git a/LICENSE-Private-Demo_docs/long_pic_1778650008421587_503089827979333.jpg b/LICENSE-Private-Demo_docs/long_pic_1778650008421587_503089827979333.jpg
new file mode 100644
index 0000000..77b5918
Binary files /dev/null and b/LICENSE-Private-Demo_docs/long_pic_1778650008421587_503089827979333.jpg differ
diff --git a/aes/build.gradle b/aes/build.gradle
index 899f105..8039c8c 100644
--- a/aes/build.gradle
+++ b/aes/build.gradle
@@ -24,13 +24,13 @@ android {
 	
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.15" 
+        versionName "15.20" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
diff --git a/aes/build.properties b/aes/build.properties
index d611252..4e746cb 100644
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 04:16:42 HKT 2026
-stageCount=10
+#Tue May 12 13:11:28 HKT 2026
+stageCount=4
 libraryProject=libaes
-baseVersion=15.15
-publishVersion=15.15.9
+baseVersion=15.20
+publishVersion=15.20.3
 buildCount=0
-baseBetaVersion=15.15.10
+baseBetaVersion=15.20.4
diff --git a/aes/src/main/res/values-night/styles.xml b/aes/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..5ac0e76
--- /dev/null
+++ b/aes/src/main/res/values-night/styles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MyAESTheme" parent="AESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+    </style>
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/aes/src/main/res/values/styles.xml b/aes/src/main/res/values/styles.xml
index 1da88ba..267068a 100644
--- a/aes/src/main/res/values/styles.xml
+++ b/aes/src/main/res/values/styles.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="MyAESTheme" parent="AESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
     </style>
-</resources>
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/appbase/build.gradle b/appbase/build.gradle
index 7d90452..b95d796 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -24,13 +24,13 @@ android {
 	
     defaultConfig {
         applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.15"
+        versionName "15.20"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
diff --git a/appbase/build.properties b/appbase/build.properties
index 4e84c0e..68642b1 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 28 17:08:30 HKT 2026
-stageCount=22
+#Tue May 12 09:17:15 HKT 2026
+stageCount=10
 libraryProject=libappbase
-baseVersion=15.15
-publishVersion=15.15.21
+baseVersion=15.20
+publishVersion=15.20.9
 buildCount=0
-baseBetaVersion=15.15.22
+baseBetaVersion=15.20.10
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index 5549b71..4c0df09 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -9,7 +9,9 @@
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
         android:resizeableActivity="true"
-        android:process=":App">
+        android:process=":App"
+        android:sharedUserId="@string/shared_user_id"
+        android:sharedUserLabel="@string/shared_user_label">
 
         <activity
             android:name=".MainActivity"
@@ -19,28 +21,16 @@
             android:launchMode="singleTop"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
 
-        </activity>
-
-        <activity
-            android:name=".MainActivityAlias"
-            android:label="@string/app_name"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:launchMode="singleTop"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
-
             <intent-filter>
-
                 <action android:name="android.intent.action.MAIN"/>
-
                 <category android:name="android.intent.category.LAUNCHER"/>
-
                 <category android:name="android.intent.category.DEFAULT"/>
-
             </intent-filter>
 
         </activity>
 
+
+
         <activity
             android:name=".Main2Activity"
             android:label="@string/app_name"
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/App.java b/appbase/src/main/java/cc/winboll/studio/appbase/App.java
index cd3711b..9df2ed8 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/App.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/App.java
@@ -26,6 +26,8 @@ public class App extends GlobalApplication {
 		if (isDebugging() != true) {
 			setIsDebugging(BuildConfig.DEBUG);
 		}
+		// release 版调试码
+		//setIsDebugging(!BuildConfig.DEBUG);
 		
         // 初始化 Toast 工具类（传入应用全局上下文，确保 Toast 可在任意地方调用）
         ToastUtils.init(getApplicationContext());
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/CrashTestActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/CrashTestActivity.java
new file mode 100644
index 0000000..6f2a687
--- /dev/null
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/CrashTestActivity.java
@@ -0,0 +1,28 @@
+package cc.winboll.studio.appbase;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class CrashTestActivity extends Activity {
+
+    public static final String TAG = "CrashTestActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_crash_test);
+        LogUtils.d(TAG, "CrashTestActivity onCreate()");
+    }
+
+    public void onBack(View view) {
+        finish();
+    }
+
+    public void onTestCrash(View view) {
+        LogUtils.d(TAG, "onTestCrash()");
+        ToastUtils.show("测试布局崩溃...");
+    }
+}
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
index e524154..96b99c4 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -162,25 +162,7 @@ public class MainActivity extends Activity {
         startActivity(aboutIntent);
     }
 
-	public void onSplitScreenMode(View view) {
-        LogUtils.d(TAG, "onSplitScreenMode() 分屏测试按钮已点击");
-        ToastUtils.show("分屏测试：已启动新窗口");
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            android.graphics.Rect bounds = new android.graphics.Rect();
-            getWindow().getDecorView().getDisplay().getRectSize(bounds);
-            int height = bounds.height();
-            int width = bounds.width();
-            bounds.set(0, 0, width, height / 2);
-            LogUtils.d(TAG, "onSplitScreenMode() 分屏窗口范围: " + bounds);
-            android.content.Intent intent = new android.content.Intent(this, MainActivityAlias.class);
-            intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
-            LogUtils.d(TAG, "onSplitScreenMode() 准备启动MainActivityAlias");
-            android.app.ActivityOptions options = android.app.ActivityOptions.makeBasic();
-            options.setLaunchBounds(bounds);
-            startActivity(intent, options.toBundle());
-            LogUtils.d(TAG, "onSplitScreenMode() MainActivityAlias已启动");
-        }
-    }
+
 
 	public void onMultiInstance(View view) {
         LogUtils.d(TAG, "onMultiInstance() 多开窗口按钮已点击");
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java
deleted file mode 100644
index 776a0f0..0000000
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cc.winboll.studio.appbase;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Toolbar;
-import cc.winboll.studio.appbase.R;
-
-public class MainActivityAlias extends MainActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setActionBar(toolbar);
-    }
-}
\ No newline at end of file
diff --git a/appbase/src/main/res/layout-night/activity_about.xml b/appbase/src/main/res/layout-night/activity_about.xml
new file mode 100644
index 0000000..f8af6b0
--- /dev/null
+++ b/appbase/src/main/res/layout-night/activity_about.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/toolbar"/>
+
+	<cc.winboll.studio.libappbase.views.AboutView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/aboutview"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/appbase/src/main/res/layout-night/activity_main.xml b/appbase/src/main/res/layout-night/activity_main.xml
new file mode 100644
index 0000000..383caad
--- /dev/null
+++ b/appbase/src/main/res/layout-night/activity_main.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="0dp"
+	android:background="?attr/activityBackgroundColor">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/toolbar"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:gravity="center_vertical"
+			android:spacing="12dp">
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="关于应用"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onAboutActivity"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用崩溃测试"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onCrashTest"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用日志测试"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onLogTest"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用日志测试（新窗口）"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onLogTestNewTask"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用吐司测试"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onToastUtilsTest"
+				android:layout_margin="10dp"/>
+
+
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="多开窗口"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onMultiInstance"
+				android:layout_margin="10dp"/>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/appbase/src/main/res/layout-night/activity_main2.xml b/appbase/src/main/res/layout-night/activity_main2.xml
new file mode 100644
index 0000000..7a96c0c
--- /dev/null
+++ b/appbase/src/main/res/layout-night/activity_main2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:gravity="center"
+	android:background="@android:color/white">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Main2Activity"
+		android:textSize="24sp"
+		android:textColor="@color/gray_900"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/appbase/src/main/res/layout/activity_about.xml b/appbase/src/main/res/layout/activity_about.xml
index bfd02eb..dab263a 100644
--- a/appbase/src/main/res/layout/activity_about.xml
+++ b/appbase/src/main/res/layout/activity_about.xml
@@ -4,11 +4,13 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
 
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/toolbar"/>
 
 	<cc.winboll.studio.libappbase.views.AboutView
diff --git a/appbase/src/main/res/layout/activity_crash_test.xml b/appbase/src/main/res/layout/activity_crash_test.xml
new file mode 100644
index 0000000..fed285a
--- /dev/null
+++ b/appbase/src/main/res/layout/activity_crash_test.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:padding="0dp"
+	android:background="?attr/activityBackgroundColor">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		android:id="@+id/toolbar"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:gravity="center_vertical">
+
+			<cc.winboll.studio.appbase.UndefinedCustomView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="返回"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onBack"
+				android:layout_margin="10dp"/>
+
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="测试崩溃"
+				android:textSize="16sp"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onTestCrash"
+				android:layout_margin="10dp"/>
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index d7a5e0b..383caad 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -4,11 +4,13 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:padding="16dp">
+	android:padding="0dp"
+	android:background="?attr/activityBackgroundColor">
 
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/toolbar"/>
 
 	<ScrollView
@@ -28,8 +30,8 @@
 				android:layout_height="wrap_content"
 				android:text="关于应用"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onAboutActivity"
@@ -40,8 +42,8 @@
 				android:layout_height="wrap_content"
 				android:text="应用崩溃测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onCrashTest"
@@ -52,8 +54,8 @@
 				android:layout_height="wrap_content"
 				android:text="应用日志测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTest"
@@ -64,8 +66,8 @@
 				android:layout_height="wrap_content"
 				android:text="应用日志测试（新窗口）"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onLogTestNewTask"
@@ -76,32 +78,22 @@
 				android:layout_height="wrap_content"
 				android:text="应用吐司测试"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onToastUtilsTest"
 				android:layout_margin="10dp"/>
 
-			<Button
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="分屏测试"
-				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
-				android:paddingVertical="12dp"
-				android:layout_marginHorizontal="24dp"
-				android:onClick="onSplitScreenMode"
-				android:layout_margin="10dp"/>
+
 
 			<Button
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="多开窗口"
 				android:textSize="16sp"
-				android:textColor="@android:color/white"
-				android:background="#81C7F5"
+				android:textColor="?attr/activityTextColor"
+				android:background="?attr/toolbarBackgroundColor"
 				android:paddingVertical="12dp"
 				android:layout_marginHorizontal="24dp"
 				android:onClick="onMultiInstance"
diff --git a/appbase/src/main/res/layout/activity_main2.xml b/appbase/src/main/res/layout/activity_main2.xml
index 7a96c0c..ef00547 100644
--- a/appbase/src/main/res/layout/activity_main2.xml
+++ b/appbase/src/main/res/layout/activity_main2.xml
@@ -5,13 +5,13 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:gravity="center"
-	android:background="@android:color/white">
+	android:background="?attr/activityBackgroundColor">
 
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="Main2Activity"
 		android:textSize="24sp"
-		android:textColor="@color/gray_900"/>
+		android:textColor="?attr/activityTextColor"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/appbase/src/main/res/values-night/colors.xml b/appbase/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..baec1be
--- /dev/null
+++ b/appbase/src/main/res/values-night/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FF1B8B29</color>
+    <color name="colorPrimaryDark">#FF0A5520</color>
+    <color name="colorAccent">#FF6EE87C</color>
+    <color name="colorText">#FFB8FF7D</color>
+</resources>
\ No newline at end of file
diff --git a/appbase/src/main/res/values-night/styles.xml b/appbase/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..a03559c
--- /dev/null
+++ b/appbase/src/main/res/values-night/styles.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="MyAPPBaseTheme" parent="APPBaseTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+    </style>
+
+    <style name="MyDebugActivityTheme" parent="DebugActivityTheme">
+        <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
+        <item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
+        <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/appbase/src/main/res/values/attrs.xml b/appbase/src/main/res/values/attrs.xml
deleted file mode 100644
index 511b66c..0000000
--- a/appbase/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<declare-styleable name="AboutView">
-        <attr name="app_name" format="string" />
-        <attr name="app_apkfoldername" format="string" />
-        <attr name="app_apkname" format="string" />
-        <attr name="app_gitname" format="string" />
-        <attr name="app_gitowner" format="string" />
-        <attr name="app_gitappbranch" format="string" />
-        <attr name="app_gitappsubprojectfolder" format="string" />
-        <attr name="appdescription" format="string" />
-        <attr name="appicon" format="reference" />
-        <attr name="is_adddebugtools" format="boolean" />
-    </declare-styleable>
-</resources>
diff --git a/appbase/src/main/res/values/styles.xml b/appbase/src/main/res/values/styles.xml
index bfb751e..be91a4e 100644
--- a/appbase/src/main/res/values/styles.xml
+++ b/appbase/src/main/res/values/styles.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="MyAPPBaseTheme" parent="APPBaseTheme">
-        <item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
+        <item name="themeDebug">@style/MyDebugActivityTheme</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 name="MyDebugActivityTheme" parent="DebugActivityTheme">
+        <item name="colorTittle">?attr/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">?attr/toolbarBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
+        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
 	</style>
 </resources>
diff --git a/appbase/基于_sharedUserId_+_自有签名_+_LocalBroadcastManager_跨应用通信技术文档.docx b/appbase/基于_sharedUserId_+_自有签名_+_LocalBroadcastManager_跨应用通信技术文档.docx
new file mode 100644
index 0000000..a50e177
Binary files /dev/null and b/appbase/基于_sharedUserId_+_自有签名_+_LocalBroadcastManager_跨应用通信技术文档.docx differ
diff --git a/autonfc/.gitignore b/autonfc/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/autonfc/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/autonfc/README.md b/autonfc/README.md
new file mode 100644
index 0000000..7421e1d
--- /dev/null
+++ b/autonfc/README.md
@@ -0,0 +1,34 @@
+# AutoNFC
+
+#### 介绍
+NFC 卡应用，主要管理 NFC 卡接触手机的动作响应，NFC 接触状态用于作为其他应用激活活动动作的启动令牌。
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh autonfc
+
+#### 使用说明
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档
diff --git a/autonfc/app_update_description.txt b/autonfc/app_update_description.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/autonfc/app_update_description.txt
@@ -0,0 +1 @@
+
diff --git a/autonfc/build.gradle b/autonfc/build.gradle
new file mode 100644
index 0000000..92c012a
--- /dev/null
+++ b/autonfc/build.gradle
@@ -0,0 +1,119 @@
+apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+    // 检查编译标志位配置
+    assert (winbollBuildProps['stageCount'] != null)
+    assert (winbollBuildProps['baseVersion'] != null)
+    // 保存基础版本号
+    winbollBuildProps.setProperty("baseVersion", "${versionName}");
+    //保存编译标志配置
+    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+    fos.close();
+    
+    // 返回编译版本号
+    return "${versionName}." + winbollBuildProps['stageCount']
+}
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+	
+    defaultConfig {
+        applicationId "cc.winboll.studio.autonfc"
+	    minSdkVersion 23
+		// 适配MIUI12
+        targetSdkVersion 30
+        versionCode 1
+        // versionName 更新后需要手动设置 
+        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.11"
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
+}
+
+dependencies {
+    
+    api 'com.google.code.gson:gson:2.10.1'
+	
+	// 下拉控件
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// OkHttp网络请求
+     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+     // FastJSON解析
+     implementation 'com.alibaba:fastjson:1.2.76'
+    
+	// AndroidX 类库
+    /*api 'androidx.appcompat:appcompat:1.1.0'
+    //api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'*/
+	
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+
+	implementation "androidx.annotation:annotation:1.3.0"
+    implementation "androidx.core:core:1.6.0"
+    implementation "androidx.drawerlayout:drawerlayout:1.1.1"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.guava:guava:24.1-jre"
+    /*
+	implementation "io.noties.markwon:core:$markwonVersion"
+    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+    implementation "io.noties.markwon:linkify:$markwonVersion"
+    implementation "io.noties.markwon:recycler:$markwonVersion"
+	*/
+	implementation 'com.termux:terminal-emulator:0.118.0'
+	implementation 'com.termux:terminal-view:0.118.0'
+	implementation 'com.termux:termux-shared:0.118.0'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+	api 'cc.winboll.studio:libaes:15.15.2'
+    api 'cc.winboll.studio:libappbase:15.15.11'
+	
+	// WinBoLL备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
+	
+	api fileTree(dir: 'libs', include: ['*.jar'])
+}
diff --git a/autonfc/build.properties b/autonfc/build.properties
new file mode 100644
index 0000000..4599e56
--- /dev/null
+++ b/autonfc/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Mon Mar 16 18:30:19 GMT 2026
+stageCount=0
+libraryProject=
+baseVersion=15.11
+publishVersion=15.0.0
+buildCount=54
+baseBetaVersion=15.0.1
diff --git a/autonfc/proguard-rules.pro b/autonfc/proguard-rules.pro
new file mode 100644
index 0000000..64b4a05
--- /dev/null
+++ b/autonfc/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/autonfc/src/beta/AndroidManifest.xml b/autonfc/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/autonfc/src/beta/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/autonfc/src/beta/res/values/strings.xml b/autonfc/src/beta/res/values/strings.xml
new file mode 100644
index 0000000..3c165aa
--- /dev/null
+++ b/autonfc/src/beta/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">AutoNFC✌</string>
+
+</resources>
diff --git a/autonfc/src/main/AndroidManifest.xml b/autonfc/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..97234a5
--- /dev/null
+++ b/autonfc/src/main/AndroidManifest.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.autonfc">
+
+    <uses-permission android:name="android.permission.NFC"/>
+
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="true"/>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
+        android:theme="@style/MyAppTheme"
+        android:resizeableActivity="true"
+        android:name=".App">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".nfc.NFCInterfaceActivity"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="*/*"/>
+            </intent-filter>
+        </activity>
+
+        <!-- NFC 绑定服务 -->
+        <service
+            android:name=".nfc.AutoNFCService"
+            android:exported="false"/>
+
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="4.0"/>
+
+    </application>
+</manifest>
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/App.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/App.java
new file mode 100644
index 0000000..d64ac77
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/App.java
@@ -0,0 +1,344 @@
+package cc.winboll.studio.autonfc;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+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;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class App extends GlobalApplication {
+
+    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
+
+    @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);
+    }
+
+    public static void write(InputStream input, OutputStream output) throws IOException {
+        byte[] buf = new byte[1024 * 8];
+        int len;
+        while ((len = input.read(buf)) != -1) {
+            output.write(buf, 0, len);
+        }
+    }
+
+    public static void write(File file, byte[] data) throws IOException {
+        File parent = file.getParentFile();
+        if (parent != null && !parent.exists()) parent.mkdirs();
+
+        ByteArrayInputStream input = new ByteArrayInputStream(data);
+        FileOutputStream output = new FileOutputStream(file);
+        try {
+            write(input, output);
+        } finally {
+            closeIO(input, output);
+        }
+    }
+
+    public static String toString(InputStream input) throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        write(input, output);
+        try {
+            return output.toString("UTF-8");
+        } finally {
+            closeIO(input, output);
+        }
+    }
+
+    public static void closeIO(Closeable... closeables) {
+        for (Closeable closeable : closeables) {
+            try {
+                if (closeable != null) closeable.close();
+            } catch (IOException ignored) {}
+        }
+    }
+
+    public static class CrashHandler {
+
+        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
+
+        private static CrashHandler sInstance;
+
+        private PartCrashHandler mPartCrashHandler;
+
+        public static CrashHandler getInstance() {
+            if (sInstance == null) {
+                sInstance = new CrashHandler();
+            }
+            return sInstance;
+        }
+
+        public void registerGlobal(Context context) {
+            registerGlobal(context, null);
+        }
+
+        public void registerGlobal(Context context, String crashDir) {
+            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
+        }
+
+        public void unregister() {
+            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
+        }
+
+        public void registerPart(Context context) {
+            unregisterPart(context);
+            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
+            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
+        }
+
+        public void unregisterPart(Context context) {
+            if (mPartCrashHandler != null) {
+                mPartCrashHandler.isRunning.set(false);
+                mPartCrashHandler = null;
+            }
+        }
+
+        private static class PartCrashHandler implements Runnable {
+
+            private final Context mContext;
+
+            public AtomicBoolean isRunning = new AtomicBoolean(true);
+
+            public PartCrashHandler(Context context) {
+                this.mContext = context;
+            }
+
+            @Override
+            public void run() {
+                while (isRunning.get()) {
+                    try {
+                        Looper.loop();
+                    } catch (final Throwable e) {
+                        e.printStackTrace();
+                        if (isRunning.get()) {
+                            MAIN_HANDLER.post(new Runnable(){
+
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
+                                    }
+                                });
+                        } else {
+                            if (e instanceof RuntimeException) {
+                                throw (RuntimeException)e;
+                            } else {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
+
+            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
+
+            private final Context mContext;
+
+            private final File mCrashDir;
+
+            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
+                this.mContext = context;
+                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
+            }
+
+            @Override
+            public void uncaughtException(Thread thread, Throwable throwable) {
+                try {
+
+                    String log = buildLog(throwable);
+                    writeLog(log);
+
+                    try {
+                        Intent intent = new Intent(mContext, CrashActivity.class);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        intent.putExtra(Intent.EXTRA_TEXT, log);
+                        mContext.startActivity(intent);
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                        writeLog(e.toString());
+                    }
+
+                    throwable.printStackTrace();
+                    android.os.Process.killProcess(android.os.Process.myPid());
+                    System.exit(0);
+
+                } catch (Throwable e) {
+                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
+                }
+            }
+
+            private String buildLog(Throwable throwable) {
+                String time = DATE_FORMAT.format(new Date());
+
+                String versionName = "unknown";
+                long versionCode = 0;
+                try {
+                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
+                    versionName = packageInfo.versionName;
+                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
+                } catch (Throwable ignored) {}
+
+                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
+                head.put("Time Of Crash", time);
+                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
+                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
+                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
+                head.put("Kernel", getKernel());
+                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
+                head.put("Fingerprint", Build.FINGERPRINT);
+
+                StringBuilder builder = new StringBuilder();
+
+                for (String key : head.keySet()) {
+                    if (builder.length() != 0) builder.append("\n");
+                    builder.append(key);
+                    builder.append(" :    ");
+                    builder.append(head.get(key));
+                }
+
+                builder.append("\n\n");
+                builder.append(Log.getStackTraceString(throwable));
+
+                return builder.toString(); 
+            }
+
+            private void writeLog(String log) {
+                String time = DATE_FORMAT.format(new Date());
+                File file = new File(mCrashDir, "crash_" + time + ".txt");
+                try {
+                    write(file, log.getBytes("UTF-8"));
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                } 
+            }
+
+            private static String getKernel() {
+                try {
+                    return App.toString(new FileInputStream("/proc/version")).trim();
+                } catch (Throwable e) {
+                    return e.getMessage();
+                }
+            }
+        }
+    }
+
+    public static final class CrashActivity extends Activity {
+
+        private String mLog;
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            setTheme(android.R.style.Theme_DeviceDefault);
+            setTitle("App Crash");
+
+            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+
+            ScrollView contentView = new ScrollView(this);
+            contentView.setFillViewport(true);
+
+            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
+
+            TextView textView = new TextView(this);
+            int padding = dp2px(16);
+            textView.setPadding(padding, padding, padding, padding);
+            textView.setText(mLog);
+            textView.setTextIsSelectable(true);
+            textView.setTypeface(Typeface.DEFAULT);
+            textView.setLinksClickable(true);
+
+            horizontalScrollView.addView(textView);
+            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+
+            setContentView(contentView);
+        }
+
+        private void restart() {
+            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
+            if (intent != null) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+            finish();
+            android.os.Process.killProcess(android.os.Process.myPid());
+            System.exit(0);
+        }
+
+        private static int dp2px(float dpValue) {
+            final float scale = Resources.getSystem().getDisplayMetrics().density;
+            return (int) (dpValue * scale + 0.5f);
+        }
+
+        @Override
+        public boolean onCreateOptionsMenu(Menu menu) {
+            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            return super.onCreateOptionsMenu(menu);
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            switch (item.getItemId()) {
+                case android.R.id.copy:
+                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
+                    return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+
+        @Override
+        public void onBackPressed() {
+            restart();
+        }
+    }
+}
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/MainActivity.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/MainActivity.java
new file mode 100644
index 0000000..03743b7
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/MainActivity.java
@@ -0,0 +1,180 @@
+package cc.winboll.studio.autonfc;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.nfc.NfcAdapter;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.autonfc.nfc.ActionDialog;
+import cc.winboll.studio.autonfc.nfc.AutoNFCService;
+import cc.winboll.studio.autonfc.nfc.NFCInterfaceActivity;
+import cc.winboll.studio.libappbase.LogActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class MainActivity extends AppCompatActivity {
+
+    public static final String TAG = "MainActivity";
+
+    private NfcAdapter mNfcAdapter;
+    private PendingIntent mPendingIntent;
+    private AutoNFCService mService;
+    private boolean mBound = false;
+
+    // 服务连接
+    private ServiceConnection mConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            AutoNFCService.LocalBinder binder = (AutoNFCService.LocalBinder) service;
+            mService = binder.getService();
+            mBound = true;
+            LogUtils.d(TAG, "onServiceConnected: 服务已绑定");
+
+            // 关键：把 Activity 传给 Service，用于回调
+            mService.attachActivity(MainActivity.this);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mBound = false;
+            mService = null;
+            LogUtils.d(TAG, "onServiceDisconnected: 服务已断开");
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        // 初始化 NFC
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
+        Intent nfcIntent = new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        mPendingIntent = PendingIntent.getActivity(this, 0, nfcIntent, 0);
+
+        LogUtils.d(TAG, "onCreate() -> NFC 监听已绑定到 MainActivity");
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        // 绑定服务
+        Intent intent = new Intent(this, AutoNFCService.class);
+        bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+        LogUtils.d(TAG, "onStart: 绑定服务");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        // 解绑服务
+        if (mBound) {
+            unbindService(mConnection);
+            mBound = false;
+            LogUtils.d(TAG, "onStop: 解绑服务");
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        LogUtils.d(TAG, "onResume() -> 开启 NFC 前台分发");
+        if (mNfcAdapter != null) {
+            mNfcAdapter.enableForegroundDispatch(this, mPendingIntent, null, null);
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        LogUtils.d(TAG, "onPause() -> 关闭 NFC 前台分发");
+        if (mNfcAdapter != null) {
+            mNfcAdapter.disableForegroundDispatch(this);
+        }
+    }
+
+    // NFC 卡片靠近唯一入口
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        LogUtils.d(TAG, "onNewIntent() -> 检测到 NFC 卡片");
+
+        // 把 NFC 事件交给 Service 处理
+        if (mBound && mService != null) {
+            mService.handleNfcIntent(intent);
+        } else {
+            LogUtils.e(TAG, "服务未绑定，无法处理 NFC");
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        if (id == R.id.menu_log) {
+            LogActivity.startLogActivity(this);
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void onNFCInterfaceActivity(View view) {
+        startActivity(new Intent(this, NFCInterfaceActivity.class));
+    }
+
+    // ========================= 【新增】关键方法：由 Service 回调来弹出对话框 =========================
+    /**
+     * Service 解析完 NFC 数据后，回调此方法在 Activity 中弹出对话框
+     */
+    public void showNfcActionDialog(final String nfcData) {
+        LogUtils.d(TAG, "showNfcActionDialog() ->  Activity 存活，安全弹出对话框");
+
+        // Activity 正在运行，直接弹框，绝对不会报 BadTokenException
+        final ActionDialog dialog = new ActionDialog(this);
+        dialog.setNfcData(nfcData);
+        dialog.setButtonClickListener(new ActionDialog.OnButtonClickListener() {
+				@Override
+				public void onBuildClick() {
+					LogUtils.d(TAG, "点击 Build");
+					if (mService != null) {
+						mService.executeTermuxCommand(AutoNFCService.ACTION_BUILD, nfcData);
+					}
+					dialog.dismiss();
+				}
+
+				@Override
+				public void onViewClick() {
+					LogUtils.d(TAG, "点击 View");
+					if (mService != null) {
+						mService.executeTermuxCommand(AutoNFCService.ACTION_BUILD_VIEW, nfcData);
+					}
+					dialog.dismiss();
+				}
+
+				@Override
+				public void onCancelClick() {
+					dialog.dismiss();
+				}
+			});
+
+        dialog.show();
+    }
+}
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/models/NfcTermuxCmd.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/models/NfcTermuxCmd.java
new file mode 100644
index 0000000..faab4cb
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/models/NfcTermuxCmd.java
@@ -0,0 +1,66 @@
+package cc.winboll.studio.autonfc.models;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/03/16 09:38
+ */
+public class NfcTermuxCmd {
+
+    private String script;        // 要执行的预制脚本名（如 auth.sh）
+    private String[] args;         // 脚本参数
+    private String workDir;       // 工作目录
+    private boolean background;   // 是否后台执行
+    private String resultDir;     // 结果输出目录（可为 null）
+
+    public NfcTermuxCmd() {
+    }
+
+    public NfcTermuxCmd(String script, String[] args, String workDir, boolean background, String resultDir) {
+        this.script = script;
+        this.args = args;
+        this.workDir = workDir;
+        this.background = background;
+        this.resultDir = resultDir;
+    }
+
+    public String getScript() {
+        return script;
+    }
+
+    public void setScript(String script) {
+        this.script = script;
+    }
+
+    public String[] getArgs() {
+        return args;
+    }
+
+    public void setArgs(String[] args) {
+        this.args = args;
+    }
+
+    public String getWorkDir() {
+        return workDir;
+    }
+
+    public void setWorkDir(String workDir) {
+        this.workDir = workDir;
+    }
+
+    public boolean isBackground() {
+        return background;
+    }
+
+    public void setBackground(boolean background) {
+        this.background = background;
+    }
+
+    public String getResultDir() {
+        return resultDir;
+    }
+
+    public void setResultDir(String resultDir) {
+        this.resultDir = resultDir;
+    }
+}
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/ActionDialog.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/ActionDialog.java
new file mode 100644
index 0000000..c3f65d7
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/ActionDialog.java
@@ -0,0 +1,123 @@
+package cc.winboll.studio.autonfc.nfc;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+import cc.winboll.studio.autonfc.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * 自定义对话框类，用于与用户交互，展示 NFC 相关操作选项
+ * 兼容 Java 7 语法
+ *
+ * @author 豆包&ZhanGSKen
+ * @create 2025-08-15
+ * @lastModify 2026-03-17
+ */
+public class ActionDialog extends Dialog {
+
+    private static final String TAG = "ActionDialog";
+    private String mNfcData;
+    private OnButtonClickListener mClickListener;
+
+    /**
+     * 构造函数
+     */
+    public ActionDialog(Context context) {
+        super(context);
+        initDialog();
+    }
+
+    /**
+     * 设置 NFC 数据
+     */
+    public void setNfcData(String nfcData) {
+        this.mNfcData = nfcData;
+        LogUtils.d(TAG, "setNfcData() -> " + nfcData);
+    }
+
+    /**
+     * 设置点击监听
+     */
+    public void setButtonClickListener(OnButtonClickListener listener) {
+        this.mClickListener = listener;
+    }
+
+    /**
+     * 初始化布局
+     */
+    private void initDialog() {
+        setTitle("请选择操作");
+
+        LinearLayout layout = new LinearLayout(getContext());
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(20, 20, 20, 20);
+
+        addButtons(layout);
+
+        setContentView(layout);
+    }
+
+    /**
+     * 添加按钮
+     */
+    private void addButtons(LinearLayout layout) {
+        // Build 按钮
+        Button btnBuild = createButton("Build", new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "点击 Build");
+					if (mClickListener != null) {
+						mClickListener.onBuildClick();
+					}
+				}
+			});
+        layout.addView(btnBuild);
+
+        // View 按钮
+        Button btnView = createButton("View", new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "点击 View");
+					if (mClickListener != null) {
+						mClickListener.onViewClick();
+					}
+				}
+			});
+        layout.addView(btnView);
+
+        // 取消按钮
+        Button btnCancel = createButton("Cancel", new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "点击 Cancel");
+					dismiss();
+				}
+			});
+        layout.addView(btnCancel);
+    }
+
+    /**
+     * 创建按钮
+     */
+    private Button createButton(String text, View.OnClickListener listener) {
+        Button button = new Button(getContext());
+        button.setText(text);
+        button.setPadding(10, 10, 10, 10);
+        button.setOnClickListener(listener);
+        return button;
+    }
+
+    /**
+     * 回调接口
+     */
+    public interface OnButtonClickListener {
+        void onBuildClick();
+        void onViewClick();
+        void onCancelClick();
+    }
+}
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/AutoNFCService.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/AutoNFCService.java
new file mode 100644
index 0000000..0addf65
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/AutoNFCService.java
@@ -0,0 +1,202 @@
+package cc.winboll.studio.autonfc.nfc;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.NfcAdapter;
+import android.nfc.Tag;
+import android.nfc.tech.Ndef;
+import android.os.Binder;
+import android.os.IBinder;
+
+import cc.winboll.studio.autonfc.MainActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+public class AutoNFCService extends Service {
+
+    public static final String TAG = "AutoNFCService";
+
+    // ================= 已修改：更新为 Beta 包名 =================
+    public static final String ACTION_BUILD = "cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD";
+    public static final String ACTION_BUILD_VIEW = "cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity.ACTION_BUILD_VIEW";
+
+    private final IBinder mBinder = new LocalBinder();
+    private String mNfcData;
+    private MainActivity mActivity; // 持有 Activity 引用，用于回调
+
+    // ========================= 生命周期 =========================
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate() -> 服务创建");
+        // 移除：startForeground(NOTIFICATION_ID, buildNotification());
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy() -> 服务已停止");
+        mActivity = null; // 释放引用
+    }
+
+    // ========================= 服务绑定 =========================
+    @Override
+    public IBinder onBind(Intent intent) {
+        LogUtils.d(TAG, "onBind() -> 服务被绑定");
+        return mBinder;
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        LogUtils.d(TAG, "onUnbind() -> 服务解绑");
+        // 移除：stopForeground(true);
+        stopSelf();
+        return super.onUnbind(intent);
+    }
+
+    // ========================= 对外暴露方法 =========================
+    /**
+     * 绑定 Activity，用于回调显示对话框
+     */
+    public void attachActivity(MainActivity activity) {
+        this.mActivity = activity;
+    }
+
+    /**
+     * 处理 NFC 意图
+     */
+    public void handleNfcIntent(Intent intent) {
+        LogUtils.d(TAG, "handleNfcIntent() -> 开始处理");
+
+        if (intent == null) {
+            LogUtils.e(TAG, "handleNfcIntent() -> 参数 intent 为空");
+            return;
+        }
+
+        String action = intent.getAction();
+        LogUtils.d(TAG, "handleNfcIntent() -> Action = " + action);
+
+        if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action)
+			|| NfcAdapter.ACTION_TECH_DISCOVERED.equals(action)
+			|| NfcAdapter.ACTION_TAG_DISCOVERED.equals(action)) {
+
+            LogUtils.d(TAG, "handleNfcIntent() -> 匹配 NFC 动作");
+
+            Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+            if (tag == null) {
+                LogUtils.e(TAG, "handleNfcIntent() -> Tag 为空");
+                return;
+            }
+
+            LogUtils.d(TAG, "handleNfcIntent() -> Tag ID = " + bytesToHexString(tag.getId()));
+            LogUtils.d(TAG, "handleNfcIntent() -> Tech List = " + Arrays.toString(tag.getTechList()));
+
+            parseNdefData(tag);
+        }
+    }
+
+    // ========================= 内部业务 =========================
+    private void parseNdefData(Tag tag) {
+        LogUtils.d(TAG, "parseNdefData() -> 开始解析");
+
+        if (tag == null) return;
+
+        Ndef ndef = Ndef.get(tag);
+        if (ndef == null) {
+            LogUtils.e(TAG, "parseNdefData() -> 不支持 NDEF 格式");
+            return;
+        }
+
+        try {
+            ndef.connect();
+            NdefMessage msg = ndef.getNdefMessage();
+
+            if (msg == null || msg.getRecords() == null || msg.getRecords().length == 0) {
+                LogUtils.w(TAG, "parseNdefData() -> 卡片无数据");
+                return;
+            }
+
+            NdefRecord record = msg.getRecords()[0];
+            byte[] payload = record.getPayload();
+
+            int langLen = payload[0] & 0x3F;
+            int start = 1 + langLen;
+
+            if (start < payload.length) {
+                mNfcData = new String(payload, start, payload.length - start, Charset.forName("UTF-8"));
+                LogUtils.d(TAG, "parseNdefData() -> 读卡成功: " + mNfcData);
+
+                // 关键：回调给 Activity 弹框，此时 Activity 一定是存活状态
+                if (mActivity != null) {
+                    mActivity.showNfcActionDialog(mNfcData);
+                }
+            }
+
+        } catch (Exception e) {
+            LogUtils.e(TAG, "parseNdefData() -> 读取失败", e);
+        } finally {
+            try {
+                ndef.close();
+            } catch (Exception e) {
+                // 忽略关闭异常
+            }
+        }
+    }
+
+    /**
+     * 执行 Termux 命令
+     */
+    public void executeTermuxCommand(String action, String nfcData) {
+        LogUtils.d(TAG, "executeTermuxCommand() -> 开始执行");
+
+        if (nfcData == null || nfcData.isEmpty()) {
+            ToastUtils.show("数据错误");
+            return;
+        }
+
+        try {
+            LogUtils.d(TAG, "executeTermuxCommand() -> 发送指令: " + nfcData);
+
+            Intent bridgeIntent = new Intent(action);
+
+            // ================= 已修改：使用 Beta 包名 =================
+            bridgeIntent.setClassName(
+                "cc.winboll.studio.winboll.beta",
+                "cc.winboll.studio.winboll.termux.NfcTermuxBridgeActivity"
+            );
+
+            bridgeIntent.putExtra(Intent.EXTRA_TEXT, nfcData);
+            bridgeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            startActivity(bridgeIntent);
+            ToastUtils.show("指令已发送");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "executeTermuxCommand() -> 发送失败", e);
+            ToastUtils.show("发送失败");
+        }
+    }
+
+    // ========================= 工具方法 =========================
+    private String bytesToHexString(byte[] bytes) {
+        if (bytes == null || bytes.length == 0) return "";
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02X", b));
+        }
+        return sb.toString();
+    }
+
+    // ========================= Binder =========================
+    public class LocalBinder extends Binder {
+        public AutoNFCService getService() {
+            return AutoNFCService.this;
+        }
+    }
+}
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NFCInterfaceActivity.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NFCInterfaceActivity.java
new file mode 100644
index 0000000..28b6f18
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NFCInterfaceActivity.java
@@ -0,0 +1,230 @@
+package cc.winboll.studio.autonfc.nfc;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.nfc.NfcAdapter;
+import android.nfc.Tag;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.autonfc.R;
+import cc.winboll.studio.autonfc.models.NfcTermuxCmd;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+public class NFCInterfaceActivity extends Activity {
+
+    public static final String TAG = "NFCInterfaceActivity";
+
+    private EditText et_script;
+    private EditText et_args;
+    private EditText et_workDir;
+    private EditText et_background;
+    private EditText et_resultDir;
+
+    private TextView tvResult;
+    private TextView tvStatus;
+
+    private NfcAdapter mNfcAdapter;
+    private PendingIntent mNfcPendingIntent;
+    private Tag mCurrentTag;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_nfc_interface);
+        initView();
+        initNfc();
+    }
+
+    private void initView() {
+        et_script = findViewById(R.id.et_script);
+        et_args = findViewById(R.id.et_args);
+        et_workDir = findViewById(R.id.et_workDir);
+        et_background = findViewById(R.id.et_background);
+        et_resultDir = findViewById(R.id.et_resultDir);
+
+        tvResult = findViewById(R.id.tv_result);
+        tvStatus = findViewById(R.id.tv_status);
+    }
+
+    private void initNfc() {
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
+
+        if (mNfcAdapter == null) {
+            tvStatus.setText("设备不支持NFC");
+            return;
+        }
+        if (!mNfcAdapter.isEnabled()) {
+            tvStatus.setText("请开启NFC");
+            return;
+        }
+
+        Intent nfcIntent = new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        mNfcPendingIntent = PendingIntent.getActivity(this, 0, nfcIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        tvStatus.setText("NFC已启动，等待卡片靠近");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mNfcAdapter != null && mNfcAdapter.isEnabled()) {
+            mNfcAdapter.enableForegroundDispatch(this, mNfcPendingIntent, null, null);
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (mNfcAdapter != null) {
+            mNfcAdapter.disableForegroundDispatch(this);
+        }
+        mCurrentTag = null;
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        mCurrentTag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
+        if (mCurrentTag == null) return;
+
+        tvStatus.setText("卡片已连接，解析中...");
+        readNfc();
+    }
+
+    // -------------------------------------------------------------------------
+    // 读取 NFC（完全委托给工具类）
+    // -------------------------------------------------------------------------
+    private void readNfc() {
+        try {
+            NfcTermuxCmd cmd = NfcUtils.readTag(mCurrentTag);
+            if (cmd == null) {
+                tvStatus.setText("读取成功：标签为空");
+                tvResult.setText("");
+                // 清空窗体
+                clearUiFields();
+                return;
+            }
+
+            // 核心改动：读取成功后，同时更新详情显示 和 窗体输入框
+            updateUiWithCmd(cmd);
+
+        } catch (Exception e) {
+            LogUtils.e(TAG, "readNfc 失败", e);
+            tvStatus.setText("读取失败：" + e.getMessage());
+            // 出错时清空窗体
+            clearUiFields();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // 新增：根据读取到的 Cmd 填充 UI（详情 + 窗体）
+    // -------------------------------------------------------------------------
+    private void updateUiWithCmd(NfcTermuxCmd cmd) {
+        if (cmd == null) return;
+
+        String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA).format(new Date());
+        String show = "【读取时间】 " + time + "\n\n"
+			+ "【解析结果】\n"
+			+ "script:    " + cmd.getScript() + "\n"
+			+ "args:      " + (cmd.getArgs() != null ? String.join(", ", cmd.getArgs()) : "[]") + "\n"
+			+ "workDir:   " + cmd.getWorkDir() + "\n"
+			+ "background: " + cmd.isBackground() + "\n"
+			+ "resultDir: " + cmd.getResultDir();
+
+        tvResult.setText(show);
+        tvStatus.setText("读取成功！");
+
+        // 👇 关键逻辑：自动填入窗体（每次读取后都会覆盖输入框）
+        et_script.setText(cmd.getScript() != null ? cmd.getScript() : "");
+        et_args.setText(cmd.getArgs() != null ? String.join(",", cmd.getArgs()) : "");
+        et_workDir.setText(cmd.getWorkDir() != null ? cmd.getWorkDir() : "");
+        et_background.setText(String.valueOf(cmd.isBackground()));
+        et_resultDir.setText(cmd.getResultDir() != null ? cmd.getResultDir() : "");
+    }
+
+    // -------------------------------------------------------------------------
+    // 辅助：清空所有输入框
+    // -------------------------------------------------------------------------
+    private void clearUiFields() {
+        et_script.setText("");
+        et_args.setText("");
+        et_workDir.setText("");
+        et_background.setText("");
+        et_resultDir.setText("");
+    }
+
+    // -------------------------------------------------------------------------
+    // 写入按钮（委托给工具类）
+    // -------------------------------------------------------------------------
+    public void onWriteClick(View view) {
+        if (mCurrentTag == null) {
+            showToast("请先靠近卡片");
+            return;
+        }
+
+        try {
+            NfcTermuxCmd cmd = buildCmdFromUI();
+            NfcUtils.writeTag(mCurrentTag, cmd);
+
+            tvStatus.setText("写入成功！");
+            showToast("写入成功");
+            readNfc(); // 写入后重读，此时会自动填入窗体
+
+        } catch (Exception e) {
+            LogUtils.e(TAG, "写入失败", e);
+            tvStatus.setText("写入失败：" + e.getMessage());
+            showToast("写入失败");
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // 填充调试数据
+    // -------------------------------------------------------------------------
+    public void onFillTestDataClick(View view) {
+        String testJson = "{\"script\":\"BuildWinBoLLProject.sh\",\"args\":[\"DebugTemp\"],\"workDir\":null,\"background\":true,\"resultDir\":null}";
+        try {
+            NfcTermuxCmd cmd = NfcUtils.jsonToCmd(testJson);
+            et_script.setText(cmd.getScript());
+            et_args.setText(cmd.getArgs() != null ? String.join(",", cmd.getArgs()) : "");
+            et_workDir.setText(cmd.getWorkDir() != null ? cmd.getWorkDir() : "");
+            et_background.setText(String.valueOf(cmd.isBackground()));
+            et_resultDir.setText(cmd.getResultDir() != null ? cmd.getResultDir() : "");
+
+            showToast("调试数据已填入");
+        } catch (Exception e) {
+            showToast("解析失败");
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // 从 UI 构建 NfcTermuxCmd
+    // -------------------------------------------------------------------------
+    private NfcTermuxCmd buildCmdFromUI() {
+        String script = et_script.getText().toString().trim();
+        String argsStr = et_args.getText().toString().trim();
+        String workDir = et_workDir.getText().toString().trim();
+        String bgStr = et_background.getText().toString().trim();
+        String resultDir = et_resultDir.getText().toString().trim();
+
+        NfcTermuxCmd cmd = new NfcTermuxCmd();
+        cmd.setScript(script);
+        cmd.setArgs(argsStr.isEmpty() ? new String[0] : argsStr.split(","));
+        cmd.setWorkDir(workDir.isEmpty() ? null : workDir);
+        cmd.setBackground("true".equalsIgnoreCase(bgStr));
+        cmd.setResultDir(resultDir.isEmpty() ? null : resultDir);
+
+        return cmd;
+    }
+
+    private void showToast(String msg) {
+        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+    }
+}
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NfcStateMonitor.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NfcStateMonitor.java
new file mode 100644
index 0000000..a58fead
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NfcStateMonitor.java
@@ -0,0 +1,78 @@
+package cc.winboll.studio.autonfc.nfc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class NfcStateMonitor {
+    private static Map<String, OnNfcStateListener> sListenerMap = new HashMap<>();
+    private static boolean sIsRunning = false;
+
+    public static void startMonitor() {
+        if (sIsRunning) return;
+        sListenerMap = new HashMap<>();
+        sIsRunning = true;
+    }
+
+    public static void stopMonitor() {
+        if (!sIsRunning) return;
+        sIsRunning = false;
+        if (sListenerMap != null) {
+            sListenerMap.clear();
+            sListenerMap = null;
+        }
+    }
+
+    // 你原来的方法名：registerListener
+    public static void registerListener(String key, OnNfcStateListener listener) {
+        if (!sIsRunning || listener == null) return;
+        sListenerMap.put(key, listener);
+    }
+
+    public static void unregisterListener(String key) {
+        if (!sIsRunning || key == null) return;
+        sListenerMap.remove(key);
+    }
+
+    public static void notifyNfcConnected() {
+        if (!sIsRunning) return;
+        for (OnNfcStateListener l : sListenerMap.values()) {
+            l.onNfcConnected();
+        }
+    }
+
+    public static void notifyNfcDisconnected() {
+        if (!sIsRunning) return;
+        for (OnNfcStateListener l : sListenerMap.values()) {
+            l.onNfcDisconnected();
+        }
+    }
+
+    public static void notifyReadSuccess(String data) {
+        if (!sIsRunning) return;
+        for (OnNfcStateListener l : sListenerMap.values()) {
+            l.onNfcReadSuccess(data);
+        }
+    }
+
+    public static void notifyReadFail(String error) {
+        if (!sIsRunning) return;
+        for (OnNfcStateListener l : sListenerMap.values()) {
+            l.onNfcReadFail(error);
+        }
+    }
+
+    public static void notifyWriteSuccess() {
+        if (!sIsRunning) return;
+        for (OnNfcStateListener l : sListenerMap.values()) {
+            l.onNfcWriteSuccess();
+        }
+    }
+
+    public static void notifyWriteFail(String error) {
+        if (!sIsRunning) return;
+        for (OnNfcStateListener l : sListenerMap.values()) {
+            l.onNfcWriteFail(error);
+        }
+    }
+}
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NfcUtils.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NfcUtils.java
new file mode 100644
index 0000000..65ac597
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/NfcUtils.java
@@ -0,0 +1,136 @@
+package cc.winboll.studio.autonfc.nfc;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/03/16 14:26
+ */
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.nfc.Tag;
+import android.nfc.tech.Ndef;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import cc.winboll.studio.autonfc.models.NfcTermuxCmd;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.nio.charset.Charset;
+import java.util.Locale;
+
+public class NfcUtils {
+
+    public static final String TAG = "NfcUtils";
+    private static Gson sGson = new Gson();
+
+    // -------------------------------------------------------------------------
+    // 读取 NFC 标签并解析为 NfcTermuxCmd
+    // -------------------------------------------------------------------------
+    public static NfcTermuxCmd readTag(Tag tag) throws Exception {
+        if (tag == null) {
+            LogUtils.e(TAG, "readTag: tag is null");
+            return null;
+        }
+
+        Ndef ndef = Ndef.get(tag);
+        if (ndef == null) {
+            LogUtils.e(TAG, "readTag: 不支持 NDEF");
+            return null;
+        }
+
+        try {
+            ndef.connect();
+            NdefMessage msg = ndef.getNdefMessage();
+            if (msg == null) return null;
+
+            NdefRecord[] records = msg.getRecords();
+            if (records == null || records.length == 0) return null;
+
+            byte[] payload = records[0].getPayload();
+            int status = payload[0] & 0xFF;
+            int langLen = status & 0x3F;
+            int start = 1 + langLen;
+
+            if (start >= payload.length) return null;
+
+            String json = new String(payload, start, payload.length - start, Charset.forName("UTF-8"));
+            LogUtils.d(TAG, "readTag: 提取 JSON -> " + json);
+
+            return sGson.fromJson(json, NfcTermuxCmd.class);
+        } finally {
+            if (ndef != null && ndef.isConnected()) {
+                ndef.close();
+            }
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // 写入 NfcTermuxCmd 到 NFC 标签
+    // -------------------------------------------------------------------------
+    public static void writeTag(Tag tag, NfcTermuxCmd cmd) throws Exception {
+        if (tag == null) throw new Exception("tag is null");
+
+        String json = sGson.toJson(cmd);
+        writeJson(tag, json);
+    }
+
+    // -------------------------------------------------------------------------
+    // 写入原始 JSON 字符串到 NFC
+    // -------------------------------------------------------------------------
+    public static void writeJson(Tag tag, String json) throws Exception {
+        if (tag == null) throw new Exception("tag is null");
+
+        Ndef ndef = Ndef.get(tag);
+        if (ndef == null) throw new Exception("标签不支持 NDEF");
+
+        try {
+            ndef.connect();
+            int maxSize = ndef.getMaxSize();
+            int realSize = json.getBytes(Charset.forName("UTF-8")).length;
+
+            if (realSize > maxSize) {
+                throw new Exception("数据过大 (" + realSize + ") > 容量 (" + maxSize + ")");
+            }
+
+            NdefRecord record = createTextRecord(json, true);
+            NdefMessage msg = new NdefMessage(new NdefRecord[]{record});
+
+            ndef.writeNdefMessage(msg);
+            LogUtils.d(TAG, "writeJson: 写入成功");
+        } finally {
+            if (ndef != null && ndef.isConnected()) {
+                ndef.close();
+            }
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // 创建 NFC 文本记录
+    // -------------------------------------------------------------------------
+    public static NdefRecord createTextRecord(String text, boolean isUtf8) {
+        byte[] langBytes = "en".getBytes(Charset.forName("US-ASCII"));
+        byte[] textBytes = text.getBytes(Charset.forName(isUtf8 ? "UTF-8" : "UTF-16"));
+
+        int status = isUtf8 ? 0 : 0x80;
+        status |= langBytes.length & 0x3F;
+
+        byte[] data = new byte[1 + langBytes.length + textBytes.length];
+        data[0] = (byte) status;
+        System.arraycopy(langBytes, 0, data, 1, langBytes.length);
+        System.arraycopy(textBytes, 0, data, 1 + langBytes.length, textBytes.length);
+
+        return new NdefRecord(NdefRecord.TNF_WELL_KNOWN, NdefRecord.RTD_TEXT, new byte[0], data);
+    }
+
+    // -------------------------------------------------------------------------
+    // 辅助：JSON -> NfcTermuxCmd
+    // -------------------------------------------------------------------------
+    public static NfcTermuxCmd jsonToCmd(String json) throws JsonSyntaxException {
+        return sGson.fromJson(json, NfcTermuxCmd.class);
+    }
+
+    // -------------------------------------------------------------------------
+    // 辅助：NfcTermuxCmd -> JSON
+    // -------------------------------------------------------------------------
+    public static String cmdToJson(NfcTermuxCmd cmd) {
+        return sGson.toJson(cmd);
+    }
+}
+
diff --git a/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/OnNfcStateListener.java b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/OnNfcStateListener.java
new file mode 100644
index 0000000..4b149d5
--- /dev/null
+++ b/autonfc/src/main/java/cc/winboll/studio/autonfc/nfc/OnNfcStateListener.java
@@ -0,0 +1,11 @@
+package cc.winboll.studio.autonfc.nfc;
+
+public interface OnNfcStateListener {
+    void onNfcConnected(); // 无参数！
+    void onNfcDisconnected();
+    void onNfcReadSuccess(String data);
+    void onNfcReadFail(String error);
+    void onNfcWriteSuccess();
+    void onNfcWriteFail(String error);
+}
+
diff --git a/autonfc/src/main/res/drawable-v24/ic_launcher_foreground.xml b/autonfc/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..c7bd21d
--- /dev/null
+++ b/autonfc/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
diff --git a/autonfc/src/main/res/drawable/ic_launcher_background.xml b/autonfc/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..d5fccc5
--- /dev/null
+++ b/autonfc/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
diff --git a/autonfc/src/main/res/layout/activity_main.xml b/autonfc/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..a6032d0
--- /dev/null
+++ b/autonfc/src/main/res/layout/activity_main.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:gravity="center_vertical|center_horizontal">
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="NFC Interface Activity"
+			android:onClick="onNFCInterfaceActivity"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+
diff --git a/autonfc/src/main/res/layout/activity_nfc_interface.xml b/autonfc/src/main/res/layout/activity_nfc_interface.xml
new file mode 100644
index 0000000..b7e1800
--- /dev/null
+++ b/autonfc/src/main/res/layout/activity_nfc_interface.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:padding="16dp">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="脚本名称 script:"/>
+
+		<EditText
+			android:id="@+id/et_script"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="如 auth.sh"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:text="参数 args (逗号分隔):"/>
+
+		<EditText
+			android:id="@+id/et_args"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="user1,pass123"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:text="工作目录 workDir:"/>
+
+		<EditText
+			android:id="@+id/et_workDir"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="/data/data/com.termux/files/home"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:text="后台执行 background (true/false):"/>
+
+		<EditText
+			android:id="@+id/et_background"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="true"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:text="结果目录 resultDir:"/>
+
+		<EditText
+			android:id="@+id/et_resultDir"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="/data/data/com.termux/files/log"/>
+
+		<Button
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:onClick="onFillTestDataClick"
+			android:text="填入调试数据 (BuildWinBoLLProject.sh)"/>
+
+		<Button
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:onClick="onWriteClick"
+			android:text="写入 NFC (NfcTermuxCmd JSON)"/>
+
+		<TextView
+			android:id="@+id/tv_status"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:text="状态"/>
+
+		<TextView
+			android:id="@+id/tv_result"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:scrollbars="vertical"
+			android:textSize="14sp"/>
+
+	</LinearLayout>
+
+</ScrollView>
+
diff --git a/autonfc/src/main/res/menu/main_menu.xml b/autonfc/src/main/res/menu/main_menu.xml
new file mode 100644
index 0000000..4cbce25
--- /dev/null
+++ b/autonfc/src/main/res/menu/main_menu.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_log"
+        android:title="启动日志"/>
+</menu>
diff --git a/autonfc/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/autonfc/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/autonfc/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/autonfc/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/autonfc/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/autonfc/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/autonfc/src/main/res/mipmap-hdpi/ic_launcher.png b/autonfc/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..a2f5908
Binary files /dev/null and b/autonfc/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/autonfc/src/main/res/mipmap-hdpi/ic_launcher_round.png b/autonfc/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b52399
Binary files /dev/null and b/autonfc/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/autonfc/src/main/res/mipmap-mdpi/ic_launcher.png b/autonfc/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..ff10afd
Binary files /dev/null and b/autonfc/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/autonfc/src/main/res/mipmap-mdpi/ic_launcher_round.png b/autonfc/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..115a4c7
Binary files /dev/null and b/autonfc/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/autonfc/src/main/res/mipmap-xhdpi/ic_launcher.png b/autonfc/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..dcd3cd8
Binary files /dev/null and b/autonfc/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/autonfc/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/autonfc/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..459ca60
Binary files /dev/null and b/autonfc/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/autonfc/src/main/res/mipmap-xxhdpi/ic_launcher.png b/autonfc/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8ca12fe
Binary files /dev/null and b/autonfc/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/autonfc/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/autonfc/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8e19b41
Binary files /dev/null and b/autonfc/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/autonfc/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/autonfc/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b824ebd
Binary files /dev/null and b/autonfc/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/autonfc/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/autonfc/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4c19a13
Binary files /dev/null and b/autonfc/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/autonfc/src/main/res/values/colors.xml b/autonfc/src/main/res/values/colors.xml
new file mode 100644
index 0000000..479769a
--- /dev/null
+++ b/autonfc/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#009688</color>
+    <color name="colorPrimaryDark">#00796B</color>
+    <color name="colorAccent">#FF9800</color>
+</resources>
\ No newline at end of file
diff --git a/autonfc/src/main/res/values/strings.xml b/autonfc/src/main/res/values/strings.xml
new file mode 100644
index 0000000..21a2d6d
--- /dev/null
+++ b/autonfc/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">AutoNFC</string>
+    
+</resources>
diff --git a/autonfc/src/main/res/values/styles.xml b/autonfc/src/main/res/values/styles.xml
new file mode 100644
index 0000000..a70e242
--- /dev/null
+++ b/autonfc/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/autonfc/src/stage/AndroidManifest.xml b/autonfc/src/stage/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/autonfc/src/stage/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/autonfc/src/stage/res/values/strings.xml b/autonfc/src/stage/res/values/strings.xml
new file mode 100644
index 0000000..ace0c41
--- /dev/null
+++ b/autonfc/src/stage/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+
+</resources>
diff --git a/contacts/README.md b/contacts/README.md
new file mode 100644
index 0000000..3a2e48f
--- /dev/null
+++ b/contacts/README.md
@@ -0,0 +1,40 @@
+# Contacts
+源码参考自：
+https://github.com/aJIEw/PhoneCallApp.git
+
+#### 介绍
+这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：gradle assembleStageRelease
+
+#### 使用说明
+
+在安卓系统中需要设置两个权限允许。
+1.自启动权限允许。
+2.省电策略-无限制权限允许。
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档
diff --git a/contacts/app_update_description.txt b/contacts/app_update_description.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/contacts/app_update_description.txt
@@ -0,0 +1 @@
+
diff --git a/contacts/build.gradle b/contacts/build.gradle
new file mode 100644
index 0000000..7206901
--- /dev/null
+++ b/contacts/build.gradle
@@ -0,0 +1,100 @@
+apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+    // 检查编译标志位配置
+    assert (winbollBuildProps['stageCount'] != null)
+    assert (winbollBuildProps['baseVersion'] != null)
+    // 保存基础版本号
+    winbollBuildProps.setProperty("baseVersion", "${versionName}");
+    //保存编译标志配置
+    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+    fos.close();
+    
+    // 返回编译版本号
+    return "${versionName}." + winbollBuildProps['stageCount']
+}
+
+android {
+ 	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        applicationId "cc.winboll.studio.contacts"
+        minSdkVersion 23
+		// 适配MIUI12
+        targetSdkVersion 30
+        versionCode 2
+        // versionName 更新后需要手动设置 
+        // 项目模块目录的 build.gradle 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.14" 
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+	
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+}
+
+dependencies {
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //api 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    //api 'com.github.getActivity:XXPermissions:18.63'
+    // 下拉控件
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    // 拼音搜索
+    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
+    api 'com.github.open-android:pinyin4j:2.5.0'
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+    // 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    // AndroidX 类库
+    /*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'
+    */
+    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'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+	api 'cc.winboll.studio:libaes:15.12.13'
+    api 'cc.winboll.studio:libappbase:15.14.2'
+	
+	// WinBoLL备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:AES:aes-v15.12.9'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.14.1'
+	
+	api fileTree(dir: 'libs', include: ['*.jar'])
+}
diff --git a/contacts/build.properties b/contacts/build.properties
new file mode 100644
index 0000000..2cc727b
--- /dev/null
+++ b/contacts/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Sat Apr 18 21:14:59 HKT 2026
+stageCount=13
+libraryProject=
+baseVersion=15.14
+publishVersion=15.14.12
+buildCount=0
+baseBetaVersion=15.14.13
diff --git a/contacts/proguard-rules.pro b/contacts/proguard-rules.pro
new file mode 100644
index 0000000..855b18a
--- /dev/null
+++ b/contacts/proguard-rules.pro
@@ -0,0 +1,143 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# ============================== 基础通用规则 ==============================
+# 保留系统组件
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+# 保留 WinBoLL 核心包及子类（合并简化规则）
+-keep class cc.winboll.studio.** { *; }
+-keepclassmembers class cc.winboll.studio.** { *; }
+
+# 保留所有类中的 public static final String TAG 字段（便于日志定位）
+-keepclassmembers class * {
+    public static final java.lang.String TAG;
+}
+
+# 保留序列化类（避免Parcelable/Gson解析异常）
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留 R 文件（避免资源ID混淆）
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 保留 native 方法（避免JNI调用失败）
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保留注解和泛型（避免反射/序列化异常）
+-keepattributes *Annotation*
+-keepattributes Signature
+
+# 屏蔽 Java 8+ 警告（适配 Java 7 语法）
+-dontwarn java.lang.invoke.*
+-dontwarn android.support.v8.renderscript.*
+-dontwarn java.util.function.**
+
+# ============================== 第三方框架专项规则 ==============================
+# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容）
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class okhttp3.internal.** { *; }
+-keep class okio.** { *; }
+-dontwarn okhttp3.internal.platform.**
+-dontwarn okio.**
+# ============================== 必要补充规则 ==============================
+# OkHttp 4.4.1 补充规则（Java 7 兼容）
+-keep class okhttp3.internal.concurrent.** { *; }
+-keep class okhttp3.internal.connection.** { *; }
+-dontwarn okhttp3.internal.concurrent.TaskRunner
+-dontwarn okhttp3.internal.connection.RealCall
+
+# Glide 4.9.0（米盟广告图片加载依赖）
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
+    **[] $VALUES;
+    public *;
+}
+-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule {
+    <init>();
+}
+-dontwarn com.bumptech.glide.**
+
+# Gson 2.8.5（米盟广告数据序列化依赖）
+-keep class com.google.gson.** { *; }
+-keep interface com.google.gson.** { *; }
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 米盟 SDK（核心广告组件，完整保留避免加载失败）
+-keep class com.miui.zeus.** { *; }
+-keep interface com.miui.zeus.** { *; }
+# 保留米盟日志字段（便于广告加载失败排查）
+-keepclassmembers class com.miui.zeus.mimo.sdk.** {
+    public static final java.lang.String TAG;
+}
+
+# RecyclerView 1.0.0（米盟广告布局渲染依赖）
+-keep class androidx.recyclerview.** { *; }
+-keep interface androidx.recyclerview.** { *; }
+-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter {
+    public *;
+}
+
+# 其他第三方框架（按引入依赖保留，无则可删除）
+# XXPermissions 18.63
+-keep class com.hjq.permissions.** { *; }
+-keep interface com.hjq.permissions.** { *; }
+
+# ZXing 二维码（核心解析组件）
+-keep class com.google.zxing.** { *; }
+-keep class com.journeyapps.zxing.** { *; }
+
+# Jsoup HTML解析
+-keep class org.jsoup.** { *; }
+
+# Pinyin4j 拼音搜索
+-keep class net.sourceforge.pinyin4j.** { *; }
+
+# JSch SSH组件
+-keep class com.jcraft.jsch.** { *; }
+
+# AndroidX 基础组件
+-keep class androidx.appcompat.** { *; }
+-keep interface androidx.appcompat.** { *; }
+
+# ============================== 优化与调试配置 ==============================
+# 优化级别（平衡混淆效果与性能）
+-optimizationpasses 5
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+
+# 调试辅助（保留行号便于崩溃定位）
+-verbose
+-dontpreverify
+-dontusemixedcaseclassnames
+-keepattributes SourceFile,LineNumberTable
+
diff --git a/contacts/src/beta/AndroidManifest.xml b/contacts/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000..c598f4f
--- /dev/null
+++ b/contacts/src/beta/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application
+        tools:replace="android:icon"
+        android:icon="@drawable/ic_winbollbeta">
+
+        <!-- Put flavor specific code here -->
+    </application>
+
+</manifest>
+
diff --git a/contacts/src/beta/res/values/strings.xml b/contacts/src/beta/res/values/strings.xml
new file mode 100644
index 0000000..dc3720a
--- /dev/null
+++ b/contacts/src/beta/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Contacts+</string>
+
+</resources>
diff --git a/contacts/src/main/AndroidManifest.xml b/contacts/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..3a2a347
--- /dev/null
+++ b/contacts/src/main/AndroidManifest.xml
@@ -0,0 +1,258 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.contacts">
+
+    <!-- BIND_AUTOFILL_SERVICE -->
+    <uses-permission android:name="android.permission.BIND_AUTOFILL_SERVICE"/>
+
+    <!-- 拨打电话 -->
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+
+    <!-- 读取手机状态和身份 -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+
+    <!-- 读取电话号码 -->
+    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"/>
+
+    <!-- 修改系统设置 -->
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+
+    <!-- 读取联系人 -->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+
+    <!-- 修改您的通讯录 -->
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+
+    <!-- GET_CONTACTS -->
+    <uses-permission android:name="android.permission.GET_CONTACTS"/>
+
+    <!-- 此应用可显示在其他应用上方 -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <!-- 更改您的音频设置 -->
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+
+    <!-- 读取通话记录 -->
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+
+    <!-- 新建/修改/删除通话记录 -->
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
+
+    <!-- GET_CALL_LOG -->
+    <uses-permission android:name="android.permission.GET_CALL_LOG"/>
+
+    <!-- 录音 -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+
+    <!-- 运行前台服务 -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
+    <!-- 运行“dataSync”类型的前台服务 -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
+
+    <!-- 运行“phoneCall”类型的前台服务 -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL"/>
+
+    <!-- 运行“microphone”类型的前台服务 -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
+
+    <!-- BIND_CALL_SCREENING_SERVICE -->
+    <uses-permission android:name="android.permission.BIND_CALL_SCREENING_SERVICE"/>
+
+    <!-- 读取您共享存储空间中的内容 -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+    <!-- 修改或删除您共享存储空间中的内容 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <!-- MANAGE_EXTERNAL_STORAGE -->
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_winboll"
+        android:label="@string/app_name"
+        android:theme="@style/MyAppTheme"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name=".activities.CallActivity"
+            android:label="CallActivity"
+            android:launchMode="singleTask"
+            android:exported="true">
+
+        </activity>
+
+        <activity
+            android:name=".phonecallui.PhoneCallActivity"
+            android:launchMode="singleTask"
+            android:exported="true">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.DIAL"/>
+
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:scheme="tel"/>
+
+            </intent-filter>
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.DIAL"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity android:name="cc.winboll.studio.contacts.activities.SettingsActivity"/>
+
+        <service
+            android:name=".services.MainService"
+            android:foregroundServiceType="dataSync"
+            android:exported="false"
+            android:stopWithTask="false"/>
+
+        <service
+            android:name=".services.AssistantService"
+            android:exported="false"
+            android:stopWithTask="false"/>
+
+        <service
+            android:name=".phonecallui.PhoneCallService"
+            android:permission="android.permission.BIND_INCALL_SERVICE"
+            android:exported="false"
+            android:stopWithTask="false">
+
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_UI"
+                android:value="true"/>
+
+            <intent-filter>
+
+                <action android:name="android.telecom.InCallService"/>
+
+            </intent-filter>
+
+        </service>
+
+        <service
+            android:name=".listenphonecall.CallListenerService"
+            android:enabled="true"
+            android:exported="false"
+            android:stopWithTask="false">
+
+            <intent-filter android:priority="1000">
+
+                <action android:name=".service.CallShowService"/>
+
+            </intent-filter>
+
+        </service>
+
+        <service
+            android:name=".services.MyCallScreeningService"
+            android:permission="android.permission.BIND_CALL_SCREENING_SERVICE"
+            android:exported="true"
+            android:stopWithTask="false">
+
+            <intent-filter>
+
+                <action android:name="android.telecom.CallScreeningService"/>
+
+            </intent-filter>
+
+        </service>
+
+        <receiver
+            android:name=".receivers.MainReceiver"
+            android:stopWithTask="false">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.contacts.receivers.MainReceiver"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.APPStatusWidget"
+            android:exported="true"
+            android:stopWithTask="false">
+
+            <intent-filter>
+
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+
+                <action android:name="cc.winboll.studio.contacts.widgets.APPStatusWidget.ACTION_STATUS_ACTIVE"/>
+
+                <action android:name="cc.winboll.studio.contacts.widgets.APPStatusWidget.ACTION_STATUS_NOACTIVE"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/appwidget_provider_info"/>
+
+        </receiver>
+
+        <receiver
+            android:name=".widgets.APPStatusWidgetClickListener"
+            android:stopWithTask="false">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.contacts.widgets.APPStatusWidgetClickListener.ACTION_APPICON_CLICK"/>
+
+            </intent-filter>
+
+        </receiver>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider"/>
+
+        </provider>
+
+        <activity android:name="cc.winboll.studio.contacts.activities.UnitTestActivity"/>
+
+        <activity android:name="cc.winboll.studio.contacts.activities.AboutActivity"/>
+
+        <service android:name="cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService"/>
+
+    </application>
+
+</manifest>
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/ActivityStack.java b/contacts/src/main/java/cc/winboll/studio/contacts/ActivityStack.java
new file mode 100644
index 0000000..59a12dc
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/ActivityStack.java
@@ -0,0 +1,313 @@
+package cc.winboll.studio.contacts;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.os.Looper;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/13 06:58:04
+ * @Describe Activity 栈管理工具，统一管理应用内 Activity 生命周期
+ * 适配：Java7 + Android API29-30 + 小米机型，优化并发安全与通话场景稳定性
+ */
+public class ActivityStack {
+    // 常量定义（核心标识+版本兼容常量）
+    public static final String TAG = "ActivityStack";
+    private static final int API_VERSION_O = 26; // Android 8.0 API26（isDestroyed适配用）
+
+    // 单例与核心成员变量（按优先级排序）
+    private static final ActivityStack INSTANCE = new ActivityStack();
+    // 替换为ArrayList+同步锁：解决CopyOnWriteArrayList迭代器不能删除的崩溃，兼顾并发安全
+    private final List<Activity> mActivityList = new ArrayList<Activity>();
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper()); // 复用主线程Handler，避免内存泄漏
+
+    // 单例对外暴露方法
+    public static ActivityStack getInstance() {
+        return INSTANCE;
+    }
+
+    // 私有构造，禁止外部实例化
+    private ActivityStack() {
+        LogUtils.d(TAG, "ActivityStack 初始化完成");
+    }
+
+    // ====================== 栈基础操作（添加/移除） ======================
+    /**
+     * 添加Activity到栈中，避免重复入栈
+     * @param activity 待添加的Activity
+     */
+    public void addActivity(Activity activity) {
+        if (activity == null) {
+            LogUtils.w(TAG, "addActivity: activity is null, skip");
+            return;
+        }
+        // 同步锁：解决多线程并发添加冲突（小米机型多线程场景适配）
+        synchronized (mActivityList) {
+            if (!mActivityList.contains(activity)) {
+                mActivityList.add(activity);
+                LogUtils.d(TAG, "addActivity: " + activity.getClass().getSimpleName() + ", stack size: " + mActivityList.size());
+            }
+        }
+    }
+
+    /**
+     * 移除Activity（不销毁，用于正常退出场景）
+     * @param activity 待移除的Activity
+     */
+    public void removeActivity(Activity activity) {
+        if (activity == null) {
+            LogUtils.w(TAG, "removeActivity: activity is null, skip");
+            return;
+        }
+        synchronized (mActivityList) {
+            if (mActivityList.remove(activity)) {
+                LogUtils.d(TAG, "removeActivity: " + activity.getClass().getSimpleName() + ", stack size: " + mActivityList.size());
+            }
+        }
+    }
+
+    // ====================== Activity状态查询（获取/判断存活） ======================
+    /**
+     * 获取栈顶有效Activity（迭代遍历替代递归，避免栈溢出，适配小米多页面场景）
+     * @return 栈顶有效Activity，无则返回null
+     */
+    public Activity getTopActivity() {
+        synchronized (mActivityList) {
+            if (mActivityList.isEmpty()) {
+                LogUtils.w(TAG, "getTopActivity: stack is empty, return null");
+                return null;
+            }
+
+            Activity validTopActivity = null;
+            // 倒序遍历，优先取最顶层有效Activity，同时清理无效残留
+            for (int i = mActivityList.size() - 1; i >= 0; i--) {
+                Activity activity = mActivityList.get(i);
+                // 版本兼容校验：API26+才支持isDestroyed
+                if (activity != null && !activity.isFinishing() && (getSdkVersion() < API_VERSION_O || !activity.isDestroyed())) {
+                    validTopActivity = activity;
+                    break;
+                } else {
+                    mActivityList.remove(i);
+                    String className = (activity != null) ? activity.getClass().getSimpleName() : "null";
+                    LogUtils.w(TAG, "getTopActivity: remove invalid activity: " + className);
+                }
+            }
+
+            if (validTopActivity != null) {
+                LogUtils.d(TAG, "getTopActivity: top activity: " + validTopActivity.getClass().getSimpleName());
+            }
+            return validTopActivity;
+        }
+    }
+
+    /**
+     * 获取指定类的有效Activity实例（通话场景核心方法，判断页面是否存活）
+     * @param activityClass 目标Activity类
+     * @return 有效实例，无则返回null
+     */
+    public Activity getActivity(Class<?> activityClass) {
+        if (activityClass == null) {
+            LogUtils.w(TAG, "getActivity: activityClass is null, return null");
+            return null;
+        }
+        synchronized (mActivityList) {
+            if (mActivityList.isEmpty()) {
+                LogUtils.w(TAG, "getActivity: stack empty, return null");
+                return null;
+            }
+
+            for (Activity activity : mActivityList) {
+                if (activity != null && activity.getClass().equals(activityClass) && !activity.isFinishing() && (getSdkVersion() < API_VERSION_O || !activity.isDestroyed())) {
+                    LogUtils.d(TAG, "getActivity: find valid activity: " + activityClass.getSimpleName());
+                    return activity;
+                }
+            }
+            LogUtils.w(TAG, "getActivity: no valid activity: " + activityClass.getSimpleName());
+            return null;
+        }
+    }
+
+    /**
+     * 判断指定Activity是否存活（简化通话场景调用，避免重复判空）
+     * @param activityClass 目标Activity类
+     * @return true：存活，false：未存活
+     */
+    public boolean isActivityAlive(Class<?> activityClass) {
+        boolean isAlive = getActivity(activityClass) != null;
+        LogUtils.d(TAG, "isActivityAlive: " + activityClass.getSimpleName() + ", result: " + isAlive);
+        return isAlive;
+    }
+
+    // ====================== Activity销毁操作（单/批量/全部） ======================
+    /**
+     * 销毁栈顶Activity（主线程执行，适配小米机型线程限制）
+     */
+    public void finishTopActivity() {
+        runOnMainThread(new Runnable() {
+				@Override
+				public void run() {
+					synchronized (mActivityList) {
+						if (mActivityList.isEmpty()) {
+							LogUtils.w(TAG, "finishTopActivity: stack is empty, skip");
+							return;
+						}
+
+						// 先移除再校验，避免并发冲突（小米多线程场景适配）
+						Activity topActivity = mActivityList.remove(mActivityList.size() - 1);
+						if (topActivity == null) {
+							LogUtils.w(TAG, "finishTopActivity: top activity is null, skip");
+							return;
+						}
+
+						if (!topActivity.isFinishing() && (getSdkVersion() < API_VERSION_O || !topActivity.isDestroyed())) {
+							topActivity.finish();
+							LogUtils.d(TAG, "finishTopActivity: destroy top activity: " + topActivity.getClass().getSimpleName() + ", stack size: " + mActivityList.size());
+						}
+					}
+				}
+			});
+    }
+
+    /**
+     * 销毁指定Activity（主线程执行，避免跨线程异常）
+     * @param activity 待销毁的Activity
+     */
+    public void finishActivity(final Activity activity) {
+        runOnMainThread(new Runnable() {
+				@Override
+				public void run() {
+					if (activity == null) {
+						LogUtils.w(TAG, "finishActivity: activity is null, skip");
+						return;
+					}
+					synchronized (mActivityList) {
+						if (mActivityList.contains(activity) && !activity.isFinishing() && (getSdkVersion() < API_VERSION_O || !activity.isDestroyed())) {
+							mActivityList.remove(activity);
+							activity.finish();
+							LogUtils.d(TAG, "finishActivity: destroy activity: " + activity.getClass().getSimpleName() + ", stack size: " + mActivityList.size());
+						}
+					}
+				}
+			});
+    }
+
+    /**
+     * 销毁指定类的所有Activity（核心修复：迭代器删除崩溃，通话场景核心）
+     * @param activityClass 目标Activity类
+     */
+    public void finishActivity(final Class<?> activityClass) {
+        runOnMainThread(new Runnable() {
+				@Override
+				public void run() {
+					if (activityClass == null) {
+						LogUtils.w(TAG, "finishActivity: activityClass is null, skip");
+						return;
+					}
+					synchronized (mActivityList) {
+						if (mActivityList.isEmpty()) {
+							LogUtils.w(TAG, "finishActivity: stack empty, skip");
+							return;
+						}
+
+						// 核心修复：用索引遍历+倒序删除，替代迭代器删除（避免UnsupportedOperationException）
+						for (int i = mActivityList.size() - 1; i >= 0; i--) {
+							Activity activity = mActivityList.get(i);
+							if (activity != null && activity.getClass().equals(activityClass)) {
+								if (!activity.isFinishing() && (getSdkVersion() < API_VERSION_O || !activity.isDestroyed())) {
+									mActivityList.remove(i); // 索引删除，支持ArrayList
+									activity.finish();
+									LogUtils.d(TAG, "finishActivity: destroy class activity: " + activityClass.getSimpleName() + ", stack size: " + mActivityList.size());
+								} else {
+									mActivityList.remove(i); // 清理无效残留
+								}
+							}
+						}
+					}
+				}
+			});
+    }
+
+    /**
+     * 销毁栈中所有Activity（退出应用/清空栈场景用）
+     */
+    public void finishAllActivity() {
+        runOnMainThread(new Runnable() {
+				@Override
+				public void run() {
+					synchronized (mActivityList) {
+						if (mActivityList.isEmpty()) {
+							LogUtils.w(TAG, "finishAllActivity: stack is empty, skip");
+							return;
+						}
+
+						// 遍历销毁所有有效Activity，逐个状态校验（小米机型稳定性适配）
+						for (Activity activity : mActivityList) {
+							if (activity != null && !activity.isFinishing() && (getSdkVersion() < API_VERSION_O || !activity.isDestroyed())) {
+								activity.finish();
+								LogUtils.d(TAG, "finishAllActivity: destroy activity: " + activity.getClass().getSimpleName());
+							}
+						}
+						mActivityList.clear();
+						LogUtils.d(TAG, "finishAllActivity: all activity destroyed, stack cleared");
+					}
+				}
+			});
+    }
+
+    // ====================== 栈优化与工具方法 ======================
+    /**
+     * 清理栈中所有无效Activity（null/已销毁/已结束），优化小米机型内存占用
+     */
+    public void clearInvalidActivities() {
+        runOnMainThread(new Runnable() {
+				@Override
+				public void run() {
+					synchronized (mActivityList) {
+						if (mActivityList.isEmpty()) {
+							return;
+						}
+
+						// 倒序索引删除，避免遍历过程中索引错乱
+						for (int i = mActivityList.size() - 1; i >= 0; i--) {
+							Activity activity = mActivityList.get(i);
+							if (activity == null || activity.isFinishing() || (getSdkVersion() >= API_VERSION_O && activity.isDestroyed())) {
+								mActivityList.remove(i);
+								String className = (activity != null) ? activity.getClass().getSimpleName() : "null";
+								LogUtils.d(TAG, "clearInvalidActivities: remove invalid activity: " + className);
+							}
+						}
+						LogUtils.d(TAG, "clearInvalidActivities: done, stack size: " + mActivityList.size());
+					}
+				}
+			});
+    }
+
+    /**
+     * 确保任务在主线程执行（Activity操作必须主线程，小米机型严格限制）
+     * @param runnable 待执行任务
+     */
+    private void runOnMainThread(Runnable runnable) {
+        if (runnable == null) {
+            return;
+        }
+        // 避免不必要的线程切换，优化性能（小米机型流畅度适配）
+        if (Looper.getMainLooper() == Looper.myLooper()) {
+            runnable.run();
+        } else {
+            mMainHandler.post(runnable);
+            LogUtils.d(TAG, "runOnMainThread: post task to main thread");
+        }
+    }
+
+    /**
+     * 辅助方法：获取当前系统SDK版本（简化版本判断逻辑，统一调用）
+     * @return SDK版本号
+     */
+    private int getSdkVersion() {
+        return android.os.Build.VERSION.SDK_INT;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/App.java b/contacts/src/main/java/cc/winboll/studio/contacts/App.java
new file mode 100644
index 0000000..05e51ac
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/App.java
@@ -0,0 +1,33 @@
+package cc.winboll.studio.contacts;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2024/12/08 15:10:51
+ * @Describe 全局应用类
+ */
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class App extends GlobalApplication {
+
+    public static final String TAG = "App";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+		// 设置应用调试标志
+        setIsDebugging(BuildConfig.DEBUG);
+
+		// 初始化窗口管理类
+		WinBoLLActivityManager.init(this);
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+    }
+
+	@Override
+	public void onTerminate() {
+		super.onTerminate();
+		ToastUtils.release();
+	}
+}
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java
new file mode 100644
index 0000000..b997cf5
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java
@@ -0,0 +1,529 @@
+package cc.winboll.studio.contacts;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.telecom.TelecomManager;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import cc.winboll.studio.contacts.activities.SettingsActivity;
+import cc.winboll.studio.contacts.activities.WinBollActivity;
+import cc.winboll.studio.contacts.dun.Rules;
+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.model.MainServiceBean;
+import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.contacts.utils.PermissionUtils;
+import cc.winboll.studio.contacts.views.DunTemperatureView;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.views.ADsBannerView;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import com.google.android.material.tabs.TabLayout;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/08/30 14:32
+ * @Describe Contacts 主窗口（完全适配 API 30 + Java 7 语法）
+ * 核心优化：1. 移除电话状态监听 2. 移除通话筛选服务 3. 移除 MainService 所有相关逻辑 4. ViewPager 实现 Fragment 懒加载（仅首屏初始化）
+ * 问题修复：解决首屏 Fragment 空白问题（删除 setPrimaryItem 冲突逻辑+延迟首屏初始化）
+ */
+public final class MainActivity extends WinBollActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
+
+    // ====================== 1. 常量定义区（硬编码API版本，避免高版本依赖） ======================
+    public static final String TAG = "MainActivity";
+    public static final int REQUEST_HOME_ACTIVITY = 0;
+    public static final int REQUEST_ABOUT_ACTIVITY = 1;
+    public static final int REQUEST_APP_SETTINGS = 2;
+    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoLL.ACTION_SOS";
+    private static final int DIALER_REQUEST_CODE = 1;
+    private static final int REQUEST_REQUIRED_PERMISSIONS = 1002;
+    private static final int REQUEST_OVERLAY_PERMISSION = 1003;
+
+    // API版本硬编码常量（Java 7兼容，杜绝Build.VERSION_CODES高版本引用）
+    private static final int ANDROID_6_API = 23;
+    private static final int ANDROID_8_API = 26;
+    private static final int ANDROID_10_API = 29;
+    private static final int ANDROID_14_API = 34;
+
+    // ====================== 2. 静态成员区 ======================
+    static MainActivity _MainActivity;
+
+    // ====================== 3. 权限常量区 ======================
+    private final String[] REQUIRED_PERMISSIONS = PermissionUtils.BASE_PERMISSIONS;
+
+    // ====================== 4. UI控件成员区 ======================
+    private ADsBannerView mADsBannerView;
+    private LogView mLogView;
+    private Toolbar mToolbar;
+    private CheckBox cbMainService;
+    private TabLayout tabLayout;
+    private ViewPager viewPager;
+    private List<View> views;
+    private ImageView[] imageViews;
+    private LinearLayout linearLayout;
+
+    // ====================== 5. 业务逻辑成员区 ======================
+    private int currentPoint = 0;
+    private List<Fragment> fragmentList;
+    private List<String> tabTitleList;
+    // 记录已初始化的Fragment位置（避免重复初始化）
+    private boolean[] isFragmentInit;
+
+    // ====================== 6. 接口实现区 ======================
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    // ====================== 7. 生命周期函数区 ======================
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "===== onCreate: 主Activity开始创建 =====");
+        _MainActivity = this;
+
+        // 直接初始化UI（原权限检查逻辑注释保留，按需启用）
+        initUIAndLogic(savedInstanceState);
+
+		MainServiceBean mainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+		if (mainServiceBean != null && mainServiceBean.isEnable()) {
+			Intent intent = new Intent(this, MainService.class);
+			// 根据应用前后台状态选择启动方式（Android 12+ 后台用 startForegroundService）
+			if (Build.VERSION.SDK_INT >= 31) {
+				startForegroundService(intent);
+			} else {
+				startService(intent);
+			}
+		}
+        LogUtils.d(TAG, "===== onCreate: 主Activity创建流程结束 =====");
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        LogUtils.d(TAG, "onPostCreate: 主Activity创建完成");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mADsBannerView != null) {
+            mADsBannerView.resumeADs(MainActivity.this);
+            LogUtils.d(TAG, "onResume: 广告栏资源已恢复");
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "===== onDestroy: 主Activity开始销毁 =====");
+        // 释放广告资源
+        if (mADsBannerView != null) {
+            mADsBannerView.releaseAdResources();
+            LogUtils.d(TAG, "onDestroy: 广告栏资源已释放");
+        }
+        // 清空Fragment相关引用，避免内存泄漏
+        if (fragmentList != null) {
+            fragmentList.clear();
+            fragmentList = null;
+        }
+        if (tabTitleList != null) {
+            tabTitleList.clear();
+            tabTitleList = null;
+        }
+        isFragmentInit = null;
+        LogUtils.d(TAG, "===== onDestroy: 主Activity销毁完成 =====");
+    }
+
+    // ====================== 8. 权限相关回调函数区 ======================
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        LogUtils.d(TAG, "onRequestPermissionsResult: 权限请求回调，requestCode=" + requestCode);
+
+        if (requestCode == REQUEST_REQUIRED_PERMISSIONS) {
+            String deniedPerms = PermissionUtils.getDeniedPermissions(this, permissions);
+            if (deniedPerms.length() == 0) {
+                LogUtils.d(TAG, "onRequestPermissionsResult: 所有危险权限授予成功");
+                checkAndRequestRemainingPermissions();
+            } else {
+                LogUtils.e(TAG, "onRequestPermissionsResult: 被拒权限：" + deniedPerms);
+                showPermissionDeniedDialogAndExit("应用需要「" + deniedPerms + "」权限才能正常运行，请授予权限后重新打开应用。");
+            }
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        LogUtils.d(TAG, "onActivityResult: 页面回调触发，requestCode=" + requestCode + "，resultCode=" + resultCode);
+
+        switch (requestCode) {
+            case DIALER_REQUEST_CODE:
+                if (resultCode == Activity.RESULT_OK) {
+                    LogUtils.d(TAG, "onActivityResult: 设为默认拨号应用成功");
+                    Toast.makeText(MainActivity.this, getString(R.string.app_name) + " 已成为默认电话应用", Toast.LENGTH_SHORT).show();
+                }
+                break;
+            case REQUEST_APP_SETTINGS:
+                LogUtils.d(TAG, "onActivityResult: 从设置页返回，重建Activity");
+                recreate();
+                break;
+            case REQUEST_OVERLAY_PERMISSION:
+                handleOverlayPermissionResult();
+                break;
+            default:
+                LogUtils.w(TAG, "onActivityResult: 未知requestCode=" + requestCode);
+                break;
+        }
+    }
+
+    /**
+     * 处理悬浮窗权限申请结果
+     */
+    private void handleOverlayPermissionResult() {
+        if (PermissionUtils.isOverlayPermissionGranted(this)) {
+            LogUtils.d(TAG, "handleOverlayPermissionResult: 悬浮窗权限申请成功");
+            LogUtils.d(TAG, "handleOverlayPermissionResult: 所有权限已授予");
+            initUIAndLogic(null);
+        } else {
+            LogUtils.e(TAG, "handleOverlayPermissionResult: 悬浮窗权限申请失败");
+            showPermissionDeniedDialogAndExit("应用需要悬浮窗权限才能展示来电弹窗，请授予后重新打开应用。");
+        }
+    }
+
+    /**
+     * 检查并申请剩余权限（仅保留悬浮窗）
+     */
+    private void checkAndRequestRemainingPermissions() {
+        if (!PermissionUtils.isOverlayPermissionGranted(this)) {
+            LogUtils.d(TAG, "checkAndRequestRemainingPermissions: 悬浮窗权限未授予，跳转设置页");
+            PermissionUtils.requestOverlayPermission(this, REQUEST_OVERLAY_PERMISSION);
+        } else {
+            LogUtils.d(TAG, "checkAndRequestRemainingPermissions: 所有权限已授予");
+            initUIAndLogic(null);
+        }
+    }
+
+    /**
+     * 权限拒绝提示对话框（Java 7 匿名内部类实现，禁止Lambda）
+     */
+    private void showPermissionDeniedDialogAndExit(String tip) {
+        LogUtils.d(TAG, "showPermissionDeniedDialogAndExit: 弹出权限不足提示框");
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("权限不足，无法使用");
+        builder.setMessage(tip);
+        builder.setCancelable(false);
+
+        builder.setNegativeButton("去设置", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+					LogUtils.d(TAG, "showPermissionDeniedDialogAndExit: 用户选择去设置权限");
+					PermissionUtils.goAppDetailsSettings(MainActivity.this);
+				}
+			});
+
+        builder.setPositiveButton("确定退出", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+					LogUtils.d(TAG, "showPermissionDeniedDialogAndExit: 用户选择退出应用");
+					finishAndRemoveTask();
+				}
+			});
+
+        builder.show();
+    }
+
+    // ====================== 9. UI与业务逻辑初始化区 ======================
+    private void initUIAndLogic(Bundle savedInstanceState) {
+        if (mToolbar != null) {
+            LogUtils.d(TAG, "initUIAndLogic: UI已初始化，无需重复执行");
+            return;
+        }
+
+        LogUtils.d(TAG, "===== initUIAndLogic: 开始初始化UI与业务逻辑 =====");
+        setContentView(R.layout.activity_main);
+
+        // 1. 工具栏初始化
+        mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1);
+        setSupportActionBar(mToolbar);
+        getSupportActionBar().setSubtitle(TAG);
+        LogUtils.d(TAG, "initUIAndLogic: 工具栏初始化完成");
+
+        // 2. TabLayout与ViewPager初始化
+        tabLayout = (TabLayout) findViewById(R.id.tabLayout);
+        viewPager = (ViewPager) findViewById(R.id.viewPager);
+        initViewPagerAndTabs();
+        tabLayout.setupWithViewPager(viewPager);
+        LogUtils.d(TAG, "initUIAndLogic: ViewPager与TabLayout初始化完成");
+
+        // 3. 广告栏初始化
+        mADsBannerView = (ADsBannerView) findViewById(R.id.adsbanner);
+        LogUtils.d(TAG, "initUIAndLogic: 广告栏控件初始化完成");
+
+        // 左边盾值视图初始化（Java7分步写法，禁止链式调用）
+        DunTemperatureView tempViewLeft = (DunTemperatureView) findViewById(R.id.dun_temp_view_left);
+        tempViewLeft.setMaxValue(Rules.getInstance(this).getSettingsModel().getDunTotalCount());
+        tempViewLeft.setCurrentValue(Rules.getInstance(this).getSettingsModel().getDunCurrentCount());
+
+        int[] customColors = new int[2];
+        customColors[0] = Color.parseColor("#FF3366FF");
+        customColors[1] = Color.parseColor("#FF9900CC");
+        float[] positions = new float[2];
+        positions[0] = 0.0f;
+        positions[1] = 1.0f;
+        tempViewLeft.setGradientColors(customColors, positions);
+        // 文本放在温度条右侧（默认，可省略）
+        tempViewLeft.setTextPosition(true);
+        // 右边盾值视图初始化（Java7分步写法，禁止链式调用）
+        DunTemperatureView tempViewRight = (DunTemperatureView) findViewById(R.id.dun_temp_view_right);
+        tempViewRight.setMaxValue(Rules.getInstance(this).getSettingsModel().getDunTotalCount());
+        tempViewRight.setCurrentValue(Rules.getInstance(this).getSettingsModel().getDunCurrentCount());
+
+        tempViewRight.setGradientColors(customColors, positions);
+        // 文本放在温度条左侧
+        tempViewRight.setTextPosition(false);
+        LogUtils.d(TAG, "initUIAndLogic: 盾值视图初始化完成");
+        LogUtils.d(TAG, "===== initUIAndLogic: 初始化流程全部结束 =====");
+    }
+
+    /**
+     * 初始化ViewPager与Tab数据（Java7规范，泛型完整声明），添加懒加载标记
+     * 关键修改：延迟50ms初始化首屏，确保Fragment控件就绪；删除setPrimaryItem冲突逻辑
+     */
+    private void initViewPagerAndTabs() {
+        LogUtils.d(TAG, "initViewPagerAndTabs: 开始初始化ViewPager数据");
+        fragmentList = new ArrayList<Fragment>();
+        tabTitleList = new ArrayList<String>();
+
+        // 添加Fragment实例（仅创建对象，不初始化业务逻辑）
+        fragmentList.add(CallLogFragment.newInstance(0));
+        fragmentList.add(ContactsFragment.newInstance(1));
+        fragmentList.add(LogFragment.newInstance(2));
+        tabTitleList.add("通话记录");
+        tabTitleList.add("联系人");
+        tabTitleList.add("应用日志");
+
+        // 初始化懒加载标记数组（默认均未初始化）
+        int fragmentCount = fragmentList.size();
+        isFragmentInit = new boolean[fragmentCount];
+        for (int i = 0; i < fragmentCount; i++) {
+            isFragmentInit[i] = false;
+        }
+
+        // 设置自定义适配器（已删除setPrimaryItem，避免初始化冲突）
+        LazyLoadPagerAdapter adapter = new LazyLoadPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList);
+        viewPager.setAdapter(adapter);
+        // 关闭预加载（设为0仅加载当前页，关键）
+        viewPager.setOffscreenPageLimit(0);
+        viewPager.addOnPageChangeListener(this);
+
+        // 关键优化：延迟50ms初始化首屏（确保Fragment已完成onCreateView，控件绑定就绪）
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					initFragmentByPosition(0);
+					LogUtils.d(TAG, "initViewPagerAndTabs: 延迟初始化首屏Fragment，位置=0");
+				}
+			}, 50);
+
+        LogUtils.d(TAG, "initViewPagerAndTabs: ViewPager初始化完成，等待延迟初始化首屏");
+    }
+
+    /**
+     * 根据位置初始化Fragment（调用Fragment的初始化逻辑，避免重复执行）
+     * 优化：添加isAdded判断，确保Fragment已附加到Activity，防止上下文空指针
+     */
+    private void initFragmentByPosition(int position) {
+        // 校验位置合法性 + 避免重复初始化 + 确保Fragment已附加到Activity
+        if (position < 0 || position >= fragmentList.size() || isFragmentInit[position]) {
+            return;
+        }
+        Fragment targetFragment = fragmentList.get(position);
+        if (targetFragment != null && targetFragment.isAdded()) {
+            // 触发Fragment初始化（调用各Fragment的initData方法）
+            if (targetFragment instanceof CallLogFragment) {
+                ((CallLogFragment) targetFragment).initData();
+            } else if (targetFragment instanceof ContactsFragment) {
+                ((ContactsFragment) targetFragment).initData();
+            } else if (targetFragment instanceof LogFragment) {
+                ((LogFragment) targetFragment).initData();
+            }
+            // 标记为已初始化
+            isFragmentInit[position] = true;
+            LogUtils.d(TAG, "initFragmentByPosition: 初始化Fragment，位置=" + position + "，标题=" + tabTitleList.get(position));
+        } else {
+            LogUtils.w(TAG, "initFragmentByPosition: Fragment未附加到Activity/实例为空，位置=" + position);
+        }
+    }
+
+    // ====================== 10. 菜单相关函数区 ======================
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_main, menu);
+        LogUtils.d(TAG, "onCreateOptionsMenu: 菜单加载完成");
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.item_settings) {
+            LogUtils.d(TAG, "onOptionsItemSelected: 用户点击设置菜单");
+            startActivity(new Intent(this, SettingsActivity.class));
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    // ====================== 11. ViewPager页面回调区（切换时初始化对应Fragment） ======================
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
+
+    @Override
+    public void onPageSelected(int position) {
+        currentPoint = position;
+        LogUtils.d(TAG, "onPageSelected: 页面切换至[" + position + "]，标题=" + tabTitleList.get(position));
+        // 切换页面时，初始化当前页Fragment（未初始化过才执行）
+        initFragmentByPosition(position);
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {}
+
+    @Override
+    public void onClick(View v) {}
+
+    // ====================== 12. 工具函数区 ======================
+    /**
+     * 拨号工具方法（添加空指针防护）
+     */
+    public static void dialPhoneNumber(String phoneNumber) {
+        if (_MainActivity == null) {
+            LogUtils.e(TAG, "dialPhoneNumber: MainActivity实例为空，无法拨号");
+            return;
+        }
+        if (phoneNumber == null || phoneNumber.trim().isEmpty()) {
+            LogUtils.e(TAG, "dialPhoneNumber: 拨号号码为空");
+            return;
+        }
+        if (PermissionUtils.checkPermission(_MainActivity, Manifest.permission.CALL_PHONE)) {
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            intent.setData(Uri.parse("tel:" + phoneNumber));
+            LogUtils.d(TAG, "dialPhoneNumber: 发起拨号，号码=" + phoneNumber);
+            _MainActivity.startActivity(intent);
+        } else {
+            LogUtils.e(TAG, "dialPhoneNumber: 拨号权限不足，无法发起拨号");
+            Toast.makeText(_MainActivity, "拨号权限不足", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    /**
+     * 判断是否为默认拨号应用（适配API30，硬编码版本判断）
+     */
+    public boolean isDefaultPhoneCallApp() {
+        if (Build.VERSION.SDK_INT >= ANDROID_6_API) {
+            TelecomManager manager = (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
+            if (manager != null && manager.getDefaultDialerPackage() != null) {
+                boolean isDefault = manager.getDefaultDialerPackage().equals(getPackageName());
+                LogUtils.d(TAG, "isDefaultPhoneCallApp: 是否为默认拨号应用=" + isDefault);
+                return isDefault;
+            }
+        }
+        LogUtils.d(TAG, "isDefaultPhoneCallApp: 系统版本低于Android 6，无法判断");
+        return false;
+    }
+
+    /**
+     * 检查服务是否正在运行（通用工具方法，添加空指针防护）
+     */
+    public boolean isServiceRunning(Class<?> serviceClass) {
+        if (serviceClass == null) {
+            LogUtils.e(TAG, "isServiceRunning: 服务类参数为null");
+            return false;
+        }
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        if (manager == null) {
+            LogUtils.w(TAG, "isServiceRunning: ActivityManager获取失败");
+            return false;
+        }
+
+        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                LogUtils.d(TAG, "isServiceRunning: 服务[" + serviceClass.getSimpleName() + "]正在运行");
+                return true;
+            }
+        }
+        LogUtils.d(TAG, "isServiceRunning: 服务[" + serviceClass.getSimpleName() + "]未运行");
+        return false;
+    }
+
+    // ====================== 13. 内部类定义区（Java 7 规范，禁止Lambda） ======================
+    /**
+     * 自定义懒加载ViewPager适配器（删除setPrimaryItem方法，解决首屏初始化冲突）
+     */
+    private class LazyLoadPagerAdapter extends FragmentPagerAdapter {
+        private final List<Fragment> fragmentList;
+        private final List<String> tabTitleList;
+
+        public LazyLoadPagerAdapter(FragmentManager fm, List<Fragment> fragmentList, List<String> tabTitleList) {
+            super(fm);
+            this.fragmentList = fragmentList;
+            this.tabTitleList = tabTitleList;
+            LogUtils.d(MainActivity.TAG, "LazyLoadPagerAdapter: 初始化完成，Fragment数量=" + fragmentList.size());
+        }
+
+        @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);
+        }
+
+        // 【已删除】移除setPrimaryItem方法，避免与手动初始化+onPageSelected回调冲突
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java
new file mode 100644
index 0000000..792d59d
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java
@@ -0,0 +1,116 @@
+package cc.winboll.studio.contacts.activities;
+
+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.contacts.R;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.APPInfo;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libaes.views.AboutView;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/31 15:15:54
+ * @Describe 应用介绍窗口
+ */
+public class AboutActivity extends WinBollActivity implements IWinBoLLActivity {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "AboutActivity";
+    private static final String BRANCH_NAME = "contacts";
+
+    // ====================== 成员变量区 ======================
+    private Context mContext;
+    private Toolbar mToolbar;
+
+    // ====================== 接口实现区 ======================
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    // ====================== 生命周期函数区 ======================
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: 关于页面开始创建");
+
+        mContext = this;
+        setContentView(R.layout.activity_about);
+
+        // 初始化工具栏
+        initToolbar();
+        // 初始化关于页面视图
+        initAboutView();
+        // 注册Activity管理
+        WinBoLLActivityManager.getInstance().add(this);
+
+        LogUtils.d(TAG, "onCreate: 关于页面初始化完成");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: 关于页面开始销毁");
+        WinBoLLActivityManager.getInstance().registeRemove(this);
+        LogUtils.d(TAG, "onDestroy: 关于页面销毁完成");
+    }
+
+    // ====================== 控件初始化函数区 ======================
+    private void initToolbar() {
+        LogUtils.d(TAG, "initToolbar: 初始化工具栏");
+        // Java7 适配：添加强制类型转换
+        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(TAG);
+        // 非空判断，避免空指针异常
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
+    private void initAboutView() {
+        LogUtils.d(TAG, "initAboutView: 初始化关于页面内容视图");
+        AboutView aboutView = createAboutView();
+        LinearLayout layout = (LinearLayout) findViewById(R.id.aboutviewroot_ll);
+
+        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+			ViewGroup.LayoutParams.MATCH_PARENT,
+			ViewGroup.LayoutParams.MATCH_PARENT
+        );
+        layout.addView(aboutView, params);
+        LogUtils.d(TAG, "initAboutView: AboutView已添加到布局");
+    }
+
+    // ====================== 业务逻辑函数区 ======================
+    private AboutView createAboutView() {
+        LogUtils.d(TAG, "createAboutView: 构建APP信息并创建AboutView");
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("Contacts");
+        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
+        appInfo.setAppDescription("这是可以根据正则表达式匹配拦截骚扰电话的手机拨号应用。");
+        appInfo.setAppGitName("WinBoLL");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(BRANCH_NAME);
+        appInfo.setAppGitAPPSubProjectFolder(BRANCH_NAME);
+        appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=Contacts");
+        appInfo.setAppAPKName("Contacts");
+        appInfo.setAppAPKFolderName("Contacts");
+
+        return new AboutView(mContext, appInfo);
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java
new file mode 100644
index 0000000..b06356d
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java
@@ -0,0 +1,159 @@
+package cc.winboll.studio.contacts.activities;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/20 17:15:46
+ * @Describe 拨号窗口
+ */
+public class CallActivity extends AppCompatActivity {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "CallActivity";
+    private static final int REQUEST_CALL_PHONE = 1;
+
+    // ====================== UI控件区 ======================
+    private EditText phoneNumberEditText;
+    private TextView callStatusTextView;
+    private Button dialButton;
+
+    // ====================== 业务成员区 ======================
+    private TelephonyManager telephonyManager;
+    private MyPhoneStateListener phoneStateListener;
+
+    // ====================== 生命周期函数区 ======================
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: 拨号页面开始创建");
+        setContentView(R.layout.activity_call);
+
+        // 初始化控件
+        initViews();
+        // 初始化电话状态监听
+        initPhoneStateListener();
+        LogUtils.d(TAG, "onCreate: 拨号页面初始化完成");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: 拨号页面开始销毁");
+        // 取消电话状态监听，避免内存泄漏
+        if (telephonyManager != null && phoneStateListener != null) {
+            telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE);
+            LogUtils.d(TAG, "onDestroy: 电话状态监听已取消");
+        }
+        LogUtils.d(TAG, "onDestroy: 拨号页面销毁完成");
+    }
+
+    // ====================== 权限回调函数区 ======================
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        LogUtils.d(TAG, "onRequestPermissionsResult: 权限请求回调，requestCode=" + requestCode);
+        if (requestCode == REQUEST_CALL_PHONE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                LogUtils.d(TAG, "onRequestPermissionsResult: 拨打电话权限授予成功");
+                String phoneNumber = phoneNumberEditText.getText().toString().trim();
+                dialPhoneNumber(phoneNumber);
+            } else {
+                LogUtils.w(TAG, "onRequestPermissionsResult: 拨打电话权限被拒绝");
+                Toast.makeText(this, "未授予拨打电话权限", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    // ====================== 控件初始化函数区 ======================
+    private void initViews() {
+        LogUtils.d(TAG, "initViews: 初始化UI控件");
+        // Java7 适配：添加强制类型转换
+        phoneNumberEditText = (EditText) findViewById(R.id.phone_number);
+        dialButton = (Button) findViewById(R.id.dial_button);
+        callStatusTextView = (TextView) findViewById(R.id.call_status);
+
+        // 设置拨号按钮点击事件
+        dialButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					String phoneNumber = phoneNumberEditText.getText().toString().trim();
+					LogUtils.d(TAG, "initViews: 拨号按钮点击，号码=" + phoneNumber);
+					if (phoneNumber.isEmpty()) {
+						Toast.makeText(CallActivity.this, "请输入电话号码", Toast.LENGTH_SHORT).show();
+						return;
+					}
+
+					// 权限检查
+					if (ContextCompat.checkSelfPermission(CallActivity.this, Manifest.permission.CALL_PHONE)
+                        != PackageManager.PERMISSION_GRANTED) {
+						LogUtils.w(TAG, "initViews: 拨打电话权限未授予，发起权限申请");
+						ActivityCompat.requestPermissions(CallActivity.this,
+														  new String[]{Manifest.permission.CALL_PHONE},
+														  REQUEST_CALL_PHONE);
+					} else {
+						dialPhoneNumber(phoneNumber);
+					}
+				}
+			});
+    }
+
+    // ====================== 电话状态监听初始化函数区 ======================
+    private void initPhoneStateListener() {
+        LogUtils.d(TAG, "initPhoneStateListener: 初始化电话状态监听");
+        telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+        phoneStateListener = new MyPhoneStateListener();
+        telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+    }
+
+    // ====================== 核心业务函数区 ======================
+    private void dialPhoneNumber(String phoneNumber) {
+        LogUtils.d(TAG, "dialPhoneNumber: 发起拨号，号码=" + phoneNumber);
+        Intent intent = new Intent(Intent.ACTION_CALL);
+        intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+            LogUtils.e(TAG, "dialPhoneNumber: 拨打电话权限缺失，拨号失败");
+            return;
+        }
+        startActivity(intent);
+    }
+
+    // ====================== 内部电话状态监听类 ======================
+    private class MyPhoneStateListener extends PhoneStateListener {
+        @Override
+        public void onCallStateChanged(int state, String incomingNumber) {
+            super.onCallStateChanged(state, incomingNumber);
+            switch (state) {
+                case TelephonyManager.CALL_STATE_IDLE:
+                    callStatusTextView.setText("电话已挂断");
+                    LogUtils.d(TAG, "MyPhoneStateListener: 通话状态-挂断");
+                    break;
+                case TelephonyManager.CALL_STATE_OFFHOOK:
+                    callStatusTextView.setText("正在通话中");
+                    LogUtils.d(TAG, "MyPhoneStateListener: 通话状态-通话中");
+                    break;
+                case TelephonyManager.CALL_STATE_RINGING:
+                    callStatusTextView.setText("来电: " + incomingNumber);
+                    LogUtils.d(TAG, "MyPhoneStateListener: 通话状态-来电，号码=" + incomingNumber);
+                    break;
+            }
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/DialerActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/DialerActivity.java
new file mode 100644
index 0000000..0fc4134
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/DialerActivity.java
@@ -0,0 +1,80 @@
+package cc.winboll.studio.contacts.activities;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/20 20:18:26
+ * @Describe 拨号盘窗口（跳转到系统拨号界面）
+ */
+public class DialerActivity extends AppCompatActivity {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "DialerActivity";
+
+    // ====================== UI控件区 ======================
+    private EditText phoneNumberEditText;
+    private Button dialButton;
+
+    // ====================== 生命周期函数区 ======================
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: 拨号盘页面开始创建");
+        setContentView(R.layout.activity_dialer);
+
+        // 初始化UI控件与点击事件
+        initViews();
+        LogUtils.d(TAG, "onCreate: 拨号盘页面初始化完成");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: 拨号盘页面已销毁");
+    }
+
+    // ====================== 控件初始化函数区 ======================
+    private void initViews() {
+        LogUtils.d(TAG, "initViews: 初始化UI控件");
+        // Java7 适配：添加强制类型转换
+        phoneNumberEditText = (EditText) findViewById(R.id.phone_number_edit_text);
+        dialButton = (Button) findViewById(R.id.dial_button);
+
+        // 设置拨号按钮点击事件
+        dialButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					String phoneNumber = phoneNumberEditText.getText().toString().trim();
+					LogUtils.d(TAG, "initViews: 拨号按钮点击，输入号码=" + phoneNumber);
+
+					// 空号码校验
+					if (phoneNumber.isEmpty()) {
+						LogUtils.w(TAG, "initViews: 拨号失败，号码为空");
+						Toast.makeText(DialerActivity.this, "请输入有效电话号码", Toast.LENGTH_SHORT).show();
+						return;
+					}
+
+					// 跳转到系统拨号界面
+					Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + phoneNumber));
+					if (intent.resolveActivity(getPackageManager()) != null) {
+						startActivity(intent);
+						LogUtils.d(TAG, "initViews: 成功跳转到系统拨号界面");
+					} else {
+						LogUtils.e(TAG, "initViews: 跳转失败，无可用拨号应用");
+						Toast.makeText(DialerActivity.this, "未找到可用拨号应用", Toast.LENGTH_SHORT).show();
+					}
+				}
+			});
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
new file mode 100644
index 0000000..4ca030b
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java
@@ -0,0 +1,613 @@
+package cc.winboll.studio.contacts.activities;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Build;
+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.bobulltoon.TomCat;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.model.MainServiceBean;
+import cc.winboll.studio.contacts.model.PhoneConnectRuleBean;
+import cc.winboll.studio.contacts.model.RingTongBean;
+import cc.winboll.studio.contacts.model.SettingsBean;
+import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.contacts.views.DuInfoTextView;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.lang.reflect.Field;
+import java.util.List;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/21 05:37:42
+ * @Describe Contacts 设置页面（完全适配 API 30 + Java 7 语法）
+ * 核心优化：1. 移除高版本API依赖 2. Java7规范写法 3. 强化内存泄漏防护 4. 版本判断硬编码 5. LogUtils统一日志管理
+ */
+public class SettingsActivity extends WinBollActivity implements IWinBoLLActivity {
+
+    // ====================== 常量定义区（置顶，统一管理） ======================
+    public static final String TAG = "SettingsActivity";
+    // API版本硬编码（替代Build.VERSION_CODES，适配Java7）
+    private static final int ANDROID_6_API = 23;
+
+    // ====================== 静态成员属性区 ======================
+    private static DuInfoTextView sDuInfoTextView; // 规范命名：静态属性加s前缀
+
+    // ====================== 数据业务属性区 ======================
+    private int mStreamMaxVolume; // 铃音最大音量
+    private int mStreamVolume;    // 当前铃音音量
+    private List<PhoneConnectRuleBean> mRuleList; // 通话规则列表
+    private PhoneConnectRuleAdapter mRuleAdapter; // 规则列表适配器
+
+    // ====================== UI控件属性区（统一归类，规范命名） ======================
+    private Toolbar mToolbar;                  // 顶部工具栏
+    private Switch mSwMainService;             // 主服务开关
+    private SeekBar mSbVolume;                 // 音量调节条
+    private TextView mTvVolume;                // 音量显示文本
+    private Switch mSwEnableDun;               // 云盾功能开关
+    private EditText mEtDunTotalCount;         // 云盾总次数输入框
+    private EditText mEtDunResumeSecondCount;  // 云盾恢复秒数输入框
+    private EditText mEtDunResumeCount;        // 云盾恢复次数输入框
+    private RecyclerView mRvRuleList;          // 规则列表RecyclerView
+    private EditText mEtBoBullToonUrl;         // BoBullToon地址输入框
+    private EditText mEtSearchPhone;           // 号码查询输入框
+
+    // ====================== 接口实现区（IWinBoLLActivity规范实现） ======================
+    @Override
+    public AppCompatActivity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    // ====================== 生命周期函数区（按执行顺序排列） ======================
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: 设置页面启动");
+        setContentView(R.layout.activity_settings);
+
+        // 初始化核心流程（按优先级执行）
+        initToolbar();          // 工具栏初始化（优先）
+        initMainServiceSwitch();// 主服务开关初始化
+        initVolumeControl();    // 音量控制初始化
+        initRuleRecyclerView(); // 规则列表初始化
+        initDunSettings();      // 云盾设置初始化
+        initBoBullToonViews();  // BoBullToon功能初始化
+
+        LogUtils.d(TAG, "onCreate: 设置页面初始化完成");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: 设置页面销毁");
+        // 内存泄漏防护：清空所有引用（静态+成员+UI）
+        sDuInfoTextView = null;
+        mRuleList = null;
+        mRuleAdapter = null;
+        mToolbar = null;
+        mSwMainService = null;
+        mSbVolume = null;
+        mTvVolume = null;
+        mSwEnableDun = null;
+        mEtDunTotalCount = null;
+        mEtDunResumeSecondCount = null;
+        mEtDunResumeCount = null;
+        mRvRuleList = null;
+        mEtBoBullToonUrl = null;
+        mEtSearchPhone = null;
+        LogUtils.d(TAG, "onDestroy: 设置页面资源清理完成");
+    }
+
+    // ====================== 初始化函数区（按功能模块归类） ======================
+    /**
+     * 初始化顶部工具栏（后退按钮+标题）
+     */
+    private void initToolbar() {
+        LogUtils.d(TAG, "initToolbar: 初始化工具栏");
+        mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1);
+        setSupportActionBar(mToolbar);
+
+        // 显示后退按钮（空指针防护）
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setSubtitle(TAG);
+        }
+
+        // 后退按钮点击事件（Java7匿名内部类）
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "initToolbar: 点击后退按钮，关闭页面");
+					finish();
+				}
+			});
+    }
+
+    /**
+     * 初始化主服务开关（联动MainService启停）
+     */
+    private void initMainServiceSwitch() {
+        LogUtils.d(TAG, "initMainServiceSwitch: 初始化主服务开关");
+        mSwMainService = (Switch) findViewById(R.id.sw_mainservice);
+        MainServiceBean serviceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+
+        // 加载开关状态（空指针防护）
+        boolean isServiceEnable = serviceBean != null && serviceBean.isEnable();
+        mSwMainService.setChecked(isServiceEnable);
+        LogUtils.d(TAG, "initMainServiceSwitch: 主服务当前状态：" + (isServiceEnable ? "启用" : "禁用"));
+
+        // 开关点击事件
+        mSwMainService.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					boolean isChecked = mSwMainService.isChecked();
+					LogUtils.d(TAG, "initMainServiceSwitch: 主服务开关切换：" + (isChecked ? "启用" : "禁用"));
+					if (isChecked) {
+						MainService.startMainServiceAndSaveStatus(SettingsActivity.this);
+					} else {
+						MainService.stopMainServiceAndSaveStatus(SettingsActivity.this);
+					}
+				}
+			});
+    }
+
+    /**
+     * 初始化音量控制（SeekBar+音量显示+配置保存）
+     */
+    private void initVolumeControl() {
+        LogUtils.d(TAG, "initVolumeControl: 初始化音量控制");
+        mSbVolume = (SeekBar) findViewById(R.id.bellvolume);
+        mTvVolume = (TextView) findViewById(R.id.tv_volume);
+        final AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+
+        // 空指针防护：AudioManager获取失败直接返回
+        if (audioManager == null) {
+            LogUtils.e(TAG, "initVolumeControl: AudioManager获取失败，音量控制初始化失败");
+            return;
+        }
+
+        // 初始化音量参数
+        mStreamMaxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
+        mStreamVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
+        mSbVolume.setMax(mStreamMaxVolume);
+        mSbVolume.setProgress(mStreamVolume);
+        updateVolumeDisplay(); // 更新音量文本显示
+
+        // 音量调节监听
+        mSbVolume.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+				@Override
+				public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+					if (fromUser) {
+						LogUtils.d(TAG, "initVolumeControl: 音量调节至：" + progress + "/" + mStreamMaxVolume);
+						// 实时更新系统音量+保存配置
+						audioManager.setStreamVolume(AudioManager.STREAM_RING, progress, 0);
+						RingTongBean ringBean = RingTongBean.loadBean(SettingsActivity.this, RingTongBean.class);
+						if (ringBean == null) {
+							ringBean = new RingTongBean();
+						}
+						ringBean.setStreamVolume(progress);
+						RingTongBean.saveBean(SettingsActivity.this, ringBean);
+						mStreamVolume = progress;
+						updateVolumeDisplay();
+					}
+				}
+
+				@Override
+				public void onStartTrackingTouch(SeekBar seekBar) {}
+
+				@Override
+				public void onStopTrackingTouch(SeekBar seekBar) {}
+			});
+    }
+
+    /**
+     * 初始化通话规则列表（加载黑白名单规则）
+     */
+    private void initRuleRecyclerView() {
+        LogUtils.d(TAG, "initRuleRecyclerView: 初始化规则列表");
+        mRvRuleList = (RecyclerView) findViewById(R.id.recycler_view);
+        mRvRuleList.setLayoutManager(new LinearLayoutManager(this));
+
+        // 加载规则数据
+        Rules rules = Rules.getInstance(this);
+        if (rules == null) {
+            LogUtils.e(TAG, "initRuleRecyclerView: Rules实例获取失败，列表初始化失败");
+            return;
+        }
+        mRuleList = rules.getPhoneBlacRuleBeanList();
+        mRuleAdapter = new PhoneConnectRuleAdapter(this, mRuleList);
+        mRvRuleList.setAdapter(mRuleAdapter);
+        LogUtils.d(TAG, "initRuleRecyclerView: 规则列表加载完成，共" + mRuleList.size() + "条规则");
+    }
+
+    /**
+     * 初始化云盾设置（参数加载+开关联动）
+     */
+    private void initDunSettings() {
+        LogUtils.d(TAG, "initDunSettings: 初始化云盾设置");
+        sDuInfoTextView = (DuInfoTextView) findViewById(R.id.tv_DunInfo);
+        mSwEnableDun = (Switch) findViewById(R.id.sw_IsEnableDun);
+        mEtDunTotalCount = (EditText) findViewById(R.id.et_DunTotalCount);
+        mEtDunResumeSecondCount = (EditText) findViewById(R.id.et_DunResumeSecondCount);
+        mEtDunResumeCount = (EditText) findViewById(R.id.et_DunResumeCount);
+
+        // 加载云盾配置
+        Rules rules = Rules.getInstance(this);
+        if (rules == null) {
+            LogUtils.e(TAG, "initDunSettings: Rules实例获取失败，云盾初始化失败");
+            return;
+        }
+        SettingsBean dunSettings = rules.getSettingsModel();
+        if (dunSettings == null) {
+            LogUtils.e(TAG, "initDunSettings: 云盾配置获取失败");
+            return;
+        }
+
+        // 填充配置参数
+        mEtDunTotalCount.setText(String.valueOf(dunSettings.getDunTotalCount()));
+        mEtDunResumeSecondCount.setText(String.valueOf(dunSettings.getDunResumeSecondCount()));
+        mEtDunResumeCount.setText(String.valueOf(dunSettings.getDunResumeCount()));
+        mSwEnableDun.setChecked(dunSettings.isEnableDun());
+
+        // 开关联动：启用云盾时禁用参数编辑
+        boolean isDunEnable = dunSettings.isEnableDun();
+        mEtDunTotalCount.setEnabled(!isDunEnable);
+        mEtDunResumeSecondCount.setEnabled(!isDunEnable);
+        mEtDunResumeCount.setEnabled(!isDunEnable);
+        LogUtils.d(TAG, "initDunSettings: 云盾当前状态：" + (isDunEnable ? "启用" : "禁用"));
+    }
+
+    /**
+     * 初始化BoBullToon功能（地址配置+号码查询）
+     */
+    private void initBoBullToonViews() {
+        LogUtils.d(TAG, "initBoBullToonViews: 初始化BoBullToon功能");
+        mEtBoBullToonUrl = (EditText) findViewById(R.id.bobulltoonurl_et);
+        mEtSearchPhone = (EditText) findViewById(R.id.activitysettingsEditText1);
+
+        // 加载保存的地址
+        Rules rules = Rules.getInstance(this);
+        if (rules != null) {
+            mEtBoBullToonUrl.setText(rules.getBoBullToonURL());
+            LogUtils.d(TAG, "initBoBullToonViews: 加载BoBullToon地址完成");
+        } else {
+            LogUtils.e(TAG, "initBoBullToonViews: Rules实例获取失败，地址加载失败");
+        }
+    }
+
+    // ====================== 点击事件回调区（按功能模块归类） ======================
+    /**
+     * 云盾开关点击事件（联动参数编辑权限+配置保存）
+     */
+    public void onSW_IsEnableDun(View view) {
+        boolean isChecked = mSwEnableDun.isChecked();
+        LogUtils.d(TAG, "onSW_IsEnableDun: 云盾开关切换：" + (isChecked ? "启用" : "禁用"));
+
+        // 联动参数编辑权限
+        mEtDunTotalCount.setEnabled(!isChecked);
+        mEtDunResumeSecondCount.setEnabled(!isChecked);
+        mEtDunResumeCount.setEnabled(!isChecked);
+
+        // 保存配置
+        Rules rules = Rules.getInstance(this);
+        if (rules == null) {
+            LogUtils.e(TAG, "onSW_IsEnableDun: Rules实例获取失败，配置保存失败");
+            mSwEnableDun.setChecked(false);
+            return;
+        }
+        SettingsBean dunSettings = rules.getSettingsModel();
+        if (dunSettings == null) {
+            LogUtils.e(TAG, "onSW_IsEnableDun: 云盾配置获取失败，保存失败");
+            mSwEnableDun.setChecked(false);
+            return;
+        }
+
+        // 启用云盾时校验参数合法性
+        if (isChecked) {
+            try {
+                String totalCountStr = mEtDunTotalCount.getText().toString().trim();
+                String resumeSecStr = mEtDunResumeSecondCount.getText().toString().trim();
+                String resumeCountStr = mEtDunResumeCount.getText().toString().trim();
+
+                // 空参数校验
+                if (totalCountStr.isEmpty() || resumeSecStr.isEmpty() || resumeCountStr.isEmpty()) {
+                    throw new NumberFormatException("参数不能为空");
+                }
+
+                // 转换参数并保存
+                int totalCount = Integer.parseInt(totalCountStr);
+                int resumeSec = Integer.parseInt(resumeSecStr);
+                int resumeCount = Integer.parseInt(resumeCountStr);
+                dunSettings.setDunTotalCount(totalCount);
+                dunSettings.setDunResumeSecondCount(resumeSec);
+                dunSettings.setDunResumeCount(resumeCount);
+                LogUtils.d(TAG, "onSW_IsEnableDun: 云盾参数保存完成，总次数：" + totalCount + "，恢复秒数：" + resumeSec);
+
+                // 提示信息
+                String toastMsg = totalCount == 1 ? "电话骚扰防御力几乎为0" : "连拨" + totalCount + "次后接通电话";
+                ToastUtils.show(toastMsg);
+            } catch (NumberFormatException e) {
+                LogUtils.e(TAG, "onSW_IsEnableDun: 云盾参数格式错误", e);
+                ToastUtils.show("参数格式错误，请输入整数");
+                mSwEnableDun.setChecked(false);
+                return;
+            }
+        }
+
+        // 保存开关状态并刷新配置
+        dunSettings.setIsEnableDun(isChecked);
+        rules.saveDun();
+        rules.reload();
+        LogUtils.d(TAG, "onSW_IsEnableDun: 云盾配置保存完成");
+    }
+
+    /**
+     * 添加新通话规则（黑白名单）
+     */
+    public void onAddNewConnectionRule(View view) {
+        LogUtils.d(TAG, "onAddNewConnectionRule: 添加新通话规则");
+        Rules rules = Rules.getInstance(this);
+        if (rules == null) {
+            LogUtils.e(TAG, "onAddNewConnectionRule: Rules实例获取失败，添加失败");
+            return;
+        }
+        mRuleList.add(new PhoneConnectRuleBean());
+        rules.saveRules();
+        mRuleAdapter.notifyDataSetChanged();
+        LogUtils.d(TAG, "onAddNewConnectionRule: 规则添加完成，当前共" + mRuleList.size() + "条规则");
+    }
+
+    /**
+     * 跳转默认电话应用设置
+     */
+    public void onDefaultPhone(View view) {
+        LogUtils.d(TAG, "onDefaultPhone: 跳转默认电话应用设置");
+        startActivity(new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS));
+    }
+
+    /**
+     * 悬浮窗权限检查与请求
+     */
+    public void onCanDrawOverlays(View view) {
+        LogUtils.d(TAG, "onCanDrawOverlays: 检查悬浮窗权限");
+        // API6.0+校验权限
+        if (Build.VERSION.SDK_INT >= ANDROID_6_API && !Settings.canDrawOverlays(this)) {
+            LogUtils.d(TAG, "onCanDrawOverlays: 未开启悬浮窗权限，发起请求");
+            showDrawOverlayRequestDialog();
+        } else {
+            ToastUtils.show("悬浮窗权限已开启");
+        }
+    }
+
+    /**
+     * 清理BoBullToon本地数据
+     */
+    public void onCleanBoBullToonData(View view) {
+        LogUtils.d(TAG, "onCleanBoBullToonData: 清理BoBullToon数据");
+        TomCat tomCat = TomCat.getInstance(this);
+        if (tomCat != null) {
+            tomCat.cleanBoBullToon();
+            ToastUtils.show("BoBullToon数据已清理");
+            LogUtils.d(TAG, "onCleanBoBullToonData: 数据清理完成");
+        } else {
+            LogUtils.e(TAG, "onCleanBoBullToonData: TomCat实例获取失败，清理失败");
+        }
+    }
+
+    /**
+     * 重置BoBullToon默认地址
+     */
+    public void onResetBoBullToonURL(View view) {
+        LogUtils.d(TAG, "onResetBoBullToonURL: 重置BoBullToon地址");
+        Rules rules = Rules.getInstance(this);
+        if (rules == null) {
+            LogUtils.e(TAG, "onResetBoBullToonURL: Rules实例获取失败，重置失败");
+            return;
+        }
+        rules.resetDefaultBoBullToonURL();
+        mEtBoBullToonUrl.setText(rules.getBoBullToonURL());
+        ToastUtils.show("BoBullToon地址已重置为默认");
+        LogUtils.d(TAG, "onResetBoBullToonURL: 地址重置完成");
+    }
+
+    /**
+     * 下载BoBullToon数据（子线程执行，避免阻塞UI）
+     */
+    public void onDownloadBoBullToon(View view) {
+        LogUtils.d(TAG, "onDownloadBoBullToon: 开始下载BoBullToon数据");
+        Rules rules = Rules.getInstance(this);
+        if (rules == null) {
+            LogUtils.e(TAG, "onDownloadBoBullToon: Rules实例获取失败，下载失败");
+            return;
+        }
+
+        // 校验并更新地址
+        String inputUrl = mEtBoBullToonUrl.getText().toString().trim();
+        String savedUrl = rules.getBoBullToonURL();
+        if (!inputUrl.equals(savedUrl)) {
+            rules.setBoBullToonURL(inputUrl);
+            LogUtils.d(TAG, "onDownloadBoBullToon: BoBullToon地址更新为：" + inputUrl);
+        }
+
+        // 子线程下载（Java7匿名内部类）
+        final TomCat tomCat = TomCat.getInstance(this);
+        new Thread(new Runnable() {
+				@Override
+				public void run() {
+					boolean downloadSuccess = tomCat != null && tomCat.downloadBoBullToon();
+					if (downloadSuccess) {
+						LogUtils.d(TAG, "onDownloadBoBullToon: 数据下载成功");
+						// 主线程更新UI
+						runOnUiThread(new Runnable() {
+								@Override
+								public void run() {
+									ToastUtils.show("BoBullToon下载成功");
+								}
+							});
+						// 重启主服务+刷新配置
+						MainService.restartMainService(SettingsActivity.this);
+						Rules.getInstance(SettingsActivity.this).reload();
+					} else {
+						LogUtils.e(TAG, "onDownloadBoBullToon: 数据下载失败");
+						runOnUiThread(new Runnable() {
+								@Override
+								public void run() {
+									ToastUtils.show("BoBullToon下载失败");
+								}
+							});
+					}
+				}
+			}).start();
+    }
+
+    /**
+     * 查询号码是否为BoBullToon号码
+     */
+    public void onSearchBoBullToonPhone(View view) {
+        LogUtils.d(TAG, "onSearchBoBullToonPhone: 执行号码查询");
+        String phone = mEtSearchPhone.getText().toString().trim();
+        // 空号码校验
+        if (phone.isEmpty()) {
+            LogUtils.w(TAG, "onSearchBoBullToonPhone: 查询号码为空，取消查询");
+            ToastUtils.show("请输入查询号码");
+            return;
+        }
+
+        // 执行查询
+        TomCat tomCat = TomCat.getInstance(this);
+        if (tomCat == null || !tomCat.loadPhoneBoBullToon()) {
+            LogUtils.w(TAG, "onSearchBoBullToonPhone: BoBullToon数据未加载，查询失败");
+            ToastUtils.show("请先下载BoBullToon数据");
+            return;
+        }
+
+        boolean isBoBullToon = tomCat.isPhoneBoBullToon(phone);
+        String resultMsg = isBoBullToon ? "是BoBullToon号码" : "非BoBullToon号码";
+        ToastUtils.show(resultMsg);
+        LogUtils.d(TAG, "onSearchBoBullToonPhone: 号码" + phone + "查询结果：" + resultMsg);
+    }
+
+    /**
+     * 跳转单元测试页面
+     */
+    public void onUnitTest(View view) {
+        LogUtils.d(TAG, "onUnitTest: 跳转单元测试页面");
+        startActivity(new Intent(this, UnitTestActivity.class));
+    }
+
+    /**
+     * 跳转关于页面
+     */
+    public void onAbout(View view) {
+        LogUtils.d(TAG, "onAbout: 跳转关于页面");
+        WinBoLLActivityManager.getInstance().startWinBoLLActivity(this, AboutActivity.class);
+    }
+
+    /**
+     * 跳转日志查看页面
+     */
+    public void onLogView(View view) {
+        LogUtils.d(TAG, "onLogView: 跳转日志页面");
+        WinBoLLActivityManager.getInstance().startLogActivity(this);
+    }
+
+    // ====================== 工具方法区（通用功能+权限相关） ======================
+    /**
+     * 更新音量显示文本（当前音量/最大音量）
+     */
+    private void updateVolumeDisplay() {
+        mTvVolume.setText(mStreamVolume + "/" + mStreamMaxVolume);
+    }
+
+    /**
+     * 显示悬浮窗权限请求对话框
+     */
+    private void showDrawOverlayRequestDialog() {
+        AlertDialog dialog = new AlertDialog.Builder(this)
+			.setTitle("权限请求")
+			.setMessage("为保证通话监听功能正常，需开启悬浮窗权限")
+			.setPositiveButton("去设置", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+					jumpToDrawOverlaySettings();
+				}
+			})
+			.setNegativeButton("稍后", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+				}
+			})
+			.create();
+
+        // 解决对话框焦点问题
+        if (dialog.getWindow() != null) {
+            dialog.getWindow().setFlags(
+				WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+				WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+        }
+        dialog.show();
+    }
+
+    /**
+     * 跳转悬浮窗权限设置页面（反射适配低版本）
+     */
+    private void jumpToDrawOverlaySettings() {
+        LogUtils.d(TAG, "jumpToDrawOverlaySettings: 跳转悬浮窗权限设置");
+        try {
+            // 反射获取设置页面Action（避免高版本API依赖）
+            Class<?> settingsClazz = Settings.class;
+            Field actionField = settingsClazz.getDeclaredField("ACTION_MANAGE_OVERLAY_PERMISSION");
+            String action = (String) actionField.get(null);
+
+            // 跳转当前应用权限设置页
+            Intent intent = new Intent(action);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setData(Uri.parse("package:" + getPackageName()));
+            startActivity(intent);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "jumpToDrawOverlaySettings: 跳转权限设置失败", e);
+            Toast.makeText(this, "请手动在设置中开启悬浮窗权限", Toast.LENGTH_LONG).show();
+        }
+    }
+
+    // ====================== 静态通知方法区（云盾信息更新） ======================
+    /**
+     * 通知云盾信息刷新（外部调用）
+     */
+    public static void notifyDunInfoUpdate() {
+        if (sDuInfoTextView != null) {
+            LogUtils.d(TAG, "notifyDunInfoUpdate: 刷新云盾信息显示");
+            sDuInfoTextView.notifyInfoUpdate();
+        } else {
+            LogUtils.w(TAG, "notifyDunInfoUpdate: 云盾信息控件未初始化，刷新失败");
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java
new file mode 100644
index 0000000..8d3c2f5
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java
@@ -0,0 +1,154 @@
+package cc.winboll.studio.contacts.activities;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.activities.UnitTestActivity;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService;
+import cc.winboll.studio.contacts.utils.IntUtils;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/02 16:07:04
+ * @Describe 规则单元测试页面
+ */
+public class UnitTestActivity extends WinBollActivity implements IWinBoLLActivity {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "UnitTestActivity";
+
+    // ====================== UI控件区 ======================
+    private LogView logView;
+    private EditText etPhone;
+
+    // ====================== 接口实现区 ======================
+    @Override
+    public AppCompatActivity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+	
+    // ====================== 生命周期函数区 ======================
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: 单元测试页面开始创建");
+        setContentView(R.layout.activity_unittest);
+
+        // 初始化控件
+        initViews();
+        LogUtils.d(TAG, "onCreate: 单元测试页面初始化完成");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: 单元测试页面开始销毁");
+        if (logView != null) {
+            // 若LogView有停止方法，建议调用避免资源泄漏
+            // logView.stop();
+            LogUtils.d(TAG, "onDestroy: LogView资源已处理");
+        }
+        LogUtils.d(TAG, "onDestroy: 单元测试页面销毁完成");
+    }
+
+    // ====================== 控件初始化函数区 ======================
+    private void initViews() {
+        LogUtils.d(TAG, "initViews: 初始化UI控件");
+        // Java7 适配：添加强制类型转换
+        logView = (LogView) findViewById(R.id.logview);
+        etPhone = (EditText) findViewById(R.id.phone_et);
+
+        // 启动日志视图
+        logView.start();
+        LogUtils.d(TAG, "initViews: LogView已启动");
+    }
+
+    // ====================== 点击事件测试函数区 ======================
+    /**
+     * 测试单个号码匹配规则
+     */
+    public void onTestPhone(View view) {
+        LogUtils.d(TAG, "onTestPhone: 开始测试单个号码规则匹配");
+        String phone = etPhone.getText().toString().trim();
+        if (phone.isEmpty()) {
+            LogUtils.w(TAG, "onTestPhone: 测试号码为空，跳过匹配");
+            return;
+        }
+
+        Rules rules = Rules.getInstance(this);
+        boolean isAllowed = rules.isAllowed(phone);
+        LogUtils.d(TAG, String.format("onTestPhone: 测试号码: %s | 匹配结果: %s", phone, isAllowed));
+    }
+
+    /**
+     * 批量测试预设号码规则匹配
+     */
+    public void onTestMain(View view) {
+        LogUtils.d(TAG, "onTestMain: 开始批量测试号码规则匹配");
+        // 测试IntUtils工具类方法
+        LogUtils.d(TAG, "onTestMain: 执行 IntUtils.unittest_getIntInRange() 测试");
+        IntUtils.unittest_getIntInRange();
+
+        // 初始化规则实例
+        Rules rules = Rules.getInstance(this);
+        // 无规则时添加测试规则集
+        initTestRulesIfEmpty(rules);
+
+        // 预设测试号码列表
+        String[] testPhones = {
+			"16769764848", "16856582777", "17519703124",
+			"0205658955", "0108965253", "+8616769764848",
+			"4005816769764848", "95566"
+        };
+
+        // 遍历测试号码并输出结果
+        for (String phone : testPhones) {
+            boolean isAllowed = rules.isAllowed(phone);
+            LogUtils.d(TAG, String.format("onTestMain: 测试号码: %s | 匹配结果: %s", phone, isAllowed));
+        }
+        LogUtils.d(TAG, "onTestMain: 批量号码规则测试完成");
+		
+		new Thread(new Runnable(){
+				@Override
+				public void run() {
+					LimitedTimeSpecialChannelService.unitTest(UnitTestActivity.this);
+				}
+			}).start(); 
+    }
+
+    // ====================== 私有工具函数区 ======================
+    /**
+     * 规则集为空时初始化测试规则
+     */
+    private void initTestRulesIfEmpty(Rules rules) {
+        if (rules.getPhoneBlacRuleBeanList().size() == 0) {
+            LogUtils.d(TAG, "initTestRulesIfEmpty: 当前无规则，添加测试规则集");
+            // 规则1：中国手机号允许
+            rules.add("^1[3-9]\\d{9}$", true, true);
+            // 规则2：0660区号号码允许
+            rules.add("^0660\\d+$", true, true);
+            // 规则3：020区号号码允许
+            rules.add("^020\\d+$", true, true);
+            // 规则4：默认拒接所有号码
+            rules.add(".*", false, true);
+
+            // 保存规则到本地
+            rules.saveRules();
+            LogUtils.d(TAG, "initTestRulesIfEmpty: 测试规则集已保存");
+        } else {
+            LogUtils.d(TAG, "initTestRulesIfEmpty: 当前已有规则，跳过初始化");
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java
new file mode 100644
index 0000000..8b640eb
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java
@@ -0,0 +1,84 @@
+package cc.winboll.studio.contacts.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/31 15:16:45
+ * @Describe 应用窗口基类，统一处理主题设置与导航返回
+ */
+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) {
+        //LogUtils.d(TAG, "onCreate: 基类页面开始创建");
+        // 优先设置主题，再执行父类初始化
+//        mThemeType = getThemeType();
+//        setThemeStyle();
+        super.onCreate(savedInstanceState);
+        //LogUtils.d(TAG, "onCreate: 基类主题设置完成，当前主题类型=" + mThemeType);
+    }
+
+    // ====================== 主题相关函数区 ======================
+    /**
+     * 获取当前应用主题类型
+     */
+    AESThemeBean.ThemeType getThemeType() {
+        LogUtils.d(TAG, "getThemeType: 获取应用主题类型");
+        // 注释的SharedPreferences逻辑保留，便于后续扩展
+        /*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() {
+        LogUtils.d(TAG, "setThemeStyle: 开始设置应用主题");
+        // 替换原注释逻辑，使用AESThemeUtil获取的主题ID
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        LogUtils.d(TAG, "setThemeStyle: 主题设置完成");
+    }
+
+    // ====================== 菜单与导航函数区 ======================
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        LogUtils.d(TAG, "onOptionsItemSelected: 菜单选项点击，itemId=" + item.getItemId());
+        // 处理导航栏返回按钮点击事件
+//        if (item.getItemId() == android.R.id.home) {
+//            LogUtils.d(TAG, "onOptionsItemSelected: 点击导航返回按钮，关闭当前页面");
+//            finish();
+//            return true;
+//        }
+        return super.onOptionsItemSelected(item);
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
new file mode 100644
index 0000000..4486910
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java
@@ -0,0 +1,183 @@
+package cc.winboll.studio.contacts.adapters;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.PopupMenu;
+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.model.CallLogModel;
+import cc.winboll.studio.contacts.utils.ContactUtils;
+import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Locale;
+import cc.winboll.studio.contacts.dun.Rules;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/26 13:09:32
+ * @Describe 通话记录列表适配器
+ */
+public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogViewHolder> {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "CallLogAdapter";
+    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
+
+    // ====================== 成员变量区 ======================
+    private Context mContext;
+    private List<CallLogModel> callLogList;
+    private ContactUtils mContactUtils;
+
+    // ====================== 构造函数区 ======================
+    public CallLogAdapter(Context context, List<CallLogModel> callLogList) {
+        LogUtils.d(TAG, "CallLogAdapter: 初始化适配器，数据量=" + callLogList.size());
+        this.mContext = context;
+        this.callLogList = callLogList;
+        this.mContactUtils = ContactUtils.getInstance(mContext);
+    }
+
+    // ====================== 公共方法区 ======================
+    /**
+     * 重新加载联系人数据
+     */
+    public void relaodContacts() {
+        LogUtils.d(TAG, "relaodContacts: 开始重新加载联系人数据");
+        this.mContactUtils.reloadContacts();
+        notifyDataSetChanged();
+        LogUtils.d(TAG, "relaodContacts: 联系人数据加载完成，列表已刷新");
+    }
+
+    // ====================== RecyclerView 重写方法区 ======================
+    @NonNull
+    @Override
+    public CallLogViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        LogUtils.d(TAG, "onCreateViewHolder: 创建列表项ViewHolder");
+        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) {
+        LogUtils.d(TAG, "onBindViewHolder: 绑定列表项数据，position=" + position);
+        final CallLogModel callLog = callLogList.get(position);
+
+        // 绑定通话号码与联系人名称
+        String contactName = mContactUtils.getContactName(callLog.getPhoneNumber());
+        String phoneText = callLog.getPhoneNumber() + "☎" + (contactName == null ? "" : contactName);
+        holder.phoneNumber.setText(phoneText);
+
+        // 号码长按弹出菜单事件
+        holder.phoneNumber.setOnLongClickListener(new View.OnLongClickListener() {
+				@Override
+				public boolean onLongClick(View p1) {
+					showPhonePopupMenu(holder.phoneNumber, callLog);
+					return true;
+				}
+			});
+
+        // 绑定通话状态与时间
+        holder.callStatus.setText(callLog.getCallStatus());
+        holder.callDate.setText(DATE_FORMAT.format(callLog.getCallDate()));
+
+        // 初始化滑动拨号SeekBar
+        initDialSeekBar(holder.dialAOHPCTCSeekBar, callLog);
+    }
+
+    @Override
+    public int getItemCount() {
+        return callLogList == null ? 0 : callLogList.size();
+    }
+
+    // ====================== 私有工具方法区 ======================
+    /**
+     * 显示号码操作弹窗菜单
+     */
+    private void showPhonePopupMenu(View anchorView, final CallLogModel callLog) {
+        LogUtils.d(TAG, "showPhonePopupMenu: 弹出号码操作菜单");
+        PopupMenu menu = new PopupMenu(mContext, anchorView);
+        menu.getMenuInflater().inflate(R.menu.toolbar_calllog_phonenumber, menu.getMenu());
+
+        menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+				@Override
+				public boolean onMenuItemClick(MenuItem menuItem) {
+					int itemId = menuItem.getItemId();
+					if (itemId == R.id.item_calllog_phonenumber_copy) {
+						// 复制号码到剪贴板
+						ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+						ClipData clip = ClipData.newPlainText("call_log_phone", callLog.getPhoneNumber());
+						clipboard.setPrimaryClip(clip);
+						Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
+						LogUtils.d(TAG, "showPhonePopupMenu: 号码" + callLog.getPhoneNumber() + "已复制到剪贴板");
+					} else if (itemId == R.id.item_calllog_phonenumber_yundun_test) {
+						// 跳转到添加联系人页面
+						//if (Rules.getInstance(mContext).isAllowed(callLog.getPhoneNumber(), false)) {
+						if (Rules.getInstance(mContext).isAllowed(callLog.getPhoneNumber(), true)) {
+							ToastUtils.show("(✔)" + callLog.getPhoneNumber() + " Is Allowed By YunDun.");
+						} else {
+							ToastUtils.show("(✘)YunDun Defense The Phone " + callLog.getPhoneNumber() + "");
+						}
+					} else if (itemId == R.id.item_calllog_phonenumber_add_contact) {
+						// 跳转到添加联系人页面
+						ContactUtils.jumpToAddContact(mContext, callLog.getPhoneNumber());
+						LogUtils.d(TAG, "showPhonePopupMenu: 跳转添加联系人页面，号码=" + callLog.getPhoneNumber());
+					}
+					return true;
+				}
+			});
+        menu.show();
+    }
+
+    /**
+     * 初始化滑动拨号SeekBar
+     */
+    private void initDialSeekBar(AOHPCTCSeekBar seekBar, final CallLogModel callLog) {
+        LogUtils.d(TAG, "initDialSeekBar: 初始化滑动拨号控件");
+        seekBar.setThumb(seekBar.getContext().getDrawable(R.drawable.ic_call));
+        seekBar.setBlurRightDP(80);
+        seekBar.setThumbOffset(0);
+
+        seekBar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
+				@Override
+				public void onOHPCommit() {
+					String phoneNumber = callLog.getPhoneNumber().replaceAll("\\s", "");
+					LogUtils.d(TAG, "initDialSeekBar: 滑动拨号触发，号码=" + phoneNumber);
+					ToastUtils.show(phoneNumber);
+
+					Intent intent = new Intent(Intent.ACTION_CALL);
+					intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
+					intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+					mContext.startActivity(intent);
+				}
+			});
+    }
+
+    // ====================== ViewHolder 内部类 ======================
+    public class CallLogViewHolder extends RecyclerView.ViewHolder {
+        TextView phoneNumber;
+        TextView callStatus;
+        TextView callDate;
+        AOHPCTCSeekBar dialAOHPCTCSeekBar;
+
+        public CallLogViewHolder(@NonNull View itemView) {
+            super(itemView);
+            // Java7 适配：添加强制类型转换
+            phoneNumber = (TextView) itemView.findViewById(R.id.phone_number);
+            callStatus = (TextView) itemView.findViewById(R.id.call_status);
+            callDate = (TextView) itemView.findViewById(R.id.call_date);
+            dialAOHPCTCSeekBar = (AOHPCTCSeekBar) itemView.findViewById(R.id.aohpctcseekbar_dial);
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
new file mode 100644
index 0000000..f213121
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java
@@ -0,0 +1,157 @@
+package cc.winboll.studio.contacts.adapters;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
+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.model.ContactModel;
+import cc.winboll.studio.contacts.utils.ContactUtils;
+import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.util.List;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/26 13:35:44
+ * @Describe 联系人列表适配器
+ */
+public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "ContactAdapter";
+    // 移除未使用的 REQUEST_CALL_PHONE 常量，精简冗余代码
+
+    // ====================== 成员变量区 ======================
+    private Context mContext;
+    private List<ContactModel> contactList;
+
+    // ====================== 构造函数区 ======================
+    public ContactAdapter(Context context, List<ContactModel> contactList) {
+        LogUtils.d(TAG, "ContactAdapter: 初始化适配器，联系人数量=" + contactList.size());
+        this.mContext = context;
+        this.contactList = contactList;
+    }
+
+    // ====================== RecyclerView 重写方法区 ======================
+    @NonNull
+    @Override
+    public ContactViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        LogUtils.d(TAG, "onCreateViewHolder: 创建联系人列表项ViewHolder");
+        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) {
+        LogUtils.d(TAG, "onBindViewHolder: 绑定联系人列表项数据，position=" + position);
+        final ContactModel contact = contactList.get(position);
+
+        // 绑定联系人名称与号码
+        holder.contactName.setText(contact.getName());
+        holder.contactNumber.setText(contact.getNumber());
+
+        // 长按联系人条目弹出操作菜单
+        holder.llPhoneNumberMain.setOnLongClickListener(new View.OnLongClickListener() {
+				@Override
+				public boolean onLongClick(View v) {
+					showContactPopupMenu(holder.llPhoneNumberMain, contact);
+					return true;
+				}
+			});
+
+        // 初始化滑动拨号SeekBar
+        initDialSeekBar(holder.dialAOHPCTCSeekBar, contact);
+    }
+
+    @Override
+    public int getItemCount() {
+        // 增加空指针判断，避免空列表崩溃
+        return contactList == null ? 0 : contactList.size();
+    }
+
+    // ====================== 私有工具方法区 ======================
+    /**
+     * 显示联系人操作弹窗菜单
+     */
+    private void showContactPopupMenu(View anchorView, final ContactModel contact) {
+        LogUtils.d(TAG, "showContactPopupMenu: 弹出联系人操作菜单");
+        PopupMenu menu = new PopupMenu(mContext, anchorView);
+        menu.getMenuInflater().inflate(R.menu.toolbar_contact_phonenumber, menu.getMenu());
+
+        menu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+				@Override
+				public boolean onMenuItemClick(MenuItem menuItem) {
+					int itemId = menuItem.getItemId();
+					if (itemId == R.id.item_contact_phonenumber_copy) {
+						// 复制联系人号码到剪贴板
+						ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+						ClipData clip = ClipData.newPlainText("contact_phone", contact.getNumber());
+						clipboard.setPrimaryClip(clip);
+						Toast.makeText(mContext, "Copy to clipboard.", Toast.LENGTH_SHORT).show();
+						LogUtils.d(TAG, "showContactPopupMenu: 联系人号码" + contact.getNumber() + "已复制到剪贴板");
+					} else if (itemId == R.id.item_calllog_phonenumber_edit_contact) {
+						// 跳转到编辑联系人页面
+						Long contactId = ContactUtils.getContactIdByPhone(mContext, contact.getNumber());
+						ContactUtils.jumpToEditContact(mContext, contact.getNumber(), contactId);
+						LogUtils.d(TAG, "showContactPopupMenu: 跳转编辑联系人页面，号码=" + contact.getNumber() + "，ID=" + contactId);
+					}
+					return true;
+				}
+			});
+        menu.show();
+    }
+
+    /**
+     * 初始化滑动拨号SeekBar
+     */
+    private void initDialSeekBar(AOHPCTCSeekBar seekBar, final ContactModel contact) {
+        LogUtils.d(TAG, "initDialSeekBar: 初始化滑动拨号控件");
+        seekBar.setThumb(seekBar.getContext().getDrawable(R.drawable.ic_call));
+        seekBar.setBlurRightDP(80);
+        seekBar.setThumbOffset(0);
+
+        seekBar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
+				@Override
+				public void onOHPCommit() {
+					String phoneNumber = contact.getNumber().replaceAll("\\s", "");
+					LogUtils.d(TAG, "initDialSeekBar: 滑动拨号触发，号码=" + phoneNumber);
+					ToastUtils.show(phoneNumber);
+
+					Intent intent = new Intent(Intent.ACTION_CALL);
+					intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
+					intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+					mContext.startActivity(intent);
+				}
+			});
+    }
+
+    // ====================== ViewHolder 内部类 ======================
+    public class ContactViewHolder extends RecyclerView.ViewHolder {
+        LinearLayout llPhoneNumberMain;
+        TextView contactName;
+        TextView contactNumber;
+        AOHPCTCSeekBar dialAOHPCTCSeekBar;
+
+        public ContactViewHolder(@NonNull View itemView) {
+            super(itemView);
+            // Java7 适配：添加强制类型转换
+            llPhoneNumberMain = (LinearLayout) itemView.findViewById(R.id.itemcontactLinearLayout1);
+            contactName = (TextView) itemView.findViewById(R.id.contact_name);
+            contactNumber = (TextView) itemView.findViewById(R.id.contact_number);
+            dialAOHPCTCSeekBar = (AOHPCTCSeekBar) itemView.findViewById(R.id.aohpctcseekbar_dial);
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java
new file mode 100644
index 0000000..276d729
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java
@@ -0,0 +1,257 @@
+package cc.winboll.studio.contacts.adapters;
+
+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.model.PhoneConnectRuleBean;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.views.LeftScrollView;
+import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/02 17:27:41
+ * @Describe 通话规则列表适配器，支持简单查看/编辑两种视图切换
+ */
+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 static final String NULL_RULE_TEXT = "[NULL]";
+
+    // ====================== 成员变量区 ======================
+    private Context mContext;
+    private List<PhoneConnectRuleBean> mRuleList;
+
+    // ====================== 构造函数区 ======================
+    public PhoneConnectRuleAdapter(Context context, List<PhoneConnectRuleBean> ruleList) {
+        LogUtils.d(TAG, "PhoneConnectRuleAdapter: 初始化适配器，规则数量=" + ruleList.size());
+        this.mContext = context;
+        this.mRuleList = ruleList;
+    }
+
+    // ====================== RecyclerView 重写方法区 ======================
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        if (viewType == VIEW_TYPE_SIMPLE) {
+            LogUtils.d(TAG, "onCreateViewHolder: 创建简单视图ViewHolder");
+            View view = inflater.inflate(R.layout.view_phone_connect_rule_simple, parent, false);
+            return new SimpleViewHolder(parent, view);
+        } else {
+            LogUtils.d(TAG, "onCreateViewHolder: 创建编辑视图ViewHolder");
+            View view = inflater.inflate(R.layout.view_phone_connect_rule, parent, false);
+            return new EditViewHolder(view);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int position) {
+        final PhoneConnectRuleBean model = mRuleList.get(position);
+        LogUtils.d(TAG, "onBindViewHolder: 绑定规则数据，position=" + position + "，视图类型=" + getItemViewType(position));
+
+        if (holder instanceof SimpleViewHolder) {
+            bindSimpleViewHolder((SimpleViewHolder) holder, model, position);
+        } else if (holder instanceof EditViewHolder) {
+            bindEditViewHolder((EditViewHolder) holder, model, position);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mRuleList == null ? 0 : mRuleList.size();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return mRuleList.get(position).isSimpleView() ? VIEW_TYPE_SIMPLE : VIEW_TYPE_EDIT;
+    }
+
+    // ====================== 私有视图绑定方法区 ======================
+    /**
+     * 绑定简单视图数据
+     */
+    private void bindSimpleViewHolder(final SimpleViewHolder holder, final PhoneConnectRuleBean model, final int position) {
+        // 绑定规则文本，空值显示[NULL]
+        String ruleText = model.getRuleText().trim().isEmpty() ? NULL_RULE_TEXT : model.getRuleText().trim();
+        holder.tvRuleText.setText(ruleText);
+        // 设置复选框状态并禁用编辑
+        holder.checkBoxAllow.setChecked(model.isAllowConnection());
+        holder.checkBoxAllow.setEnabled(false);
+        holder.checkBoxEnable.setChecked(model.isEnable());
+        holder.checkBoxEnable.setEnabled(false);
+
+        // 设置左滑操作监听
+        holder.scrollView.setOnActionListener(new LeftScrollView.OnActionListener() {
+				@Override
+				public void onUp() {
+					LogUtils.d(TAG, "onUp: 规则上移，position=" + position);
+					moveRuleUp(position);
+					holder.scrollView.smoothScrollTo(0, 0);
+				}
+
+				@Override
+				public void onDown() {
+					LogUtils.d(TAG, "onDown: 规则下移，position=" + position);
+					moveRuleDown(position);
+					holder.scrollView.smoothScrollTo(0, 0);
+				}
+
+				@Override
+				public void onEdit() {
+					LogUtils.d(TAG, "onEdit: 切换到编辑视图，position=" + position);
+					model.setIsSimpleView(false);
+					notifyItemChanged(position);
+					holder.scrollView.smoothScrollTo(0, 0);
+				}
+
+				@Override
+				public void onDelete() {
+					LogUtils.d(TAG, "onDelete: 触发规则删除确认，position=" + position);
+					showDeleteConfirmDialog(holder.scrollView.getContext(), model, position);
+				}
+			});
+    }
+
+    /**
+     * 绑定编辑视图数据
+     */
+    private void bindEditViewHolder(final EditViewHolder holder, final PhoneConnectRuleBean model, final int position) {
+        // 绑定规则文本到输入框
+        holder.editText.setText(model.getRuleText());
+        // 绑定复选框状态
+        holder.checkBoxAllow.setChecked(model.isAllowConnection());
+        holder.checkBoxEnable.setChecked(model.isEnable());
+
+        // 确认按钮点击事件
+        holder.buttonConfirm.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					String newRuleText = holder.editText.getText().toString().trim();
+					model.setRuleText(newRuleText);
+					model.setIsAllowConnection(holder.checkBoxAllow.isChecked());
+					model.setIsEnable(holder.checkBoxEnable.isChecked());
+					model.setIsSimpleView(true);
+
+					// 保存规则并刷新视图
+					Rules.getInstance(mContext).saveRules();
+					notifyItemChanged(position);
+					Toast.makeText(mContext, "保存成功", Toast.LENGTH_SHORT).show();
+					LogUtils.d(TAG, "bindEditViewHolder: 规则保存成功，position=" + position + "，规则内容=" + newRuleText);
+				}
+			});
+    }
+
+    // ====================== 私有业务工具方法区 ======================
+    /**
+     * 规则上移
+     */
+    private void moveRuleUp(int position) {
+        if (position <= 0) {
+            ToastUtils.show("已到顶部，无法上移");
+            return;
+        }
+        ArrayList<PhoneConnectRuleBean> ruleList = Rules.getInstance(mContext).getPhoneBlacRuleBeanList();
+        swapRulePosition(ruleList, position, position - 1);
+    }
+
+    /**
+     * 规则下移
+     */
+    private void moveRuleDown(int position) {
+        ArrayList<PhoneConnectRuleBean> ruleList = Rules.getInstance(mContext).getPhoneBlacRuleBeanList();
+        if (position >= ruleList.size() - 1) {
+            ToastUtils.show("已到底部，无法下移");
+            return;
+        }
+        swapRulePosition(ruleList, position, position + 1);
+    }
+
+    /**
+     * 交换规则位置
+     */
+    private void swapRulePosition(ArrayList<PhoneConnectRuleBean> list, int fromPos, int toPos) {
+        PhoneConnectRuleBean temp = list.get(fromPos);
+        list.set(fromPos, list.get(toPos));
+        list.set(toPos, temp);
+        Rules.getInstance(mContext).saveRules();
+        notifyDataSetChanged();
+        LogUtils.d(TAG, "swapRulePosition: 规则位置交换完成，from=" + fromPos + "，to=" + toPos);
+    }
+
+    /**
+     * 显示删除确认弹窗
+     */
+    private void showDeleteConfirmDialog(Context dialogContext, final PhoneConnectRuleBean model, final int position) {
+        YesNoAlertDialog.show(dialogContext, "删除确认", "是否删除该通话规则？", new YesNoAlertDialog.OnDialogResultListener() {
+				@Override
+				public void onYes() {
+					ArrayList<PhoneConnectRuleBean> ruleList = Rules.getInstance(mContext).getPhoneBlacRuleBeanList();
+					ruleList.remove(position);
+					Rules.getInstance(mContext).saveRules();
+					notifyDataSetChanged();
+					LogUtils.d(TAG, "showDeleteConfirmDialog: 规则删除成功，position=" + position);
+				}
+
+				@Override
+				public void onNo() {
+					LogUtils.d(TAG, "showDeleteConfirmDialog: 用户取消删除规则，position=" + position);
+				}
+			});
+    }
+
+    // ====================== ViewHolder 内部类区 ======================
+    static class SimpleViewHolder extends RecyclerView.ViewHolder {
+        LeftScrollView scrollView;
+        TextView tvRuleText;
+        CheckBox checkBoxAllow;
+        CheckBox checkBoxEnable;
+
+        public SimpleViewHolder(@NonNull ViewGroup parent, @NonNull View itemView) {
+            super(itemView);
+            scrollView = (LeftScrollView) itemView.findViewById(R.id.scrollView);
+            // 初始化简单视图内容布局
+            LayoutInflater inflater = LayoutInflater.from(itemView.getContext());
+            View viewContent = inflater.inflate(R.layout.view_phone_connect_rule_simple_content, parent, false);
+            tvRuleText = (TextView) viewContent.findViewById(R.id.ruletext_tv);
+            checkBoxAllow = (CheckBox) viewContent.findViewById(R.id.checkbox_allow);
+            checkBoxEnable = (CheckBox) viewContent.findViewById(R.id.checkbox_enable);
+            // 设置内容宽度并添加到滚动视图
+            scrollView.setContentWidth(parent.getWidth());
+            scrollView.addContentLayout(viewContent);
+        }
+    }
+
+    static class EditViewHolder extends RecyclerView.ViewHolder {
+        EditText editText;
+        CheckBox checkBoxAllow;
+        CheckBox checkBoxEnable;
+        Button buttonConfirm;
+
+        public EditViewHolder(@NonNull View itemView) {
+            super(itemView);
+            // Java7 适配：添加强制类型转换
+            editText = (EditText) itemView.findViewById(R.id.edit_text);
+            checkBoxAllow = (CheckBox) itemView.findViewById(R.id.checkbox_allow);
+            checkBoxEnable = (CheckBox) itemView.findViewById(R.id.checkbox_enable);
+            buttonConfirm = (Button) itemView.findViewById(R.id.button_confirm);
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java
new file mode 100644
index 0000000..da6cdf0
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java
@@ -0,0 +1,260 @@
+package cc.winboll.studio.contacts.bobulltoon;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/02 13:47:48
+ * @Describe 汤姆猫管家 ：使用 BoBullToon 项目，对通讯地址进行筛选判断的好朋友。
+ */
+import android.content.Context;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.io.File;
+import java.io.FileFilter;
+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>();
+    String mszBoBullToon_URL;
+
+    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;
+    }
+
+    public String getDefaultBobulltoonUrl() {
+        return mContext.getString(R.string.default_bobulltoon_url);
+    }
+
+    boolean 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 数据");
+            return true;
+        } catch (Exception e) {
+            ToastUtils.show(e.getMessage());
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            return false;
+        }
+    }
+
+    public boolean downloadBoBullToon() {
+        String zipUrl = Rules.getInstance(mContext).getBoBullToonURL(); // 替换为实际的 ZIP 文件 URL
+        String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
+        try {
+            // 删除旧文件
+            File fOldFolder = new File(destinationFolder);
+            if (fOldFolder.exists()) {
+                deleteFolderRecursive(fOldFolder);
+                fOldFolder.mkdirs();
+                LogUtils.d(TAG, "已清空 BoBullToon 数据");
+            }
+
+            // 更新新文件
+            if (downloadAndExtractZip(zipUrl, destinationFolder)) {
+                LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
+                return true;
+            }
+            return false;
+        } 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 File getBoBullToonDataFolder() {
+		File fCheckRoot = getWorkingFolder();
+		if (fCheckRoot == null || !fCheckRoot.exists()) {
+			return fCheckRoot;
+		}
+
+		// 递归查找符合条件的文件夹
+		File targetFolder = findTargetFolder(fCheckRoot);
+		return targetFolder != null ? targetFolder : fCheckRoot;
+	}
+
+	/**
+	 * 递归查找同时包含LICENSE和README.md文件的文件夹
+	 */
+	private File findTargetFolder(File currentFolder) {
+		// 检查当前文件夹是否符合条件
+		if (hasRequiredFiles(currentFolder)) {
+			return currentFolder;
+		}
+
+		// 查找子文件夹（Java 7不支持方法引用，用匿名内部类过滤）
+		File[] subFolders = currentFolder.listFiles(new FileFilter() {
+				@Override
+				public boolean accept(File file) {
+					return file.isDirectory(); // 仅保留子文件夹
+				}
+			});
+
+		if (subFolders != null) {
+			for (File subFolder : subFolders) {
+				File result = findTargetFolder(subFolder);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * 检查文件夹中是否同时存在LICENSE和README.md文件
+	 */
+	private boolean hasRequiredFiles(File folder) {
+		if (folder == null || !folder.isDirectory()) {
+			return false;
+		}
+
+		// 检查两个文件是否同时存在且均为文件（非文件夹）
+		File licenseFile = new File(folder, "LICENSE");
+		File readmeFile = new File(folder, "README.md");
+
+		return licenseFile.exists() && licenseFile.isFile()
+			&& readmeFile.exists() && readmeFile.isFile();
+	}
+
+	public void cleanBoBullToon() {
+		String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
+		// 删除旧文件
+		File fOldFolder = new File(destinationFolder);
+		if (fOldFolder.exists()) {
+			deleteFolderRecursive(fOldFolder);
+			fOldFolder.mkdirs();
+		}
+
+		ToastUtils.show("已清空 BoBullToon 数据!");
+		LogUtils.d(TAG, "已清空 BoBullToon 数据");
+	}
+
+    public boolean loadPhoneBoBullToon() {
+        listPhoneBoBullToon.clear();
+        File fBoBullToon = getBoBullToonDataFolder();
+        if (fBoBullToon.exists()) {
+            LogUtils.d(TAG, String.format("getBoBullToonDataFolder() %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;
+    }
+}
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java b/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java
new file mode 100644
index 0000000..0bc4402
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java
@@ -0,0 +1,280 @@
+package cc.winboll.studio.contacts.dun;
+
+import android.content.Context;
+import cc.winboll.studio.contacts.activities.SettingsActivity;
+import cc.winboll.studio.contacts.bobulltoon.TomCat;
+import cc.winboll.studio.contacts.model.PhoneConnectRuleBean;
+import cc.winboll.studio.contacts.model.SettingsBean;
+import cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService;
+import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.contacts.utils.ContactUtils;
+import cc.winboll.studio.contacts.utils.IntUtils;
+import cc.winboll.studio.contacts.utils.RegexPPiUtils;
+import cc.winboll.studio.contacts.views.DunTemperatureView;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.ArrayList;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.regex.Pattern;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/21 06:15:10
+ * @Describe 云盾防御规则（双重校验锁单例模式）
+ */
+public class Rules {
+
+    public static final String TAG = "Rules";
+
+    // 单例核心：volatile 保证多线程可见性，禁止指令重排
+    private static volatile Rules sInstance;
+    // 上下文需使用 ApplicationContext 避免内存泄漏
+    private static Context sApplicationContext;
+
+    ArrayList<PhoneConnectRuleBean> _PhoneConnectRuleModelList;
+    Context mContext;
+    SettingsBean mSettingsModel;
+    Timer mDunResumeTimer;
+
+    /**
+     * 私有化构造方法，禁止外部 new 实例
+     */
+    private Rules(Context context) {
+        mContext = context.getApplicationContext();
+        _PhoneConnectRuleModelList = new ArrayList<PhoneConnectRuleBean>();
+        reload();
+    }
+
+    /**
+     * 获取单例实例（双重校验锁，线程安全）
+     * @param context 上下文，建议传入 ApplicationContext
+     * @return Rules 唯一实例
+     */
+    public static Rules getInstance(Context context) {
+        // 第一次校验：无锁，提高性能
+        if (sInstance == null) {
+            // 加锁：保证多线程下仅初始化一次
+            synchronized (Rules.class) {
+                // 第二次校验：防止多线程并发时重复创建
+                if (sInstance == null) {
+                    sInstance = new Rules(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public void reload() {
+        LogUtils.d(TAG, "reload()");
+        loadRules();
+        loadDun();
+        setDunResumTimer();
+    }
+
+    public void setDunResumTimer() {
+        if (mDunResumeTimer != null) {
+            mDunResumeTimer.cancel();
+        }
+
+        // 盾牌恢复定时器
+        mDunResumeTimer = new Timer();
+        int ss = IntUtils.getIntInRange(mSettingsModel.getDunResumeSecondCount() * 1000, SettingsBean.MIN_INTRANGE, SettingsBean.MAX_INTRANGE);
+        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();
+						// 一键更新所有 DunTemperatureView 实例的盾值
+						DunTemperatureView.updateDunValue(mSettingsModel.getDunTotalCount(), mSettingsModel.getDunCurrentCount());
+
+						SettingsActivity.notifyDunInfoUpdate();
+					}
+				}
+			}, 1000, ss);
+    }
+
+    public void loadRules() {
+        _PhoneConnectRuleModelList.clear();
+        PhoneConnectRuleBean.loadBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleBean.class);
+    }
+
+    public void saveRules() {
+        LogUtils.d(TAG, String.format("saveRules()"));
+        PhoneConnectRuleBean.saveBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleBean.class);
+    }
+
+    public void resetDefaultBoBullToonURL() {
+        mSettingsModel.setBoBullToon_URL(TomCat.getInstance(mContext).getDefaultBobulltoonUrl());
+        saveDun();
+    }
+
+    public void setBoBullToonURL(String szUrl) {
+        mSettingsModel.setBoBullToon_URL(szUrl);
+        saveDun();
+    }
+
+    public String getBoBullToonURL() {
+        return mSettingsModel.getBoBullToon_URL();
+    }
+
+    public void loadDun() {
+        mSettingsModel = SettingsBean.loadBean(mContext, SettingsBean.class);
+        if (mSettingsModel == null) {
+            mSettingsModel = new SettingsBean();
+            SettingsBean.saveBean(mContext, mSettingsModel);
+        }
+    }
+
+    public void saveDun() {
+        LogUtils.d(TAG, String.format("saveDun()"));
+        SettingsBean.saveBean(mContext, mSettingsModel);
+    }
+
+	public boolean isAllowed(String phoneNumber) {
+		return isAllowed(phoneNumber, false);
+	}
+
+    public boolean isAllowed(String phoneNumber, boolean isTest) {
+        // 没有启用云盾，默认允许接通任何电话
+        if (!mSettingsModel.isEnableDun()) {
+            LogUtils.d(TAG, String.format("没有启用云盾，默认允许接通任何电话。isAllowed(...) return true"));
+            return true;
+        }
+
+        // 云盾防御体系
+        boolean isDefend = false; // 盾牌是否生效
+        boolean isConnect = true; // 防御结果是否连接
+
+        // 进行盾牌层数预计缩减计算
+        int nDunCurrentCount = mSettingsModel.getDunCurrentCount() - 1;
+        LogUtils.d(TAG, String.format("nDunCurrentCount : %d", nDunCurrentCount));
+
+        // 如果盾值小于1，则解除防御
+        if (!isDefend && nDunCurrentCount < 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));
+        }
+		
+        // 限时特殊通道打开时返回连接
+        if (!isDefend && LimitedTimeSpecialChannelService.isServiceRunning()) {
+            LogUtils.d(TAG, String.format("PhoneNumber %s\n and Limited Time Special Channel Service Is Running.", phoneNumber));
+            isDefend = true;
+            isConnect = true;
+            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
+        }
+
+        // 检验拨不通号码群
+        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));
+        }
+
+        // 查询通讯录是否有该联系人
+        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) {
+            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 (isTest == false) {
+			if (isConnect) {
+				// 如果防御结果为连接，则恢复防御盾牌最大值层数
+				mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
+				LogUtils.d(TAG, String.format("防御结果为连接，恢复防御盾牌最大值层数 %d", mSettingsModel.getDunTotalCount()));
+				saveDun();
+				SettingsActivity.notifyDunInfoUpdate();
+			} else if (isDefend) {
+				// 如果触发了以上某个防御模块，减少防御盾牌层数
+				int newDunCount = nDunCurrentCount;
+				LogUtils.d(TAG, String.format("新的防御层数预计为 %d", newDunCount));
+
+				// 保证盾值在[1，DunTotalCount]之内其他值一律重置为 DunTotalCount。
+				if (newDunCount > 0 && newDunCount < mSettingsModel.getDunTotalCount()) {
+					mSettingsModel.setDunCurrentCount(newDunCount);
+					LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount));
+				} else {
+					mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
+					LogUtils.d(TAG, String.format("盾值不在[0，%d]区间，恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount()));
+				}
+
+				saveDun();
+				SettingsActivity.notifyDunInfoUpdate();
+			}
+
+			// 一键更新所有 DunTemperatureView 实例的盾值
+			DunTemperatureView.updateDunValue(mSettingsModel.getDunTotalCount(), mSettingsModel.getDunCurrentCount());
+		}
+
+		// 返回校验结果
+		LogUtils.d(TAG, String.format("返回校验结果 isConnect == %s", isConnect));
+		return isConnect;
+	}
+
+    public void add(String szPhoneConnectRule, boolean isAllowConnection, boolean isEnable) {
+        _PhoneConnectRuleModelList.add(new PhoneConnectRuleBean(szPhoneConnectRule, isAllowConnection, isEnable));
+    }
+
+    public ArrayList<PhoneConnectRuleBean> getPhoneBlacRuleBeanList() {
+        return _PhoneConnectRuleModelList;
+    }
+
+    public SettingsBean getSettingsModel() {
+        return mSettingsModel;
+    }
+
+    /**
+     * 可选：释放单例资源（如退出应用时调用）
+     */
+    public static void releaseInstance() {
+        if (sInstance != null) {
+            sInstance.mDunResumeTimer.cancel();
+            sInstance._PhoneConnectRuleModelList.clear();
+            sInstance.mSettingsModel = null;
+            sInstance.mContext = null;
+            sInstance = null;
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java
new file mode 100644
index 0000000..9e2ca6a
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java
@@ -0,0 +1,258 @@
+package cc.winboll.studio.contacts.fragments;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+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.model.CallLogModel;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/20 12:57:00
+ * @Describe 通话记录区域视图（支持懒加载，仅切换到当前页才加载数据）
+ */
+public class CallLogFragment extends Fragment {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "CallLogFragment";
+    public static final int MSG_UPDATE = 1;
+    private static final String ARG_PAGE = "ARG_PAGE";
+    private static final int REQUEST_READ_CALL_LOG = 1;
+
+    // ====================== 静态成员区 ======================
+    static volatile CallLogFragment _CallLogFragment;
+
+    // ====================== 页面参数区 ======================
+    private int mPage;
+
+    // ====================== UI控件与适配器区 ======================
+    private RecyclerView recyclerView;
+    private CallLogAdapter callLogAdapter;
+    private List<CallLogModel> callLogList = new ArrayList<CallLogModel>();
+
+    // ====================== 业务逻辑成员区 ======================
+    private Handler mHandler;
+    // 懒加载标记：记录当前Fragment是否已初始化数据（避免重复加载）
+    private boolean isDataInited = false;
+
+    // ====================== 单例与实例化函数区 ======================
+    CallLogFragment() {
+        super();
+    }
+
+    public static CallLogFragment newInstance(int page) {
+        LogUtils.d(TAG, "newInstance: 创建通话记录Fragment实例，页码=" + page);
+        Bundle args = new Bundle();
+        args.putInt(ARG_PAGE, page);
+        CallLogFragment fragment = new CallLogFragment();
+        fragment.setArguments(args);
+        _CallLogFragment = fragment;
+        return fragment;
+    }
+
+    // ====================== 生命周期函数区 ======================
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: Fragment创建开始");
+        if (getArguments() != null) {
+            mPage = getArguments().getInt(ARG_PAGE);
+            LogUtils.d(TAG, "onCreate: 读取页面参数，mPage=" + mPage);
+        }
+        // Java7 兼容：移除Lambda，使用匿名内部类初始化Handler
+        mHandler = new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(Message msg) {
+                if (msg.what == MSG_UPDATE) {
+                    LogUtils.d(TAG, "handleMessage: 收到更新消息，开始读取通话记录");
+                    readCallLog();
+                }
+            }
+        };
+        LogUtils.d(TAG, "onCreate: Fragment创建完成");
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreateView: 加载Fragment布局");
+        return inflater.inflate(R.layout.fragment_call_log, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        LogUtils.d(TAG, "onViewCreated: 视图创建完成，仅初始化控件（不加载数据）");
+        // 初始化RecyclerView（仅绑定控件、设置布局管理器，不设置数据/发起请求）
+        recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        // 初始化适配器（传入空列表，后续懒加载时更新数据）
+        callLogAdapter = new CallLogAdapter(getContext(), callLogList);
+        recyclerView.setAdapter(callLogAdapter);
+        LogUtils.d(TAG, "onViewCreated: RecyclerView控件初始化完成（未加载数据）");
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        LogUtils.d(TAG, "onResume: Fragment进入前台");
+        // 已初始化过数据 → 仅刷新（避免重复初始化，优化性能）
+        if (isDataInited && callLogAdapter != null) {
+            LogUtils.d(TAG, "onResume: 数据已初始化，仅刷新列表");
+            callLogAdapter.relaodContacts();
+            readCallLog(); // 刷新最新通话记录
+            LogUtils.d(TAG, "onResume: 通话记录数据刷新完成");
+        }
+        // 未初始化 → 不操作（等待MainActivity调用initData触发初始化）
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: Fragment开始销毁");
+        if (mHandler != null) {
+            mHandler.removeCallbacksAndMessages(null);
+            LogUtils.d(TAG, "onDestroy: Handler消息已清空");
+        }
+        // 释放资源，避免内存泄漏
+        if (callLogList != null) {
+            callLogList.clear();
+            callLogList = null;
+        }
+        callLogAdapter = null;
+        recyclerView = null;
+        _CallLogFragment = null;
+        isDataInited = false;
+        LogUtils.d(TAG, "onDestroy: Fragment销毁完成");
+    }
+
+    // ====================== 权限回调函数区 ======================
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        LogUtils.d(TAG, "onRequestPermissionsResult: 权限请求回调，requestCode=" + requestCode);
+        if (requestCode == REQUEST_READ_CALL_LOG) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                LogUtils.d(TAG, "onRequestPermissionsResult: 通话记录权限授予成功，开始加载数据");
+                mHandler.sendEmptyMessage(MSG_UPDATE);
+            } else {
+                LogUtils.e(TAG, "onRequestPermissionsResult: 通话记录权限被拒绝，无法加载数据");
+            }
+        }
+    }
+
+    // ====================== 懒加载核心方法（供MainActivity调用） ======================
+    public void initData() {
+        // 避免重复初始化（双重防护：标记+判断）
+        if (isDataInited || getContext() == null) {
+            LogUtils.d(TAG, "initData: 数据已初始化/上下文为空，跳过");
+            return;
+        }
+        LogUtils.d(TAG, "initData: 开始懒加载初始化通话记录数据");
+        // 权限检查与数据加载（原onViewCreated中的核心逻辑迁移至此）
+        if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CALL_LOG) != PackageManager.PERMISSION_GRANTED) {
+            LogUtils.w(TAG, "initData: 读取通话记录权限未授予，发起权限申请");
+            ActivityCompat.requestPermissions(requireActivity(), new String[]{Manifest.permission.READ_CALL_LOG}, REQUEST_READ_CALL_LOG);
+        } else {
+            LogUtils.d(TAG, "initData: 权限已授予，发送更新消息加载数据");
+            mHandler.sendEmptyMessage(MSG_UPDATE);
+        }
+        // 标记为已初始化（后续仅刷新，不重复初始化）
+        isDataInited = true;
+        LogUtils.d(TAG, "initData: 懒加载初始化流程完成");
+    }
+
+    // ====================== 业务核心函数区 ======================
+    private void readCallLog() {
+        LogUtils.d(TAG, "readCallLog: 开始读取系统通话记录");
+        // 避免空指针（懒加载场景下，控件可能未初始化完成）
+        if (callLogList == null || callLogAdapter == null || getContext() == null) {
+            LogUtils.w(TAG, "readCallLog: 控件/列表为空，跳过读取");
+            return;
+        }
+        callLogList.clear();
+        Cursor cursor = null;
+        try {
+            cursor = requireContext().getContentResolver().query(
+                CallLog.Calls.CONTENT_URI,
+                null,
+                null,
+                null,
+                CallLog.Calls.DATE + " DESC"
+            );
+            if (cursor != null) {
+                LogUtils.d(TAG, "readCallLog: 成功获取通话记录游标，数据条数=" + cursor.getCount());
+                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));
+                }
+                callLogAdapter.notifyDataSetChanged();
+                LogUtils.d(TAG, "readCallLog: 通话记录数据解析完成，共" + callLogList.size() + "条");
+            } else {
+                LogUtils.w(TAG, "readCallLog: 通话记录游标为空");
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "readCallLog: 读取通话记录异常", e);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+                LogUtils.d(TAG, "readCallLog: 游标已关闭");
+            }
+        }
+    }
+
+    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";
+        }
+    }
+
+    // ====================== 外部调用函数区 ======================
+    public void triggerUpdate() {
+        LogUtils.d(TAG, "triggerUpdate: 外部触发通话记录更新");
+        if (isDataInited) { // 已初始化才触发更新（避免未加载时调用）
+            mHandler.sendEmptyMessage(MSG_UPDATE);
+        }
+    }
+
+    public static void updateCallLogFragment() {
+        if (_CallLogFragment != null) {
+            LogUtils.d(TAG, "updateCallLogFragment: 静态方法触发Fragment更新");
+            _CallLogFragment.triggerUpdate();
+        } else {
+            LogUtils.w(TAG, "updateCallLogFragment: Fragment实例为空，无法更新");
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java
new file mode 100644
index 0000000..1d177ed
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java
@@ -0,0 +1,401 @@
+package cc.winboll.studio.contacts.fragments;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+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 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.model.ContactModel;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/08/30 14:32
+ * @Describe 联系人区域视图（支持懒加载，仅切换到当前页才加载数据）
+ */
+public class ContactsFragment extends Fragment {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "ContactsFragment";
+    private static final String ARG_PAGE = "ARG_PAGE";
+    private static final int REQUEST_READ_CONTACTS = 1;
+    private static final long DEBOUNCE_DELAY = 300; // 搜索防抖延迟
+
+    // ====================== 静态缓存区 ======================
+    // 全局复用联系人数据，减少重复查询
+    private static List<ContactModel> sCachedOriginalList = new ArrayList<ContactModel>();
+    private static List<ContactModel> sCachedFilteredList = new ArrayList<ContactModel>();
+
+    // ====================== 页面参数区 ======================
+    private int mPage;
+    private boolean isViewInitialized = false; // 视图初始化标记（控件绑定完成）
+    private boolean isDataLoaded = false;     // 数据加载标记（数据+功能初始化完成）
+    private boolean isLazyInitCompleted = false; // 懒加载总标记（供MainActivity判断）
+
+    // ====================== UI控件区 ======================
+    private RecyclerView recyclerView;
+    private ContactAdapter contactAdapter;
+    private EditText searchEditText;
+    private Button btnDial;
+
+    // ====================== 数据容器区 ======================
+    private List<ContactModel> contactList = new ArrayList<ContactModel>();
+    private List<ContactModel> originalContactList = new ArrayList<ContactModel>();
+
+    // ====================== 异步工具区 ======================
+    private final ExecutorService executor = Executors.newSingleThreadExecutor();
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
+
+    // ====================== 实例化函数区 ======================
+    public static ContactsFragment newInstance(int page) {
+        LogUtils.d(TAG, "newInstance: 创建联系人Fragment实例，页码=" + page);
+        Bundle args = new Bundle();
+        args.putInt(ARG_PAGE, page);
+        ContactsFragment fragment = new ContactsFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    // ====================== 生命周期函数区 ======================
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: Fragment创建开始");
+        if (getArguments() != null) {
+            mPage = getArguments().getInt(ARG_PAGE);
+            LogUtils.d(TAG, "onCreate: 读取页面参数，mPage=" + mPage);
+        }
+        LogUtils.d(TAG, "onCreate: Fragment创建完成");
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreateView: 加载Fragment布局");
+        return inflater.inflate(R.layout.fragment_contacts, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        LogUtils.d(TAG, "onViewCreated: 开始初始化UI控件（仅绑定，不加载数据/功能）");
+        // 初始化RecyclerView（仅绑定控件、设适配器，隐藏列表）
+        recyclerView = (RecyclerView) view.findViewById(R.id.contacts_recycler_view);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        contactAdapter = new ContactAdapter(getActivity(), contactList);
+        recyclerView.setAdapter(contactAdapter);
+        recyclerView.setVisibility(View.GONE);
+
+        // 绑定搜索框和拨号按钮（仅赋值，不显示、不绑定事件）
+        searchEditText = (EditText) view.findViewById(R.id.search_edit_text);
+        btnDial = (Button) view.findViewById(R.id.btn_dial);
+        searchEditText.setVisibility(View.GONE);
+        btnDial.setVisibility(View.GONE);
+
+        // 标记视图控件绑定完成
+        isViewInitialized = true;
+        LogUtils.d(TAG, "onViewCreated: UI控件初始化完成（未加载数据/功能）");
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        LogUtils.d(TAG, "onResume: Fragment进入前台");
+        // 已完成懒加载 → 仅恢复缓存数据（切回页面时刷新）
+        if (isLazyInitCompleted && isDataLoaded) {
+            LogUtils.d(TAG, "onResume: 懒加载已完成，恢复缓存数据");
+            contactList.clear();
+            contactList.addAll(sCachedFilteredList);
+            contactAdapter.notifyDataSetChanged();
+            recyclerView.setVisibility(View.VISIBLE);
+        }
+        // 未完成懒加载 → 不操作（等待MainActivity调用initData触发）
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: Fragment开始销毁");
+        executor.shutdown(); // 关闭线程池
+        mainHandler.removeCallbacksAndMessages(null); // 清空Handler任务
+        // 释放本地数据引用（保留静态缓存，全局复用）
+        if (contactList != null) {
+            contactList.clear();
+            contactList = null;
+        }
+        if (originalContactList != null) {
+            originalContactList.clear();
+            originalContactList = null;
+        }
+        // 重置标记
+        isViewInitialized = false;
+        isDataLoaded = false;
+        isLazyInitCompleted = false;
+        LogUtils.d(TAG, "onDestroy: 异步工具+本地资源已释放");
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        LogUtils.d(TAG, "onHiddenChanged: Fragment隐藏状态变更，hidden=" + hidden);
+        // 已完成懒加载+显示状态 → 恢复缓存数据（兼容Tab切换场景）
+        if (!hidden && isLazyInitCompleted && isDataLoaded) {
+            contactList.clear();
+            contactList.addAll(sCachedFilteredList);
+            contactAdapter.notifyDataSetChanged();
+            recyclerView.setVisibility(View.VISIBLE);
+            LogUtils.d(TAG, "onHiddenChanged: 恢复缓存数据，列表已显示");
+        }
+    }
+
+    // ====================== 权限相关函数区 ======================
+    private void checkContactPermission() {
+        LogUtils.d(TAG, "checkContactPermission: 检查联系人读取权限");
+        if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
+            LogUtils.w(TAG, "checkContactPermission: 权限未授予，发起申请");
+            ActivityCompat.requestPermissions(requireActivity(), new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_READ_CONTACTS);
+        } else {
+            LogUtils.d(TAG, "checkContactPermission: 权限已授予，开始加载数据");
+            loadContacts();
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        LogUtils.d(TAG, "onRequestPermissionsResult: 权限回调触发，requestCode=" + requestCode);
+        if (requestCode == REQUEST_READ_CONTACTS) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                LogUtils.d(TAG, "onRequestPermissionsResult: 联系人权限授予成功");
+                loadContacts();
+            } else {
+                LogUtils.e(TAG, "onRequestPermissionsResult: 联系人权限被拒绝");
+                ToastUtils.show("请授予联系人权限以查看联系人列表");
+                recyclerView.setVisibility(View.VISIBLE);
+                // 权限拒绝也标记懒加载完成（避免重复触发）
+                isLazyInitCompleted = true;
+            }
+        }
+    }
+
+    // ====================== 懒加载核心方法（供MainActivity调用） ======================
+    public void initData() {
+        // 双重防护：避免重复初始化（标记+视图就绪判断）
+        if (isLazyInitCompleted || !isViewInitialized || getContext() == null) {
+            LogUtils.d(TAG, "initData: 懒加载已完成/视图未就绪，跳过");
+            return;
+        }
+        LogUtils.d(TAG, "initData: 开始懒加载初始化（功能+数据）");
+        // 1. 初始化搜索、拨号功能（原onResume首次进入逻辑迁移至此）
+        initSearchAndDial();
+        // 2. 检查权限+加载数据（原onResume首次进入逻辑迁移至此）
+        checkContactPermission();
+        // 标记懒加载总流程完成（无论权限是否授予，仅执行一次）
+        isLazyInitCompleted = true;
+        LogUtils.d(TAG, "initData: 懒加载初始化流程启动完成");
+    }
+
+    // ====================== UI功能初始化区 ======================
+    private void initSearchAndDial() {
+        LogUtils.d(TAG, "initSearchAndDial: 初始化搜索和拨号功能");
+        // 显示控件
+        searchEditText.setVisibility(View.VISIBLE);
+        btnDial.setVisibility(View.VISIBLE);
+
+        // 搜索防抖监听
+        searchEditText.addTextChangedListener(new DebounceTextWatcher(DEBOUNCE_DELAY) {
+				@Override
+				public void onDebounceTextChanged(String query) {
+					filterContacts(query);
+				}
+			});
+
+        // 拨号按钮点击事件
+        btnDial.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", "");
+					if (phoneNumber.isEmpty()) {
+						ToastUtils.show("请输入号码");
+						return;
+					}
+					LogUtils.d(TAG, "initSearchAndDial: 发起拨号，号码=" + phoneNumber);
+					Intent intent = new Intent(Intent.ACTION_CALL);
+					intent.setData(android.net.Uri.parse("tel:" + phoneNumber));
+					intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+					startActivity(intent);
+				}
+			});
+        LogUtils.d(TAG, "initSearchAndDial: 功能初始化完成");
+    }
+
+    // ====================== 数据加载与处理区 ======================
+    private void loadContacts() {
+        // 优先使用缓存数据（保留原有缓存逻辑，提升性能）
+        if (!sCachedOriginalList.isEmpty() && !sCachedFilteredList.isEmpty()) {
+            LogUtils.d(TAG, "loadContacts: 存在缓存数据，直接复用");
+            originalContactList.clear();
+            originalContactList.addAll(sCachedOriginalList);
+            contactList.clear();
+            contactList.addAll(sCachedFilteredList);
+            contactAdapter.notifyDataSetChanged();
+            recyclerView.setVisibility(View.VISIBLE);
+            isDataLoaded = true;
+            return;
+        }
+
+        // 无缓存时异步加载（保留原有异步逻辑，避免主线程阻塞）
+        if (!isDataLoaded) {
+            LogUtils.d(TAG, "loadContacts: 无缓存，异步读取联系人数据");
+            recyclerView.setVisibility(View.GONE);
+            executor.execute(new Runnable() {
+					@Override
+					public void run() {
+						final List<ContactModel> tempList = readContactsInBackground();
+						// 主线程更新UI和缓存
+						mainHandler.post(new Runnable() {
+								@Override
+								public void run() {
+									sCachedOriginalList.clear();
+									sCachedOriginalList.addAll(tempList);
+									sCachedFilteredList.clear();
+									sCachedFilteredList.addAll(tempList);
+
+									originalContactList.clear();
+									originalContactList.addAll(sCachedOriginalList);
+									contactList.clear();
+									contactList.addAll(sCachedFilteredList);
+
+									contactAdapter.notifyDataSetChanged();
+									recyclerView.setVisibility(View.VISIBLE);
+									isDataLoaded = true;
+
+									LogUtils.d(TAG, "loadContacts: 联系人数据加载完成，共" + contactList.size() + "条");
+								}
+							});
+					}
+				});
+        }
+    }
+
+    private List<ContactModel> readContactsInBackground() {
+        LogUtils.d(TAG, "readContactsInBackground: 子线程读取联系人");
+        List<ContactModel> tempList = new ArrayList<ContactModel>();
+        Cursor cursor = null;
+        try {
+            cursor = requireContext().getContentResolver().query(
+                ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+                new String[]{
+                    ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME,
+                    ContactsContract.CommonDataKinds.Phone.NUMBER
+                },
+                null,
+                null,
+                ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC"
+            );
+
+            if (cursor != null && cursor.moveToFirst()) {
+                int nameIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
+                int numberIndex = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
+                do {
+                    String name = cursor.getString(nameIndex);
+                    String number = cursor.getString(numberIndex).replaceAll("\\s", "");
+                    tempList.add(new ContactModel(name, number));
+                } while (cursor.moveToNext());
+                LogUtils.d(TAG, "readContactsInBackground: 成功读取" + tempList.size() + "条联系人数据");
+            } else {
+                LogUtils.w(TAG, "readContactsInBackground: 未读取到联系人数据");
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "readContactsInBackground: 读取联系人异常", e);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+                LogUtils.d(TAG, "readContactsInBackground: 游标已关闭");
+            }
+        }
+        return tempList;
+    }
+
+    private void filterContacts(String query) {
+        LogUtils.d(TAG, "filterContacts: 搜索过滤，关键词=" + query);
+        contactList.clear();
+        sCachedFilteredList.clear();
+        if (query.isEmpty()) {
+            contactList.addAll(originalContactList);
+            sCachedFilteredList.addAll(originalContactList);
+        } else {
+            String lowerQuery = query.toLowerCase();
+            for (ContactModel contact : originalContactList) {
+                boolean matchName = contact.getName().toLowerCase().contains(lowerQuery);
+                boolean matchPinyin = contact.getPinyin().toLowerCase().contains(lowerQuery);
+                boolean matchFirstLetter = contact.getPinyinFirstLetter().toLowerCase().contains(lowerQuery);
+                boolean matchNumber = contact.getNumber().contains(lowerQuery);
+                if (matchName || matchPinyin || matchFirstLetter || matchNumber) {
+                    contactList.add(contact);
+                }
+            }
+            sCachedFilteredList.addAll(contactList);
+        }
+        contactAdapter.notifyDataSetChanged();
+        recyclerView.setVisibility(View.VISIBLE);
+        LogUtils.d(TAG, "filterContacts: 过滤完成，显示" + contactList.size() + "条数据");
+    }
+
+    // ====================== 内部防抖监听类 ======================
+    public abstract static class DebounceTextWatcher implements TextWatcher {
+        private final long debounceDelay;
+        private Handler handler = new Handler(Looper.getMainLooper());
+        private Runnable pendingRunnable;
+
+        public DebounceTextWatcher(long debounceDelay) {
+            this.debounceDelay = debounceDelay;
+        }
+
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+        @Override
+        public void onTextChanged(final CharSequence s, int start, int before, int count) {
+            if (pendingRunnable != null) {
+                handler.removeCallbacks(pendingRunnable);
+            }
+            pendingRunnable = new Runnable() {
+                @Override
+                public void run() {
+                    onDebounceTextChanged(s.toString());
+                }
+            };
+            handler.postDelayed(pendingRunnable, debounceDelay);
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {}
+
+        public abstract void onDebounceTextChanged(String query);
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java
new file mode 100644
index 0000000..625e327
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java
@@ -0,0 +1,118 @@
+package cc.winboll.studio.contacts.fragments;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/20 12:58:15
+ * @Describe 应用日志区域视图（支持懒加载，仅切换到当前页才启动日志）
+ */
+public class LogFragment extends Fragment {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "LogFragment";
+    private static final String ARG_PAGE = "ARG_PAGE";
+
+    // ====================== 页面参数区 ======================
+    private int mPage;
+
+    // ====================== UI控件区 ======================
+    private LogView mLogView;
+
+    // ====================== 懒加载标记区 ======================
+    private boolean isViewInitialized = false; // 视图控件绑定完成标记
+    private boolean isLazyInitCompleted = false; // 懒加载总流程完成标记
+    private boolean isLogViewStarted = false; // LogView启动状态标记
+
+    // ====================== 实例化函数区 ======================
+    public static LogFragment newInstance(int page) {
+        LogUtils.d(TAG, "newInstance: 创建日志Fragment实例，页码=" + page);
+        Bundle args = new Bundle();
+        args.putInt(ARG_PAGE, page);
+        LogFragment fragment = new LogFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    // ====================== 生命周期函数区 ======================
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, "onCreate: Fragment创建开始");
+        if (getArguments() != null) {
+            mPage = getArguments().getInt(ARG_PAGE);
+            LogUtils.d(TAG, "onCreate: 读取页面参数，mPage=" + mPage);
+        }
+        LogUtils.d(TAG, "onCreate: Fragment创建完成");
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreateView: 加载Fragment布局");
+        View view = inflater.inflate(R.layout.fragment_log, container, false);
+        // Java7 适配：添加强制类型转换，仅初始化LogView控件（不启动）
+        mLogView = (LogView) view.findViewById(R.id.logview);
+        LogUtils.d(TAG, "onCreateView: LogView控件初始化完成（未启动）");
+        // 标记视图控件绑定完成
+        isViewInitialized = true;
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        LogUtils.d(TAG, "onResume: Fragment进入前台");
+        // 已完成懒加载 → 仅重启LogView（切回页面时恢复日志显示）
+        if (isLazyInitCompleted && mLogView != null && !isLogViewStarted) {
+            mLogView.start();
+            isLogViewStarted = true;
+            LogUtils.d(TAG, "onResume: LogView已重启，恢复日志显示");
+        }
+        // 未完成懒加载 → 不操作（等待MainActivity调用initData触发）
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: Fragment开始销毁");
+        if (mLogView != null) {
+            // 若LogView有停止方法，必须调用（避免后台持续占用资源，根据实际API调整）
+            // mLogView.stop(); // 关键：释放LogView资源，防止内存泄漏
+            LogUtils.d(TAG, "onDestroy: LogView资源已释放");
+        }
+        // 重置所有标记，避免重建时状态异常
+        mLogView = null;
+        isViewInitialized = false;
+        isLazyInitCompleted = false;
+        isLogViewStarted = false;
+        LogUtils.d(TAG, "onDestroy: Fragment销毁完成");
+    }
+
+    // ====================== 懒加载核心方法（供MainActivity调用） ======================
+    public void initData() {
+        // 双重防护：避免重复初始化（标记+视图就绪+控件非空）
+        if (isLazyInitCompleted || !isViewInitialized || mLogView == null || getContext() == null) {
+            LogUtils.d(TAG, "initData: 懒加载已完成/视图未就绪，跳过");
+            return;
+        }
+        LogUtils.d(TAG, "initData: 开始懒加载初始化，启动LogView");
+        // 核心：启动LogView（原onCreateView中的start逻辑迁移至此）
+        mLogView.start();
+        isLogViewStarted = true;
+        // 标记懒加载总流程完成（仅执行一次）
+        isLazyInitCompleted = true;
+        LogUtils.d(TAG, "initData: 懒加载初始化完成，LogView正常启动");
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/handlers/MainServiceHandler.java b/contacts/src/main/java/cc/winboll/studio/contacts/handlers/MainServiceHandler.java
new file mode 100644
index 0000000..bd08e58
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/handlers/MainServiceHandler.java
@@ -0,0 +1,38 @@
+package cc.winboll.studio.contacts.handlers;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/14 03:51:40
+ */
+import android.os.Handler;
+import android.os.Message;
+import cc.winboll.studio.contacts.services.MainService;
+import java.lang.ref.WeakReference;
+
+public class MainServiceHandler extends Handler {
+    public static final String TAG = "MainServiceHandler";
+
+    public static final int MSG_REMINDTHREAD = 0;
+
+    WeakReference<MainService> serviceWeakReference;
+    public MainServiceHandler(MainService service) {
+        serviceWeakReference = new WeakReference<MainService>(service);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case MSG_REMINDTHREAD: // 处理下载完成消息，更新UI
+                {
+                    // 显示提醒消息
+                    //
+                    //LogUtils.d(TAG, "显示提醒消息");
+                    MainService mainService = serviceWeakReference.get();
+                    if (mainService != null) {
+                        mainService.appenMessage((String)msg.obj);
+                    }
+                    break;
+                }
+        }
+    }
+}
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/listenphonecall/CallListenerService.java b/contacts/src/main/java/cc/winboll/studio/contacts/listenphonecall/CallListenerService.java
new file mode 100644
index 0000000..9230eb4
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/listenphonecall/CallListenerService.java
@@ -0,0 +1,392 @@
+package cc.winboll.studio.contacts.listenphonecall;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.PixelFormat;
+import android.os.Build;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.model.MainServiceBean;
+import cc.winboll.studio.contacts.phonecallui.PhoneCallActivity;
+import cc.winboll.studio.contacts.phonecallui.PhoneCallService;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Describe 通话监听服务（无前台服务），负责监听通话状态、显示通话悬浮窗、跳转通话界面
+ * 严格适配 Java7 语法 + Android API29-30 | 轻量稳定 | 避免内存泄漏
+ */
+public class CallListenerService extends Service {
+
+    // ====================== 常量定义区（精准适配API29-30，无冗余） ======================
+    public static final String TAG = "CallListenerService";
+
+    // Android版本常量（仅保留适配必需版本，精简无用定义）
+    private static final int ANDROID_8_API = 26;   // 悬浮窗类型适配（API26+必需）
+    private static final int ANDROID_10_API = 29;  // API29+ 悬浮窗权限/参数适配
+    private static final int ANDROID_19_API = 19;  // 透明状态栏/导航栏适配
+
+    // 延迟初始化参数（让出主线程，避免启动阻塞）
+    private static final long DELAY_INIT_MS = 100L;
+
+    // ====================== 成员属性区（按功能归类，命名规范） ======================
+    // 延迟初始化核心
+    private Handler mDelayHandler;                // 延迟处理器（避免onCreate阻塞）
+
+    // 通话监听核心
+    private TelephonyManager mTelephonyManager;   // 电话管理器（监听通话状态）
+    private PhoneStateListener mPhoneStateListener;// 通话状态监听回调
+    private String mCallNumber;                   // 当前通话号码
+    private boolean mIsCallingIn;                 // 是否为来电（true=来电，false=去电）
+
+    // 悬浮窗核心
+    private WindowManager mWindowManager;         // 窗口管理器（添加/移除悬浮窗）
+    private WindowManager.LayoutParams mWindowParams;// 悬浮窗参数配置
+    private View mPhoneCallView;                  // 通话悬浮窗根视图
+    private TextView mTvCallNumber;               // 悬浮窗号码显示控件
+    private Button mBtnOpenApp;                   // 悬浮窗跳转APP按钮
+    private boolean mHasShown;                    // 悬浮窗显示状态标记（避免重复操作）
+
+    // ====================== Service生命周期方法区（按执行顺序排列） ======================
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "===== onCreate: 通话监听服务启动 =====");
+
+        // 延迟初始化所有逻辑（让出主线程，避免启动阻塞，提升启动速度）
+        initDelayHandlerAndLogic();
+
+        LogUtils.d(TAG, "===== onCreate: 通话监听服务启动完成 =====");
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand: 服务被启动，startId=" + startId);
+
+        // 加载服务配置，决定重启策略（启用则自动重启，禁用则默认）
+        MainServiceBean serviceConfig = MainServiceBean.loadBean(this, MainServiceBean.class);
+        int startMode = (serviceConfig != null && serviceConfig.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
+        LogUtils.d(TAG, "onStartCommand: 服务启动模式：" + (startMode == START_STICKY ? "START_STICKY（自动重启）" : "默认模式"));
+
+        return startMode;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        LogUtils.d(TAG, "onBind: 服务无需绑定，返回null");
+        return null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "===== onDestroy: 通话监听服务开始销毁 =====");
+
+        // 全量清理资源，彻底避免内存泄漏
+        dismissFloatWindow();        // 移除悬浮窗
+        unregisterPhoneStateListener();// 注销通话监听
+        clearDelayHandler();         // 清空延迟任务
+        resetAllReferences();        // 置空所有成员属性
+
+        LogUtils.d(TAG, "===== onDestroy: 通话监听服务销毁完成 =====");
+    }
+
+    // ====================== 延迟初始化方法区（非阻塞启动，提升稳定性） ======================
+    /**
+     * 初始化延迟处理器，执行核心逻辑（通话监听+悬浮窗）
+     */
+    private void initDelayHandlerAndLogic() {
+        mDelayHandler = new Handler(Looper.getMainLooper());
+        mDelayHandler.postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					LogUtils.d(TAG, "initDelayHandlerAndLogic: 开始延迟初始化核心逻辑");
+					initPhoneStateListener();  // 初始化通话状态监听
+					initFloatWindow();         // 初始化通话悬浮窗
+					LogUtils.d(TAG, "initDelayHandlerAndLogic: 延迟初始化完成，服务就绪");
+				}
+			}, DELAY_INIT_MS);
+    }
+
+    /**
+     * 初始化通话状态监听（注册TelephonyManager，响应通话状态变化）
+     */
+    private void initPhoneStateListener() {
+        // 1. 创建通话状态监听回调
+        mPhoneStateListener = new PhoneStateListener() {
+            @Override
+            public void onCallStateChanged(int callState, String incomingNumber) {
+                super.onCallStateChanged(callState, incomingNumber);
+                mCallNumber = incomingNumber;
+                LogUtils.d(TAG, "onCallStateChanged: 通话状态变化，状态=" + getCallStateDesc(callState) + "，号码=" + incomingNumber);
+
+                // 响应不同通话状态
+                switch (callState) {
+                    case TelephonyManager.CALL_STATE_IDLE:
+                        // 通话空闲（挂断/未通话）：隐藏悬浮窗
+                        dismissFloatWindow();
+                        break;
+                    case TelephonyManager.CALL_STATE_RINGING:
+                        // 来电响铃：标记来电状态，更新UI并显示悬浮窗
+                        mIsCallingIn = true;
+                        updateFloatWindowUI();
+                        showFloatWindow();
+                        break;
+                    case TelephonyManager.CALL_STATE_OFFHOOK:
+                        // 通话中（接听/拨号）：更新UI并显示悬浮窗
+                        updateFloatWindowUI();
+                        showFloatWindow();
+                        break;
+                }
+            }
+        };
+
+        // 2. 注册通话监听（非空校验，避免崩溃）
+        mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+        if (mTelephonyManager != null) {
+            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+            LogUtils.d(TAG, "initPhoneStateListener: 通话状态监听注册成功");
+        } else {
+            LogUtils.e(TAG, "initPhoneStateListener: TelephonyManager获取失败，监听注册失败");
+        }
+    }
+
+    /**
+     * 初始化通话悬浮窗（配置参数+加载布局+绑定事件，适配API29-30）
+     */
+    private void initFloatWindow() {
+        // 1. 获取窗口管理器（非空校验，避免后续崩溃）
+        mWindowManager = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
+        if (mWindowManager == null) {
+            LogUtils.e(TAG, "initFloatWindow: WindowManager获取失败，悬浮窗初始化失败");
+            return;
+        }
+
+        // 2. 配置悬浮窗参数（精准适配API29+，兼容悬浮窗权限）
+        initFloatWindowParams();
+
+        // 3. 加载悬浮窗布局（添加返回键拦截，避免误关闭）
+        FrameLayout keyInterceptorLayout = new FrameLayout(this) {
+            @Override
+            public boolean dispatchKeyEvent(KeyEvent event) {
+                // 拦截返回键，保障通话时悬浮窗正常显示
+                if (event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+                    LogUtils.d(TAG, "dispatchKeyEvent: 拦截悬浮窗返回键事件");
+                    return true;
+                }
+                return super.dispatchKeyEvent(event);
+            }
+        };
+        mPhoneCallView = LayoutInflater.from(this).inflate(R.layout.view_phone_call, keyInterceptorLayout);
+
+        // 4. 绑定悬浮窗控件，设置跳转按钮事件
+        bindFloatWindowViews();
+
+        LogUtils.d(TAG, "initFloatWindow: 悬浮窗初始化完成");
+    }
+
+    /**
+     * 配置悬浮窗参数（适配API29+窗口类型，确保正常显示）
+     */
+    private void initFloatWindowParams() {
+        mWindowParams = new WindowManager.LayoutParams();
+        // 窗口位置：顶部居中
+        mWindowParams.gravity = Gravity.CENTER_HORIZONTAL | Gravity.TOP;
+        // 窗口大小：宽度全屏，高度自适应
+        mWindowParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+        mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        // 固定竖屏显示
+        mWindowParams.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+        // 窗口格式：半透明
+        mWindowParams.format = PixelFormat.TRANSLUCENT;
+
+        // 窗口类型（API29+ 强制用 TYPE_APPLICATION_OVERLAY，需悬浮窗权限）
+        if (Build.VERSION.SDK_INT >= ANDROID_10_API) {
+            mWindowParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+            LogUtils.d(TAG, "initFloatWindowParams: API29+ 悬浮窗类型=TYPE_APPLICATION_OVERLAY（需开启悬浮窗权限）");
+        } else if (Build.VERSION.SDK_INT >= ANDROID_8_API) {
+            mWindowParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+        } else {
+            mWindowParams.type = WindowManager.LayoutParams.TYPE_PHONE;
+        }
+
+        // 窗口标志：无焦点（不抢占输入）、全屏布局、兼容透明状态栏/导航栏
+        mWindowParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+			| WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+        if (Build.VERSION.SDK_INT >= ANDROID_19_API) {
+            mWindowParams.flags |= WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
+				| WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;
+        }
+    }
+
+    /**
+     * 绑定悬浮窗控件，设置跳转通话详情页事件
+     */
+    private void bindFloatWindowViews() {
+        mTvCallNumber = (TextView) mPhoneCallView.findViewById(R.id.tv_call_number);
+        mBtnOpenApp = (Button) mPhoneCallView.findViewById(R.id.btn_open_app);
+
+        // 跳转按钮点击事件
+        mBtnOpenApp.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if (TextUtils.isEmpty(mCallNumber)) {
+						LogUtils.w(TAG, "bindFloatWindowViews: 通话号码为空，跳过跳转");
+						return;
+					}
+					LogUtils.d(TAG, "bindFloatWindowViews: 点击跳转通话详情页，号码=" + mCallNumber);
+					PhoneCallService.CallType callType = mIsCallingIn ? PhoneCallService.CallType.CALL_IN : PhoneCallService.CallType.CALL_OUT;
+					PhoneCallActivity.actionStart(CallListenerService.this, mCallNumber, callType);
+				}
+			});
+    }
+
+    // ====================== 悬浮窗功能逻辑区（显示/隐藏/更新UI） ======================
+    /**
+     * 显示通话悬浮窗（避免重复添加，防止窗口泄露）
+     */
+    private void showFloatWindow() {
+        if (!mHasShown && mPhoneCallView != null && mWindowManager != null) {
+            try {
+                mWindowManager.addView(mPhoneCallView, mWindowParams);
+                mHasShown = true;
+                LogUtils.d(TAG, "showFloatWindow: 悬浮窗显示成功");
+            } catch (SecurityException e) {
+                LogUtils.e(TAG, "showFloatWindow: 悬浮窗显示失败（无悬浮窗权限，需引导用户开启）", e);
+            } catch (Exception e) {
+                LogUtils.e(TAG, "showFloatWindow: 悬浮窗显示异常", e);
+            }
+        } else {
+            LogUtils.d(TAG, "showFloatWindow: 悬浮窗已显示/组件未初始化，跳过显示");
+        }
+    }
+
+    /**
+     * 隐藏通话悬浮窗（避免重复移除，防止崩溃）
+     */
+    private void dismissFloatWindow() {
+        if (mHasShown && mPhoneCallView != null && mWindowManager != null) {
+            try {
+                mWindowManager.removeView(mPhoneCallView);
+                LogUtils.d(TAG, "dismissFloatWindow: 悬浮窗隐藏成功");
+            } catch (Exception e) {
+                LogUtils.e(TAG, "dismissFloatWindow: 悬浮窗隐藏异常", e);
+            } finally {
+                mHasShown = false;
+                mIsCallingIn = false;  // 重置来电状态标记
+            }
+        } else {
+            LogUtils.d(TAG, "dismissFloatWindow: 悬浮窗已隐藏/组件未初始化，跳过隐藏");
+        }
+    }
+
+    /**
+     * 更新悬浮窗UI（显示格式化号码+通话类型图标）
+     */
+    private void updateFloatWindowUI() {
+        if (mTvCallNumber == null || TextUtils.isEmpty(mCallNumber)) {
+            LogUtils.w(TAG, "updateFloatWindowUI: 控件未初始化/号码为空，更新失败");
+            return;
+        }
+
+        // 格式化11位手机号（3-4-4分隔，提升可读性）
+        String formattedNumber = formatPhoneNumber(mCallNumber);
+        mTvCallNumber.setText(formattedNumber);
+
+        // 设置通话类型图标（来电/去电区分）
+        int iconResId = mIsCallingIn ? R.drawable.ic_phone_call_in : R.drawable.ic_phone_call_out;
+        mTvCallNumber.setCompoundDrawablesWithIntrinsicBounds(
+			null, null, getResources().getDrawable(iconResId), null
+        );
+        LogUtils.d(TAG, "updateFloatWindowUI: 悬浮窗UI更新完成，号码=" + formattedNumber + "，类型=" + (mIsCallingIn ? "来电" : "去电"));
+    }
+
+    // ====================== 资源清理方法区（服务销毁时全量释放） ======================
+    /**
+     * 注销通话状态监听（释放TelephonyManager资源）
+     */
+    private void unregisterPhoneStateListener() {
+        if (mTelephonyManager != null && mPhoneStateListener != null) {
+            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+            LogUtils.d(TAG, "unregisterPhoneStateListener: 通话监听已注销");
+        }
+        mTelephonyManager = null;
+        mPhoneStateListener = null;
+    }
+
+    /**
+     * 清空延迟处理器（移除未执行任务，避免内存泄漏）
+     */
+    private void clearDelayHandler() {
+        if (mDelayHandler != null) {
+            mDelayHandler.removeCallbacksAndMessages(null);
+            mDelayHandler = null;
+            LogUtils.d(TAG, "clearDelayHandler: 延迟处理器已清空");
+        }
+    }
+
+    /**
+     * 置空所有成员属性（彻底释放引用，避免内存泄漏）
+     */
+    private void resetAllReferences() {
+        mCallNumber = null;
+        mPhoneCallView = null;
+        mWindowParams = null;
+        mWindowManager = null;
+        mTvCallNumber = null;
+        mBtnOpenApp = null;
+    }
+
+    // ====================== 工具方法区（通用辅助功能，独立归类） ======================
+    /**
+     * 格式化手机号（11位手机号：3-4-4分隔，非11位保持原格式）
+     * @param phoneNum 待格式化的手机号
+     * @return 格式化后的号码
+     */
+    public static String formatPhoneNumber(String phoneNum) {
+        if (!TextUtils.isEmpty(phoneNum) && phoneNum.length() == 11) {
+            String formatted = phoneNum.substring(0, 3) + "-"
+				+ phoneNum.substring(3, 7) + "-"
+				+ phoneNum.substring(7);
+            LogUtils.d(TAG, "formatPhoneNumber: 号码格式化，原=" + phoneNum + "，新=" + formatted);
+            return formatted;
+        }
+        LogUtils.d(TAG, "formatPhoneNumber: 非11位号码，无需格式化，号码=" + phoneNum);
+        return phoneNum;
+    }
+
+    /**
+     * 转换通话状态为文字描述（便于日志查看，快速定位问题）
+     * @param callState 通话状态（TelephonyManager常量）
+     * @return 状态描述文字
+     */
+    private String getCallStateDesc(int callState) {
+        switch (callState) {
+            case TelephonyManager.CALL_STATE_IDLE:
+                return "空闲（挂断/未通话）";
+            case TelephonyManager.CALL_STATE_RINGING:
+                return "响铃（来电）";
+            case TelephonyManager.CALL_STATE_OFFHOOK:
+                return "通话中（接听/拨号）";
+            default:
+                return "未知状态";
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/CallLogModel.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/CallLogModel.java
new file mode 100644
index 0000000..377fbb7
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/CallLogModel.java
@@ -0,0 +1,43 @@
+package cc.winboll.studio.contacts.model;
+
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.Date;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/26 13:10:57
+ * @Describe 通话记录数据模型
+ */
+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;
+
+        LogUtils.d(TAG, "CallLogModel: 初始化通话记录模型 | 号码=" + this.phoneNumber 
+				   + " | 状态=" + this.callStatus + " | 时间=" + this.callDate);
+    }
+
+    // ====================== Getter 方法区 ======================
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public String getCallStatus() {
+        return callStatus;
+    }
+
+    public Date getCallDate() {
+        return callDate;
+    }
+}
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/ContactModel.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/ContactModel.java
new file mode 100644
index 0000000..e83c1f7
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/ContactModel.java
@@ -0,0 +1,135 @@
+package cc.winboll.studio.contacts.model;
+
+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;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/08/30 14:32
+ * @Describe 联系人信息数据模型，支持姓名转全拼和拼音首字母
+ */
+public class ContactModel {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "ContactModel";
+    // 汉字匹配正则常量，避免重复创建
+    private static final String CHINESE_CHAR_REGEX = "[\\u4e00-\\u9fa5]";
+
+    // ====================== 成员变量区 ======================
+    private String name;
+    private String number;
+    private String pinyin;
+    private String pinyinFirstLetter;
+
+    // ====================== 构造函数区 ======================
+    public ContactModel(String name, String number) {
+        LogUtils.d(TAG, "ContactModel: 开始初始化联系人模型");
+        this.name = name == null ? "" : name;
+        // 去除号码空格，空值处理为""
+        this.number = number == null ? "" : number.replaceAll("\\s", "");
+        // 初始化拼音和拼音首字母
+        this.pinyin = convertToPinyin(this.name);
+        this.pinyinFirstLetter = convertToPinyinFirstLetter(this.name);
+
+        LogUtils.d(TAG, "ContactModel: 联系人初始化完成 | 姓名=" + this.name 
+				   + " | 号码=" + this.number + " | 全拼=" + this.pinyin 
+				   + " | 拼音首字母=" + this.pinyinFirstLetter);
+    }
+
+    // ====================== 拼音转换工具方法区 ======================
+    /**
+     * 姓名转为全拼（多音字默认取首个拼音）
+     */
+    private String convertToPinyin(String chinese) {
+        LogUtils.d(TAG, "convertToPinyin: 开始转换姓名为全拼，姓名=" + chinese);
+        HanyuPinyinOutputFormat format = getPinyinOutputFormat();
+        StringBuilder pinyinSb = new StringBuilder();
+
+        for (int i = 0; i < chinese.length(); i++) {
+            char ch = chinese.charAt(i);
+            // 仅处理汉字
+            if (Character.toString(ch).matches(CHINESE_CHAR_REGEX)) {
+                try {
+                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
+                    if (pinyinArray != null && pinyinArray.length > 0) {
+                        pinyinSb.append(pinyinArray[0]);
+                        LogUtils.v(TAG, "convertToPinyin: 字符[" + ch + "]转为拼音[" + pinyinArray[0] + "]");
+                    }
+                } catch (BadHanyuPinyinOutputFormatCombination e) {
+                    LogUtils.e(TAG, "convertToPinyin: 拼音转换异常，字符=" + ch, e);
+                }
+            } else {
+                pinyinSb.append(ch);
+                LogUtils.v(TAG, "convertToPinyin: 非汉字字符直接拼接，字符=" + ch);
+            }
+        }
+
+        String result = pinyinSb.toString();
+        LogUtils.d(TAG, "convertToPinyin: 全拼转换完成，结果=" + result);
+        return result;
+    }
+
+    /**
+     * 姓名转为拼音首字母（多音字默认取首个拼音首字母）
+     */
+    private String convertToPinyinFirstLetter(String chinese) {
+        LogUtils.d(TAG, "convertToPinyinFirstLetter: 开始转换姓名为拼音首字母，姓名=" + chinese);
+        HanyuPinyinOutputFormat format = getPinyinOutputFormat();
+        StringBuilder firstLetterSb = new StringBuilder();
+
+        for (int i = 0; i < chinese.length(); i++) {
+            char ch = chinese.charAt(i);
+            if (Character.toString(ch).matches(CHINESE_CHAR_REGEX)) {
+                try {
+                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
+                    if (pinyinArray != null && pinyinArray.length > 0) {
+                        char firstChar = pinyinArray[0].charAt(0);
+                        firstLetterSb.append(firstChar);
+                        LogUtils.v(TAG, "convertToPinyinFirstLetter: 字符[" + ch + "]转为首字母[" + firstChar + "]");
+                    }
+                } catch (BadHanyuPinyinOutputFormatCombination e) {
+                    LogUtils.e(TAG, "convertToPinyinFirstLetter: 拼音首字母转换异常，字符=" + ch, e);
+                }
+            } else {
+                firstLetterSb.append(ch);
+                LogUtils.v(TAG, "convertToPinyinFirstLetter: 非汉字字符直接拼接，字符=" + ch);
+            }
+        }
+
+        String result = firstLetterSb.toString();
+        LogUtils.d(TAG, "convertToPinyinFirstLetter: 拼音首字母转换完成，结果=" + result);
+        return result;
+    }
+
+    /**
+     * 获取统一的拼音输出格式（小写、无音调）
+     * 抽离为公共方法，避免重复创建对象
+     */
+    private HanyuPinyinOutputFormat getPinyinOutputFormat() {
+        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
+        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
+        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+        return format;
+    }
+
+    // ====================== Getter 方法区 ======================
+    public String getName() {
+        return name;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public String getPinyin() {
+        return pinyin;
+    }
+
+    public String getPinyinFirstLetter() {
+        return pinyinFirstLetter;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java
new file mode 100644
index 0000000..63b24ff
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/MainServiceBean.java
@@ -0,0 +1,91 @@
+package cc.winboll.studio.contacts.model;
+
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.IOException;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/13 07:06:13
+ * @Describe 主服务配置实体类，支持JSON序列化与反序列化
+ */
+public class MainServiceBean extends BaseBean {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "MainServiceBean";
+    private static final String JSON_KEY_IS_ENABLE = "isEnable";
+
+    // ====================== 成员变量区 ======================
+    private boolean isEnable;
+
+    // ====================== 构造函数区 ======================
+    public MainServiceBean() {
+        this.isEnable = false;
+        LogUtils.d(TAG, "MainServiceBean: 初始化实体类，默认状态为禁用");
+    }
+
+    // ====================== Getter & Setter 方法区 ======================
+    public void setIsEnable(boolean isEnable) {
+        LogUtils.d(TAG, "setIsEnable: 服务状态设置为" + isEnable);
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    // ====================== 重写 BaseBean 抽象方法区 ======================
+    @Override
+    public String getName() {
+        String className = MainServiceBean.class.getName();
+        LogUtils.v(TAG, "getName: 获取类名=" + className);
+        return className;
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        LogUtils.d(TAG, "writeThisToJsonWriter: 开始将实体类写入JSON");
+        super.writeThisToJsonWriter(jsonWriter);
+        // 写入服务启用状态字段
+        jsonWriter.name(JSON_KEY_IS_ENABLE).value(this.isEnable);
+        LogUtils.d(TAG, "writeThisToJsonWriter: JSON写入完成，isEnable=" + this.isEnable);
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        // 优先调用父类方法处理通用字段
+        if (super.initObjectsFromJsonReader(jsonReader, name)) {
+            LogUtils.v(TAG, "initObjectsFromJsonReader: 父类已处理字段=" + name);
+            return true;
+        }
+
+        // 处理当前类专属字段
+        if (JSON_KEY_IS_ENABLE.equals(name)) {
+            this.isEnable = jsonReader.nextBoolean();
+            LogUtils.d(TAG, "initObjectsFromJsonReader: 读取字段[" + name + "]值=" + this.isEnable);
+            return true;
+        }
+
+        LogUtils.w(TAG, "initObjectsFromJsonReader: 未识别字段=" + name);
+        return false;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        LogUtils.d(TAG, "readBeanFromJsonReader: 开始从JSON读取实体类数据");
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                LogUtils.w(TAG, "readBeanFromJsonReader: 跳过未识别字段=" + name);
+                jsonReader.skipValue();
+            }
+        }
+        jsonReader.endObject();
+        LogUtils.d(TAG, "readBeanFromJsonReader: JSON读取完成，当前实体状态=" + this.isEnable);
+        return this;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java
new file mode 100644
index 0000000..6d3c765
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/PhoneConnectRuleBean.java
@@ -0,0 +1,148 @@
+package cc.winboll.studio.contacts.model;
+
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.IOException;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/21 09:52:10
+ * @Describe 电话黑名单规则实体类，支持JSON序列化与反序列化
+ */
+public class PhoneConnectRuleBean extends BaseBean {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "PhoneConnectRuleModel";
+    // JSON字段名常量，避免硬编码错误
+    private static final String JSON_KEY_RULE_TEXT = "ruleText";
+    private static final String JSON_KEY_ALLOW_CONNECTION = "isAllowConnection";
+    private static final String JSON_KEY_IS_ENABLE = "isEnable";
+
+    // ====================== 成员变量区 ======================
+    private String ruleText;
+    private boolean isAllowConnection;
+    private boolean isEnable;
+    private boolean isSimpleView;
+
+    // ====================== 构造函数区 ======================
+    /**
+     * 默认构造，初始化默认值
+     */
+    public PhoneConnectRuleBean() {
+        this.ruleText = "";
+        this.isAllowConnection = false;
+        this.isEnable = false;
+        this.isSimpleView = true;
+        LogUtils.d(TAG, "PhoneConnectRuleModel: 默认构造初始化完成 | 规则文本空串，默认禁用状态");
+    }
+
+    /**
+     * 带参构造，初始化核心规则参数
+     */
+    public PhoneConnectRuleBean(String ruleText, boolean isAllowConnection, boolean isEnable) {
+        this.ruleText = ruleText == null ? "" : ruleText;
+        this.isAllowConnection = isAllowConnection;
+        this.isEnable = isEnable;
+        this.isSimpleView = true;
+        LogUtils.d(TAG, "PhoneConnectRuleModel: 带参构造初始化完成 | 规则文本=" + this.ruleText
+				   + " | 允许连接=" + this.isAllowConnection + " | 规则启用=" + this.isEnable);
+    }
+
+    // ====================== Getter & Setter 方法区 ======================
+    public String getRuleText() {
+        return ruleText;
+    }
+
+    public void setRuleText(String ruleText) {
+        String oldValue = this.ruleText;
+        this.ruleText = ruleText == null ? "" : ruleText;
+        LogUtils.d(TAG, "setRuleText: 规则文本更新 | 旧值=" + oldValue + " | 新值=" + this.ruleText);
+    }
+
+    public boolean isAllowConnection() {
+        return isAllowConnection;
+    }
+
+    public void setIsAllowConnection(boolean isAllowConnection) {
+        LogUtils.d(TAG, "setIsAllowConnection: 允许连接状态更新为" + isAllowConnection);
+        this.isAllowConnection = isAllowConnection;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        LogUtils.d(TAG, "setIsEnable: 规则启用状态更新为" + isEnable);
+        this.isEnable = isEnable;
+    }
+
+    public boolean isSimpleView() {
+        return isSimpleView;
+    }
+
+    public void setIsSimpleView(boolean isSimpleView) {
+        LogUtils.d(TAG, "setIsSimpleView: 视图模式更新 | 简洁模式=" + isSimpleView);
+        this.isSimpleView = isSimpleView;
+    }
+
+    // ====================== 重写 BaseBean 抽象方法区 ======================
+    @Override
+    public String getName() {
+        String className = PhoneConnectRuleBean.class.getName();
+        LogUtils.v(TAG, "getName: 获取当前类名=" + className);
+        return className;
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        LogUtils.d(TAG, "writeThisToJsonWriter: 开始JSON序列化规则数据");
+        super.writeThisToJsonWriter(jsonWriter);
+        // 序列化核心字段
+        jsonWriter.name(JSON_KEY_RULE_TEXT).value(getRuleText());
+        jsonWriter.name(JSON_KEY_ALLOW_CONNECTION).value(isAllowConnection());
+        jsonWriter.name(JSON_KEY_IS_ENABLE).value(isEnable());
+        LogUtils.d(TAG, "writeThisToJsonWriter: JSON序列化完成");
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        // 优先让父类处理通用字段
+        if (super.initObjectsFromJsonReader(jsonReader, name)) {
+            LogUtils.v(TAG, "initObjectsFromJsonReader: 父类已处理字段=" + name);
+            return true;
+        }
+
+        // 处理当前类专属字段
+        if (JSON_KEY_RULE_TEXT.equals(name)) {
+            setRuleText(jsonReader.nextString());
+        } else if (JSON_KEY_ALLOW_CONNECTION.equals(name)) {
+            setIsAllowConnection(jsonReader.nextBoolean());
+        } else if (JSON_KEY_IS_ENABLE.equals(name)) {
+            setIsEnable(jsonReader.nextBoolean());
+        } else {
+            LogUtils.w(TAG, "initObjectsFromJsonReader: 未识别的JSON字段=" + name);
+            return false;
+        }
+        LogUtils.v(TAG, "initObjectsFromJsonReader: 成功解析字段=" + name);
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        LogUtils.d(TAG, "readBeanFromJsonReader: 开始从JSON解析规则数据");
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String fieldName = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, fieldName)) {
+                LogUtils.w(TAG, "readBeanFromJsonReader: 跳过未识别字段=" + fieldName);
+                jsonReader.skipValue();
+            }
+        }
+        jsonReader.endObject();
+        LogUtils.d(TAG, "readBeanFromJsonReader: JSON解析完成 | 解析后规则=" + getRuleText());
+        return this;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java
new file mode 100644
index 0000000..ab633ed
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/RingTongBean.java
@@ -0,0 +1,107 @@
+package cc.winboll.studio.contacts.model;
+
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.IOException;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/24 18:47:11
+ * @Describe 手机铃声设置参数类，支持JSON序列化与反序列化
+ */
+public class RingTongBean extends BaseBean {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "AudioRingTongBean";
+    private static final String JSON_KEY_STREAM_VOLUME = "streamVolume";
+    // 铃声音量范围常量（参考AudioManager标准）
+    private static final int VOLUME_MIN = 0;
+    private static final int VOLUME_MAX = 100;
+
+    // ====================== 成员变量区 ======================
+    private int streamVolume;
+
+    // ====================== 构造函数区 ======================
+    /**
+     * 默认构造，铃声音量初始化为最大值
+     */
+    public RingTongBean() {
+        this.streamVolume = VOLUME_MAX;
+        LogUtils.d(TAG, "RingTongBean: 默认构造初始化 | 铃声音量=" + this.streamVolume);
+    }
+
+    /**
+     * 带参构造，初始化指定铃声音量
+     */
+    public RingTongBean(int streamVolume) {
+        // 音量值范围校验，避免非法值
+        this.streamVolume = Math.max(VOLUME_MIN, Math.min(VOLUME_MAX, streamVolume));
+        LogUtils.d(TAG, "RingTongBean: 带参构造初始化 | 原始音量=" + streamVolume + " | 校正后=" + this.streamVolume);
+    }
+
+    // ====================== Getter & Setter 方法区 ======================
+    public int getStreamVolume() {
+        return streamVolume;
+    }
+
+    public void setStreamVolume(int streamVolume) {
+        int oldVolume = this.streamVolume;
+        // 音量值范围校验
+        this.streamVolume = Math.max(VOLUME_MIN, Math.min(VOLUME_MAX, streamVolume));
+        LogUtils.d(TAG, "setStreamVolume: 铃声音量更新 | 旧值=" + oldVolume + " | 新值=" + this.streamVolume);
+    }
+
+    // ====================== 重写 BaseBean 抽象方法区 ======================
+    @Override
+    public String getName() {
+        String className = RingTongBean.class.getName();
+        LogUtils.v(TAG, "getName: 获取当前类名=" + className);
+        return className;
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        LogUtils.d(TAG, "writeThisToJsonWriter: 开始JSON序列化铃声音量参数");
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name(JSON_KEY_STREAM_VOLUME).value(getStreamVolume());
+        LogUtils.d(TAG, "writeThisToJsonWriter: JSON序列化完成 | 音量值=" + getStreamVolume());
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        // 优先调用父类处理通用字段
+        if (super.initObjectsFromJsonReader(jsonReader, name)) {
+            LogUtils.v(TAG, "initObjectsFromJsonReader: 父类已处理字段=" + name);
+            return true;
+        }
+
+        // 处理当前类专属字段
+        if (JSON_KEY_STREAM_VOLUME.equals(name)) {
+            setStreamVolume(jsonReader.nextInt());
+            LogUtils.v(TAG, "initObjectsFromJsonReader: 解析字段[" + name + "]值=" + this.streamVolume);
+            return true;
+        }
+
+        LogUtils.w(TAG, "initObjectsFromJsonReader: 未识别的JSON字段=" + name);
+        return false;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        LogUtils.d(TAG, "readBeanFromJsonReader: 开始从JSON解析铃声音量参数");
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String fieldName = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, fieldName)) {
+                LogUtils.w(TAG, "readBeanFromJsonReader: 跳过未识别字段=" + fieldName);
+                jsonReader.skipValue();
+            }
+        }
+        jsonReader.endObject();
+        LogUtils.d(TAG, "readBeanFromJsonReader: JSON解析完成 | 最终音量值=" + this.streamVolume);
+        return this;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java
new file mode 100644
index 0000000..2b40c8c
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/model/SettingsBean.java
@@ -0,0 +1,216 @@
+package cc.winboll.studio.contacts.model;
+
+import android.util.JsonReader;
+import android.util.JsonWriter;
+
+import java.io.IOException;
+
+import cc.winboll.studio.contacts.utils.IntUtils;
+import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/02 19:51:40
+ * @Describe 应用设置数据模型，支持云盾防御配置与JSON序列化
+ */
+public class SettingsBean extends BaseBean {
+
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "SettingsModel";
+    // 数值范围常量
+    public static final int MAX_INTRANGE = 666666;
+    public static final int MIN_INTRANGE = 1;
+    // JSON字段名常量，消除硬编码
+    private static final String JSON_KEY_DUN_TOTAL = "dunTotalCount";
+    private static final String JSON_KEY_DUN_CURRENT = "dunCurrentCount";
+    private static final String JSON_KEY_DUN_RESUME_SECOND = "dunResumeSecondCount";
+    private static final String JSON_KEY_DUN_RESUME_COUNT = "dunResumeCount";
+    private static final String JSON_KEY_DUN_ENABLE = "isEnableDun";
+    private static final String JSON_KEY_URL = "szBoBullToon_URL";
+
+    // ====================== 成员变量区 ======================
+    // 云盾防御层数量
+    private int dunTotalCount;
+    // 当前云盾防御层
+    private int dunCurrentCount;
+    // 防御层恢复时间间隔(秒钟)
+    private int dunResumeSecondCount;
+    // 每次恢复防御层数
+    private int dunResumeCount;
+    // 是否启用云盾
+    private boolean isEnableDun;
+    // BoBullToon 应用模块数据请求地址
+    private String szBoBullToon_URL;
+
+    // ====================== 构造函数区 ======================
+    /**
+     * 默认构造，初始化默认配置
+     */
+    public SettingsBean() {
+        this.dunTotalCount = 6;
+        this.dunCurrentCount = 6;
+        this.dunResumeSecondCount = 60;
+        this.dunResumeCount = 1;
+        this.isEnableDun = false;
+        this.szBoBullToon_URL = "";
+        LogUtils.d(TAG, "SettingsModel: 默认构造初始化完成 | 云盾默认配置加载完毕");
+    }
+
+    /**
+     * 带参构造，初始化自定义配置并校验数值范围
+     */
+    public SettingsBean(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount,
+                         int dunResumeCount, boolean isEnableDun, String szBoBullToon_URL) {
+        this.dunTotalCount = getSettingsModelRangeInt(dunTotalCount);
+        this.dunCurrentCount = getSettingsModelRangeInt(dunCurrentCount);
+        this.dunResumeSecondCount = getSettingsModelRangeInt(dunResumeSecondCount);
+        this.dunResumeCount = getSettingsModelRangeInt(dunResumeCount);
+        this.isEnableDun = isEnableDun;
+        this.szBoBullToon_URL = szBoBullToon_URL == null ? "" : szBoBullToon_URL;
+
+        LogUtils.d(TAG, "SettingsModel: 带参构造初始化完成 | 总层数=" + this.dunTotalCount
+				   + " | 当前层数=" + this.dunCurrentCount + " | 恢复间隔=" + this.dunResumeSecondCount
+				   + " | 恢复层数=" + this.dunResumeCount + " | 云盾启用=" + this.isEnableDun);
+    }
+
+    // ====================== 私有工具方法区 ======================
+    /**
+     * 数值范围校验，确保参数在 MIN~MAX 区间内
+     */
+    private int getSettingsModelRangeInt(int origin) {
+        int result = IntUtils.getIntInRange(origin, MIN_INTRANGE, MAX_INTRANGE);
+        if (result != origin) {
+            LogUtils.w(TAG, "getSettingsModelRangeInt: 数值校正 | 原始值=" + origin + " | 校正后=" + result);
+        }
+        return result;
+    }
+
+    // ====================== Getter & Setter 方法区 ======================
+    public int getDunTotalCount() {
+        return dunTotalCount;
+    }
+
+    public void setDunTotalCount(int dunTotalCount) {
+        int oldValue = this.dunTotalCount;
+        this.dunTotalCount = getSettingsModelRangeInt(dunTotalCount);
+        LogUtils.d(TAG, "setDunTotalCount: 总防御层数更新 | 旧值=" + oldValue + " | 新值=" + this.dunTotalCount);
+    }
+
+    public int getDunCurrentCount() {
+        return dunCurrentCount;
+    }
+
+    public void setDunCurrentCount(int dunCurrentCount) {
+        int oldValue = this.dunCurrentCount;
+        this.dunCurrentCount = getSettingsModelRangeInt(dunCurrentCount);
+        LogUtils.d(TAG, "setDunCurrentCount: 当前防御层数更新 | 旧值=" + oldValue + " | 新值=" + this.dunCurrentCount);
+    }
+
+    public int getDunResumeSecondCount() {
+        return dunResumeSecondCount;
+    }
+
+    public void setDunResumeSecondCount(int dunResumeSecondCount) {
+        int oldValue = this.dunResumeSecondCount;
+        this.dunResumeSecondCount = getSettingsModelRangeInt(dunResumeSecondCount);
+        LogUtils.d(TAG, "setDunResumeSecondCount: 恢复间隔更新 | 旧值=" + oldValue + " | 新值=" + this.dunResumeSecondCount);
+    }
+
+    public int getDunResumeCount() {
+        return dunResumeCount;
+    }
+
+    public void setDunResumeCount(int dunResumeCount) {
+        int oldValue = this.dunResumeCount;
+        this.dunResumeCount = getSettingsModelRangeInt(dunResumeCount);
+        LogUtils.d(TAG, "setDunResumeCount: 恢复层数更新 | 旧值=" + oldValue + " | 新值=" + this.dunResumeCount);
+    }
+
+    public boolean isEnableDun() {
+        return isEnableDun;
+    }
+
+    public void setIsEnableDun(boolean isEnableDun) {
+        LogUtils.d(TAG, "setIsEnableDun: 云盾启用状态更新为" + isEnableDun);
+        this.isEnableDun = isEnableDun;
+    }
+
+    public String getBoBullToon_URL() {
+        return szBoBullToon_URL;
+    }
+
+    public void setBoBullToon_URL(String boBullToon_URL) {
+        String oldValue = this.szBoBullToon_URL;
+        this.szBoBullToon_URL = boBullToon_URL == null ? "" : boBullToon_URL;
+        LogUtils.d(TAG, "setBoBullToon_URL: 请求地址更新 | 旧值=" + oldValue + " | 新值=" + this.szBoBullToon_URL);
+    }
+
+    // ====================== 重写 BaseBean 抽象方法区 ======================
+    @Override
+    public String getName() {
+        String className = SettingsBean.class.getName();
+        LogUtils.v(TAG, "getName: 获取当前类名=" + className);
+        return className;
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        LogUtils.d(TAG, "writeThisToJsonWriter: 开始JSON序列化设置数据");
+        super.writeThisToJsonWriter(jsonWriter);
+        // 写入所有配置字段
+        jsonWriter.name(JSON_KEY_DUN_TOTAL).value(getDunTotalCount());
+        jsonWriter.name(JSON_KEY_DUN_CURRENT).value(getDunCurrentCount());
+        jsonWriter.name(JSON_KEY_DUN_RESUME_SECOND).value(getDunResumeSecondCount());
+        jsonWriter.name(JSON_KEY_DUN_RESUME_COUNT).value(getDunResumeCount());
+        jsonWriter.name(JSON_KEY_DUN_ENABLE).value(isEnableDun());
+        jsonWriter.name(JSON_KEY_URL).value(getBoBullToon_URL());
+        LogUtils.d(TAG, "writeThisToJsonWriter: JSON序列化完成");
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        // 优先调用父类处理通用字段
+        if (super.initObjectsFromJsonReader(jsonReader, name)) {
+            LogUtils.v(TAG, "initObjectsFromJsonReader: 父类已处理字段=" + name);
+            return true;
+        }
+
+        // 处理当前类专属配置字段
+        if (JSON_KEY_DUN_TOTAL.equals(name)) {
+            setDunTotalCount(getSettingsModelRangeInt(jsonReader.nextInt()));
+        } else if (JSON_KEY_DUN_CURRENT.equals(name)) {
+            setDunCurrentCount(getSettingsModelRangeInt(jsonReader.nextInt()));
+        } else if (JSON_KEY_DUN_RESUME_SECOND.equals(name)) {
+            setDunResumeSecondCount(getSettingsModelRangeInt(jsonReader.nextInt()));
+        } else if (JSON_KEY_DUN_RESUME_COUNT.equals(name)) {
+            setDunResumeCount(getSettingsModelRangeInt(jsonReader.nextInt()));
+        } else if (JSON_KEY_DUN_ENABLE.equals(name)) {
+            setIsEnableDun(jsonReader.nextBoolean());
+        } else if (JSON_KEY_URL.equals(name)) {
+            setBoBullToon_URL(jsonReader.nextString());
+        } else {
+            LogUtils.w(TAG, "initObjectsFromJsonReader: 未识别的JSON字段=" + name);
+            return false;
+        }
+        LogUtils.v(TAG, "initObjectsFromJsonReader: 成功解析字段=" + name);
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        LogUtils.d(TAG, "readBeanFromJsonReader: 开始从JSON解析设置数据");
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String fieldName = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, fieldName)) {
+                LogUtils.w(TAG, "readBeanFromJsonReader: 跳过未识别字段=" + fieldName);
+                jsonReader.skipValue();
+            }
+        }
+        jsonReader.endObject();
+        LogUtils.d(TAG, "readBeanFromJsonReader: JSON解析完成 | 云盾配置加载完毕");
+        return this;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallActivity.java
new file mode 100644
index 0000000..4da49e7
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallActivity.java
@@ -0,0 +1,362 @@
+package cc.winboll.studio.contacts.phonecallui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.contacts.ActivityStack;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import static cc.winboll.studio.contacts.listenphonecall.CallListenerService.formatPhoneNumber;
+
+/**
+ * @Author aJIEw, ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/14 21:01
+ * @Describe 接打电话界面（单例模式 + 适配API29 - 30 + 小米机型兼容性优化）
+ * 功能：单例通话窗口、来电/去电显示、通话计时、免提控制、锁屏显示
+ */
+public class PhoneCallActivity extends Activity implements View.OnClickListener {
+    // 常量定义区（核心常量+小米适配标识）
+    public static final String TAG = "PhoneCallActivity";
+    private static final int MSG_CLOSE_ACTIVITY = 0x001;
+    private static final String MI_ADAPT_TAG = "MiAdapt";
+    private static final String TOAST_CALLING = "通话进行中，无法重复创建通话窗口";
+    private static final long CLOSE_DELAY_MS = 100; // 小米机型关闭延迟时间
+
+    // 静态属性区（单例核心+全局工具对象）
+    private static volatile boolean sIsActivityAlive = false;
+    private static Handler sCloseHandler;
+
+    // 控件属性区（按界面布局顺序排列）
+    private TextView mTvCallNumberLabel;
+    private TextView mTvCallNumber;
+    private TextView mTvPickUp;
+    private TextView mTvCallingTime;
+    private TextView mTvHangUp;
+
+    // 业务属性区（按依赖优先级排列）
+    private PhoneCallManager mPhoneCallManager;
+    private PhoneCallService.CallType mCallType;
+    private String mPhoneNumber;
+    private Timer mOnGoingCallTimer;
+    private int mCallingTime;
+    private boolean isClosing = false; // 新增：避免重复关闭页面
+
+    // 对外静态接口（单例启动+外部关闭）
+    public static void actionStart(Context context, String phoneNumber, PhoneCallService.CallType callType) {
+        if (context == null || phoneNumber == null || callType == null) {
+            LogUtils.e(TAG, "actionStart: 入参为空，启动失败");
+            return;
+        }
+
+        if (sIsActivityAlive) {
+            LogUtils.w(TAG, MI_ADAPT_TAG + " 已有活跃通话窗口，拒绝重复启动");
+            Toast.makeText(context, TOAST_CALLING, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 启动通话界面，号码=" + phoneNumber + "，类型=" + callType.name());
+        Intent intent = new Intent(context, PhoneCallActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        intent.putExtra("call_type", callType);
+        intent.putExtra(Intent.EXTRA_PHONE_NUMBER, phoneNumber);
+        context.startActivity(intent);
+    }
+
+    public static void closePhoneCallActivity() {
+        LogUtils.d(TAG, "closePhoneCallActivity: 收到外部关闭指令");
+        if (sIsActivityAlive && sCloseHandler != null) {
+            sCloseHandler.sendEmptyMessage(MSG_CLOSE_ACTIVITY);
+            LogUtils.d(TAG, "closePhoneCallActivity: 关闭消息已发送");
+        } else {
+            LogUtils.w(TAG, "closePhoneCallActivity: 页面已销毁或Handler未初始化，关闭跳过");
+        }
+    }
+
+    // 生命周期方法区（按执行流程排序）
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 通话界面开始创建，SDK版本=" + Build.VERSION.SDK_INT);
+
+        // 单例双重校验，防止异常场景多实例
+        if (sIsActivityAlive) {
+            Toast.makeText(this, TOAST_CALLING, Toast.LENGTH_SHORT).show();
+            LogUtils.w(TAG, MI_ADAPT_TAG + " 拦截重复创建，即将关闭当前实例");
+            finish();
+            return;
+        }
+        sIsActivityAlive = false;
+
+        setContentView(R.layout.activity_phone_call);
+        ActivityStack.getInstance().addActivity(this);
+        adaptLockScreenAndXiaomi();
+        initHandler();
+        initData();
+        initView();
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 通话界面创建完成");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 通话界面开始销毁");
+
+        sIsActivityAlive = false;
+        isClosing = false;
+        stopTimer();
+        // 销毁通话管理器
+        if (mPhoneCallManager != null) {
+            mPhoneCallManager.destroy();
+            mPhoneCallManager = null;
+            LogUtils.d(TAG, "销毁通话管理器资源");
+        }
+        // 销毁Handler避免内存泄漏
+        if (sCloseHandler != null) {
+            sCloseHandler.removeCallbacksAndMessages(null);
+            sCloseHandler = null;
+            LogUtils.d(TAG, "销毁关闭Handler");
+        }
+        ActivityStack.getInstance().removeActivity(this);
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 通话界面销毁完成");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (isFinishing()) {
+            sIsActivityAlive = false;
+            LogUtils.d(TAG, MI_ADAPT_TAG + " 页面即将关闭，重置单例标记");
+        }
+    }
+
+    // 点击事件回调
+    @Override
+    public void onClick(View v) {
+        if (v == null) {
+            LogUtils.w(TAG, "onClick: 点击控件为空，忽略操作");
+            return;
+        }
+        switch (v.getId()) {
+            case R.id.tv_phone_pick_up:
+                LogUtils.d(TAG, "onClick: 触发接听操作");
+                answerCall();
+                break;
+            case R.id.tv_phone_hang_up:
+                LogUtils.d(TAG, "onClick: 触发挂断操作，当前通话时长=" + mCallingTime + "秒");
+                hangUpCall();
+                break;
+            default:
+                LogUtils.w(TAG, "onClick: 未知点击事件，控件ID=" + v.getId());
+        }
+    }
+
+    // 初始化方法区（按初始化顺序排列）
+    private void initHandler() {
+        sCloseHandler = new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                if (msg.what == MSG_CLOSE_ACTIVITY) {
+                    LogUtils.d(TAG, "handleMessage: 收到关闭消息，执行挂断逻辑");
+                    hangUpCall();
+                }
+            }
+        };
+        LogUtils.d(TAG, "initHandler: 关闭Handler初始化完成");
+    }
+
+    private void initData() {
+        LogUtils.d(TAG, "initData: 开始初始化业务数据");
+        mPhoneCallManager = PhoneCallManager.getInstance(this);
+        Intent intent = getIntent();
+
+        if (intent == null) {
+            LogUtils.e(TAG, "initData: 启动Intent为空，终止初始化");
+            removeFromRecentsAndFinish();
+            return;
+        }
+
+        mPhoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
+        mCallType = (PhoneCallService.CallType) intent.getSerializableExtra("call_type");
+        if (mPhoneNumber == null || mCallType == null) {
+            LogUtils.e(TAG, "initData: 通话号码或类型解析失败");
+            removeFromRecentsAndFinish();
+            return;
+        }
+
+        mOnGoingCallTimer = new Timer();
+        mCallingTime = 0;
+        LogUtils.d(TAG, "initData: 业务数据初始化完成，号码=" + mPhoneNumber);
+    }
+
+    private void initView() {
+        LogUtils.d(TAG, "initView: 开始初始化界面控件");
+        // 修复沉浸式导航栏语法，适配小米全面屏
+        int uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+			| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+			| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+			| View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
+        getWindow().getDecorView().setSystemUiVisibility(uiOptions);
+
+        // 绑定控件
+        mTvCallNumberLabel = findViewById(R.id.tv_call_number_label);
+        mTvCallNumber = findViewById(R.id.tv_call_number);
+        mTvPickUp = findViewById(R.id.tv_phone_pick_up);
+        mTvCallingTime = findViewById(R.id.tv_phone_calling_time);
+        mTvHangUp = findViewById(R.id.tv_phone_hang_up);
+
+        // 设置控件属性
+        mTvCallNumber.setText(formatPhoneNumber(mPhoneNumber));
+        mTvPickUp.setOnClickListener(this);
+        mTvHangUp.setOnClickListener(this);
+
+        // 区分来电/去电UI样式
+        if (PhoneCallService.CallType.CALL_IN == mCallType) {
+            mTvCallNumberLabel.setText("来电号码");
+            mTvPickUp.setVisibility(View.VISIBLE);
+            mTvCallingTime.setVisibility(View.GONE);
+        } else if (PhoneCallService.CallType.CALL_OUT == mCallType) {
+            mTvCallNumberLabel.setText("呼叫号码");
+            mTvPickUp.setVisibility(View.GONE);
+            mTvCallingTime.setVisibility(View.VISIBLE);
+            mTvCallingTime.setText("通话中：00:00");
+            if (mPhoneCallManager != null) {
+                mPhoneCallManager.openSpeaker();
+                LogUtils.d(TAG, MI_ADAPT_TAG + " 去电模式自动开启免提");
+            }
+            startCallTimer();
+        }
+        LogUtils.d(TAG, "initView: 界面控件初始化完成");
+    }
+
+    // 小米机型专属适配方法
+    private void adaptLockScreenAndXiaomi() {
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 执行锁屏适配逻辑");
+        Window window = getWindow();
+        if (window == null) {
+            LogUtils.e(TAG, MI_ADAPT_TAG + " Window对象为空，适配失败");
+            return;
+        }
+
+        int flags = WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+			| WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+			| WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
+
+        // 小米机型额外添加解锁屏标志，解决MIUI锁屏拦截问题
+        if (Build.MANUFACTURER.equalsIgnoreCase("Xiaomi")) {
+            flags |= WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+            LogUtils.d(TAG, MI_ADAPT_TAG + " 已添加小米机型专属锁屏适配标志");
+        }
+        window.addFlags(flags);
+
+        // 适配API29+锁屏新接口
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            setShowWhenLocked(true);
+            setTurnScreenOn(true);
+            LogUtils.d(TAG, MI_ADAPT_TAG + " 适配API29+锁屏接口完成");
+        }
+    }
+
+    // 通话核心业务方法
+    private void answerCall() {
+        LogUtils.d(TAG, "answerCall: 执行接听操作");
+        if (mPhoneCallManager == null) {
+            LogUtils.e(TAG, "answerCall: 通话管理器为空，接听失败");
+            return;
+        }
+        mPhoneCallManager.answer();
+        mTvPickUp.setVisibility(View.GONE);
+        mTvCallingTime.setVisibility(View.VISIBLE);
+        mTvCallingTime.setText("通话中：00:00");
+        startCallTimer();
+        LogUtils.d(TAG, "answerCall: 接听操作完成，启动通话计时");
+    }
+
+    private void hangUpCall() {
+        if (isClosing) {
+            LogUtils.w(TAG, "hangUpCall: 挂断操作已执行，无需重复调用");
+            return;
+        }
+        LogUtils.d(TAG, "hangUpCall: 执行挂断操作，当前时长=" + mCallingTime + "秒");
+        isClosing = true;
+        stopTimer();
+        if (mPhoneCallManager != null) {
+            mPhoneCallManager.disconnect();
+            LogUtils.d(TAG, "hangUpCall: 通话连接已断开");
+        }
+        // 延迟关闭页面，适配小米机型通话时序
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					removeFromRecentsAndFinish();
+				}
+			}, CLOSE_DELAY_MS);
+    }
+
+    // 任务栈清理方法
+    private void removeFromRecentsAndFinish() {
+        if (isFinishing()) {
+            LogUtils.d(TAG, "removeFromRecentsAndFinish: 页面已在关闭中，无需重复操作");
+            return;
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            finishAndRemoveTask();
+            LogUtils.d(TAG, MI_ADAPT_TAG + " 移除任务栈并关闭页面");
+        } else {
+            finish();
+            LogUtils.d(TAG, "兼容低版本，关闭页面");
+        }
+    }
+
+    // 计时工具方法
+    private void startCallTimer() {
+        LogUtils.d(TAG, "startCallTimer: 启动通话计时器");
+        if (mOnGoingCallTimer == null) {
+            mOnGoingCallTimer = new Timer();
+        }
+        mOnGoingCallTimer.schedule(new TimerTask() {
+				@Override
+				public void run() {
+					runOnUiThread(new Runnable() {
+							@Override
+							public void run() {
+								mCallingTime++;
+								mTvCallingTime.setText("通话中：" + formatCallingTime(mCallingTime));
+							}
+						});
+				}
+			}, 0, 1000);
+    }
+
+    private void stopTimer() {
+        LogUtils.d(TAG, "stopTimer: 停止通话计时器");
+        if (mOnGoingCallTimer != null) {
+            mOnGoingCallTimer.cancel();
+            mOnGoingCallTimer = null;
+        }
+        mCallingTime = 0;
+    }
+
+    // 辅助工具方法：格式化通话时长
+    private String formatCallingTime(int seconds) {
+        int minute = seconds / 60;
+        int second = seconds % 60;
+        String minuteStr = minute < 10 ? "0" + minute : String.valueOf(minute);
+        String secondStr = second < 10 ? "0" + second : String.valueOf(second);
+        return minuteStr + ":" + secondStr;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallManager.java b/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallManager.java
new file mode 100644
index 0000000..9307cdf
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallManager.java
@@ -0,0 +1,204 @@
+package cc.winboll.studio.contacts.phonecallui;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.os.Build;
+import android.telecom.Call;
+import android.telecom.VideoProfile;
+import androidx.annotation.RequiresApi;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/15 20:11
+ * @Describe 通话核心管理类
+ * 功能：接听/挂断通话、免提控制、资源释放，适配API29-30及小米机型
+ */
+@RequiresApi(api = Build.VERSION_CODES.Q) // 匹配目标适配区间API29
+public class PhoneCallManager {
+    // 常量定义区
+    public static final String TAG = "PhoneCallManager";
+    private static final String MI_ADAPT_TAG = "MiDeviceAdapt"; // 小米适配标识
+    private static final int VIDEO_PROFILE_AUDIO_ONLY = VideoProfile.STATE_AUDIO_ONLY;
+    private static final int AUDIO_MODE_BACKUP = -1; // 音频模式备份默认值
+
+    // 成员属性区（按依赖优先级排序，移除静态call避免跨组件冲突）
+    private Context mContext;
+    private AudioManager mAudioManager;
+    private int mAudioModeBackup; // 备份原始音频模式，避免影响其他应用
+    private boolean mIsSpeakerOpened; // 免提状态标记，防止重复切换
+
+    // 构造方法（单例化改造，避免多实例冲突）
+    private static volatile PhoneCallManager sInstance;
+    public static PhoneCallManager getInstance(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "getInstance: 上下文为空，初始化失败");
+            return null;
+        }
+        if (sInstance == null) {
+            synchronized (PhoneCallManager.class) {
+                if (sInstance == null) {
+                    sInstance = new PhoneCallManager(context.getApplicationContext()); // 用应用上下文，避免内存泄漏
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    // 私有构造，禁止外部实例化
+    private PhoneCallManager(Context context) {
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 初始化通话管理类");
+        this.mContext = context;
+        this.mAudioModeBackup = AUDIO_MODE_BACKUP;
+        this.mIsSpeakerOpened = false;
+        initAudioManager();
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 通话管理类初始化完成");
+    }
+
+    // 初始化辅助方法
+    private void initAudioManager() {
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        if (mAudioManager != null) {
+            // 备份原始音频模式（小米机型切换后需恢复，避免外放异常）
+            mAudioModeBackup = mAudioManager.getMode();
+            LogUtils.d(TAG, "音频管理器初始化成功，原始模式备份：" + mAudioModeBackup);
+        } else {
+            LogUtils.e(TAG, "音频管理器初始化失败，将影响通话音频控制");
+        }
+    }
+
+    // 核心业务方法（按使用场景排序，强化小米适配+容错）
+    /**
+     * 接听电话，默认音频通话模式
+     */
+    public void answer() {
+        LogUtils.d(TAG, "执行接听通话操作");
+        // 从PhoneCallService的静态管理器获取通话对象，统一数据源
+        Call currentCall = PhoneCallService.PhoneCallManager.call;
+        if (currentCall == null) {
+            LogUtils.e(TAG, "接听失败：通话对象为空");
+            return;
+        }
+
+        // 校验通话状态，避免重复接听（小米机型状态变更延迟）
+        if (currentCall.getState() != Call.STATE_RINGING) {
+            LogUtils.w(TAG, MI_ADAPT_TAG + " 非响铃状态，无需接听，当前状态：" + currentCall.getState());
+            return;
+        }
+
+        try {
+            currentCall.answer(VIDEO_PROFILE_AUDIO_ONLY);
+            openSpeaker(); // 接听后自动开免提
+            LogUtils.d(TAG, "通话接听成功，自动开启免提");
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, MI_ADAPT_TAG + " 接听权限不足（需android.permission.ANSWER_PHONE_CALLS）", e);
+        } catch (IllegalStateException e) {
+            LogUtils.e(TAG, MI_ADAPT_TAG + " 通话状态异常，无法接听", e);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "接听通话异常", e);
+        }
+    }
+
+    /**
+     * 断开通话（支持来电拒接、通话中挂断）
+     */
+    public void disconnect() {
+        LogUtils.d(TAG, "执行断开通话操作");
+        Call currentCall = PhoneCallService.PhoneCallManager.call;
+        if (currentCall == null) {
+            LogUtils.e(TAG, "挂断失败：通话对象为空");
+            return;
+        }
+
+        // 校验通话状态，避免重复挂断
+        if (currentCall.getState() == Call.STATE_DISCONNECTED) {
+            LogUtils.w(TAG, MI_ADAPT_TAG + " 通话已断开，无需重复操作");
+            return;
+        }
+
+        try {
+            currentCall.disconnect();
+            closeSpeaker(); // 挂断后关闭免提+恢复音频模式
+            LogUtils.d(TAG, "通话断开成功");
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, MI_ADAPT_TAG + " 挂断权限不足（需android.permission.CALL_PHONE）", e);
+        } catch (IllegalStateException e) {
+            LogUtils.e(TAG, MI_ADAPT_TAG + " 通话状态异常，无法挂断", e);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "断开通话异常", e);
+        }
+    }
+
+    /**
+     * 打开免提，适配小米机型音频通道切换（解决MIUI音频混乱）
+     */
+    public void openSpeaker() {
+        LogUtils.d(TAG, "执行打开免提操作");
+        if (mAudioManager == null) {
+            LogUtils.e(TAG, "打开免提失败：音频管理器未初始化");
+            return;
+        }
+        if (mIsSpeakerOpened) {
+            LogUtils.w(TAG, "免提已开启，无需重复操作");
+            return;
+        }
+
+        try {
+            // 小米机型适配步骤：1. 设置通话模式 2. 关闭静音 3. 开启免提（固定顺序）
+            mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+            mAudioManager.setStreamMute(AudioManager.STREAM_VOICE_CALL, false); // 确保通话音频不静音
+            mAudioManager.setSpeakerphoneOn(true);
+
+            mIsSpeakerOpened = true;
+            LogUtils.d(TAG, MI_ADAPT_TAG + " 免提开启成功，当前模式：" + mAudioManager.getMode());
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, MI_ADAPT_TAG + " 音频控制权限不足", e);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "打开免提异常", e);
+        }
+    }
+
+    /**
+     * 新增：关闭免提（挂断/切换场景调用，修复小米音频残留）
+     */
+    public void closeSpeaker() {
+        LogUtils.d(TAG, "执行关闭免提操作");
+        if (mAudioManager == null || !mIsSpeakerOpened) {
+            LogUtils.w(TAG, "免提未开启或音频管理器为空，无需操作");
+            return;
+        }
+
+        try {
+            mAudioManager.setSpeakerphoneOn(false);
+            // 恢复原始音频模式（关键：小米机型不恢复会导致其他应用外放异常）
+            if (mAudioModeBackup != AUDIO_MODE_BACKUP) {
+                mAudioManager.setMode(mAudioModeBackup);
+                LogUtils.d(TAG, MI_ADAPT_TAG + " 恢复原始音频模式：" + mAudioModeBackup);
+            }
+            mIsSpeakerOpened = false;
+            LogUtils.d(TAG, "免提关闭成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, MI_ADAPT_TAG + " 关闭免提异常", e);
+        }
+    }
+
+    /**
+     * 销毁资源，避免内存泄漏+音频残留（适配小米内存管理）
+     */
+    public void destroy() {
+        LogUtils.d(TAG, "开始销毁通话管理资源");
+        closeSpeaker(); // 销毁前强制关闭免提+恢复音频模式
+        // 释放资源（应用上下文无需主动置空，避免空指针）
+        mAudioManager = null;
+        sInstance = null; // 单例置空，下次重新初始化
+        LogUtils.d(TAG, MI_ADAPT_TAG + " 通话管理资源销毁完成");
+    }
+
+    /**
+     * 新增：获取当前免提状态（供UI层同步显示）
+     */
+    public boolean isSpeakerOpened() {
+        return mIsSpeakerOpened;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallService.java b/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallService.java
new file mode 100644
index 0000000..e5beede
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/phonecallui/PhoneCallService.java
@@ -0,0 +1,284 @@
+package cc.winboll.studio.contacts.phonecallui;
+
+import android.media.AudioManager;
+import android.telecom.Call;
+import android.telecom.InCallService;
+import android.telephony.TelephonyManager;
+import androidx.annotation.RequiresApi;
+import cc.winboll.studio.contacts.ActivityStack;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.fragments.CallLogFragment;
+import cc.winboll.studio.contacts.model.RingTongBean;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * 监听电话通信状态的服务，实现该类的同时必须提供电话管理的 UI
+ * @author aJIEw, ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @see PhoneCallActivity
+ * @see android.telecom.InCallService
+ * 适配：Java7 语法 + Android API29 - 30 | 移除录音功能 | 强化小米设备稳定性与容错性
+ */
+@RequiresApi(api = 29)
+public class PhoneCallService extends InCallService {
+    // 常量定义区
+    public static final String TAG = "PhoneCallService";
+    // 小米设备适配标识，便于日志区分
+    private static final String MI_DEVICE_TAG = "MiDeviceAdapt";
+
+    // 成员属性区（按依赖顺序排列）
+    private Call.Callback mCallCallback;
+    private AudioManager mAudioManager;
+
+    // 内部枚举类（通话类型定义）
+    public enum CallType {
+        CALL_IN,  // 来电
+        CALL_OUT  // 去电
+		}
+
+    // Service生命周期方法区（按执行流程排序）
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, MI_DEVICE_TAG + " 通话监听服务启动");
+        initAudioManager();
+        initCallCallback();
+        LogUtils.d(TAG, MI_DEVICE_TAG + " 服务初始化完成");
+    }
+
+    @Override
+    public void onCallAdded(Call call) {
+        super.onCallAdded(call);
+        LogUtils.d(TAG, "检测到新通话");
+        if (call == null) {
+            LogUtils.e(TAG, "通话对象为空，跳过处理");
+            return;
+        }
+
+        // 双重校验回调，避免重复注册
+        if (mCallCallback != null) {
+            call.registerCallback(mCallCallback);
+        }
+        // 绑定通话对象到管理器，供UI层调用
+        PhoneCallManager.call = call;
+        LogUtils.d(TAG, MI_DEVICE_TAG + " 通话回调注册成功，对象绑定完成");
+
+        CallType callType = judgeCallType(call);
+        if (callType != null) {
+            handleValidCall(call, callType);
+        } else {
+            LogUtils.w(TAG, "无法识别通话类型，状态码：" + call.getState());
+        }
+    }
+
+    @Override
+    public void onCallRemoved(Call call) {
+        super.onCallRemoved(call);
+        LogUtils.d(TAG, "通话结束，开始清理资源");
+        if (call != null && mCallCallback != null) {
+            call.unregisterCallback(mCallCallback);
+            LogUtils.d(TAG, "通话回调已注销");
+        }
+
+        // 延迟置空通话对象，避免UI层挂断时对象已被释放（适配小米机型时序）
+        new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						// 延迟200ms，确保PhoneCallActivity挂断逻辑执行完成
+						Thread.sleep(200);
+						PhoneCallManager.call = null;
+					} catch (InterruptedException e) {
+						LogUtils.e(TAG, MI_DEVICE_TAG + " 延迟置空通话对象异常", e);
+					}
+				}
+			}).start();
+
+        PhoneCallActivity.closePhoneCallActivity();
+        LogUtils.d(TAG, MI_DEVICE_TAG + " 通话资源清理完成");
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "服务开始销毁");
+        CallLogFragment.updateCallLogFragment();
+        // 释放资源，适配小米设备内存管理，避免内存泄漏
+        mCallCallback = null;
+        mAudioManager = null;
+        LogUtils.d(TAG, MI_DEVICE_TAG + " 服务销毁完成");
+    }
+
+    // 初始化方法区
+    private void initAudioManager() {
+        mAudioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
+        if (mAudioManager == null) {
+            LogUtils.e(TAG, MI_DEVICE_TAG + " 获取音频管理器失败");
+        } else {
+            LogUtils.d(TAG, MI_DEVICE_TAG + " 音频管理器初始化成功");
+        }
+    }
+
+    private void initCallCallback() {
+        mCallCallback = new Call.Callback() {
+            @Override
+            public void onStateChanged(Call call, int state) {
+                super.onStateChanged(call, state);
+                if (call == null) {
+                    LogUtils.e(TAG, "onStateChanged: 通话对象为空");
+                    return;
+                }
+                String stateDesc = getCallStateDesc(state);
+                LogUtils.d(TAG, "通话状态变更：" + stateDesc + "（状态码：" + state + "）");
+
+                switch (state) {
+                    case Call.STATE_DISCONNECTED:
+                        // 双重校验，避免重复关闭页面
+                        if (ActivityStack.getInstance().getActivity(PhoneCallActivity.class) != null) {
+                            ActivityStack.getInstance().finishActivity(PhoneCallActivity.class);
+                            LogUtils.d(TAG, "通话界面已关闭");
+                        }
+                        break;
+                    case Call.STATE_ACTIVE:
+                        LogUtils.d(TAG, MI_DEVICE_TAG + " 通话进入活跃状态，适配音频通道");
+                        break;
+                    default:
+                        break;
+                }
+            }
+        };
+        LogUtils.d(TAG, "通话状态回调初始化完成");
+    }
+
+    // 核心业务处理方法区
+    private CallType judgeCallType(Call call) {
+        if (call == null) {
+            LogUtils.e(TAG, "judgeCallType: 通话对象为空");
+            return null;
+        }
+        int callState = call.getState();
+        if (callState == Call.STATE_RINGING) {
+            LogUtils.d(TAG, "识别为来电");
+            return CallType.CALL_IN;
+        } else if (callState == Call.STATE_CONNECTING) {
+            LogUtils.d(TAG, "识别为去电");
+            return CallType.CALL_OUT;
+        }
+        return null;
+    }
+
+    private boolean handleValidCall(Call call, CallType callType) {
+        if (call == null || callType == null) {
+            LogUtils.e(TAG, "handleValidCall: 通话对象或类型为空");
+            return false;
+        }
+
+        Call.Details callDetails = call.getDetails();
+        if (callDetails == null || callDetails.getHandle() == null) {
+            LogUtils.e(TAG, "通话详情缺失，处理终止");
+            return false;
+        }
+
+        String phoneNumber = callDetails.getHandle().getSchemeSpecificPart();
+        LogUtils.d(TAG, "处理通话：号码=" + phoneNumber + "，类型=" + callType.name());
+
+        if (mAudioManager == null) {
+            LogUtils.e(TAG, "音频管理器未初始化");
+            PhoneCallActivity.actionStart(this, phoneNumber, callType);
+            return true;
+        }
+
+        if (checkRulesAndHandleRingerVolumeControl(phoneNumber, call)) {
+            PhoneCallActivity.actionStart(this, phoneNumber, callType);
+            LogUtils.d(TAG, MI_DEVICE_TAG + " 通话界面启动成功");
+            return true;
+        }
+        return false;
+    }
+
+    private boolean checkRulesAndHandleRingerVolumeControl(String phoneNumber, Call call) {
+        if (mAudioManager == null || phoneNumber == null || call == null) {
+            LogUtils.e(TAG, "checkRulesAndHandleRingerVolumeControl: 入参为空");
+            return false;
+        }
+
+        int currentVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_RING);
+        LogUtils.d(TAG, "当前铃声音量：" + currentVolume);
+
+        RingTongBean ringTongBean = RingTongBean.loadBean(this, RingTongBean.class);
+        if (ringTongBean == null) {
+            ringTongBean = new RingTongBean();
+            RingTongBean.saveBean(this, ringTongBean);
+            LogUtils.d(TAG, "初始化默认铃音配置");
+        }
+        final int configVolume = ringTongBean.getStreamVolume();
+
+        try {
+            // 小米机型适配：调整音量时添加权限校验
+            if (currentVolume != configVolume) {
+                mAudioManager.setStreamVolume(AudioManager.STREAM_RING, configVolume, 0);
+                LogUtils.d(TAG, MI_DEVICE_TAG + " 铃声音量调整为配置值：" + configVolume);
+            }
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, "音量调整失败，权限不足", e);
+            return false;
+        }
+
+        // 校验拦截规则
+        if (!Rules.getInstance(this).isAllowed(phoneNumber)) {
+            LogUtils.d(TAG, "号码" + phoneNumber + "命中拦截规则");
+            try {
+                // 拦截时静音并挂断
+                mAudioManager.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
+                call.disconnect();
+                LogUtils.d(TAG, MI_DEVICE_TAG + " 拦截通话已挂断并静音");
+
+                // 延迟恢复音量，适配小米机型音频通道延迟
+                new Thread(new Runnable() {
+						@Override
+						public void run() {
+							try {
+								Thread.sleep(500);
+								if (mAudioManager != null) {
+									mAudioManager.setStreamVolume(AudioManager.STREAM_RING, configVolume, 0);
+									LogUtils.d(TAG, MI_DEVICE_TAG + " 延迟恢复铃音配置");
+								}
+							} catch (InterruptedException e) {
+								LogUtils.e(TAG, "恢复音量线程中断", e);
+							}
+						}
+					}).start();
+            } catch (SecurityException e) {
+                LogUtils.e(TAG, "拦截静音失败", e);
+                return false;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    // 辅助工具方法区：解析通话状态描述
+    private String getCallStateDesc(int state) {
+        switch (state) {
+            case TelephonyManager.CALL_STATE_RINGING:
+                return "响铃中";
+            case TelephonyManager.CALL_STATE_OFFHOOK:
+                return "通话中";
+            case TelephonyManager.CALL_STATE_IDLE:
+                return "空闲";
+            case Call.STATE_ACTIVE:
+                return "通话活跃";
+            case Call.STATE_CONNECTING:
+                return "连接中";
+            case Call.STATE_DISCONNECTED:
+                return "已断开";
+            default:
+                return "未知状态";
+        }
+    }
+
+    // 静态内部类：统一管理通话对象，避免跨组件对象混乱
+    public static class PhoneCallManager {
+        public static Call call;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java
new file mode 100644
index 0000000..e135fa5
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java
@@ -0,0 +1,98 @@
+package cc.winboll.studio.contacts.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import cc.winboll.studio.contacts.services.MainService;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.lang.ref.WeakReference;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/13 06:58:04
+ * @Describe 主要广播接收器，监听系统开机广播并自动启动主服务
+ */
+public class MainReceiver extends BroadcastReceiver {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "MainReceiver";
+    // 监听的系统广播 Action
+    private static final String ACTION_BOOT_COMPLETED = "android.intent.action.BOOT_COMPLETED";
+
+    // ====================== 成员变量区 ======================
+    // 使用弱引用关联 MainService，避免内存泄漏
+    private WeakReference<MainService> mMainServiceWeakRef;
+
+    // ====================== 构造函数区 ======================
+    public MainReceiver(MainService service) {
+        this.mMainServiceWeakRef = new WeakReference<>(service);
+        LogUtils.d(TAG, "MainReceiver: 初始化完成，已关联 MainService 实例");
+    }
+
+    // ====================== 重写 BroadcastReceiver 核心方法 ======================
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        // 空值校验，避免空指针异常
+        if (context == null) {
+            LogUtils.e(TAG, "onReceive: Context 为 null，无法处理广播");
+            return;
+        }
+        if (intent == null || intent.getAction() == null) {
+            LogUtils.w(TAG, "onReceive: 接收到空 Intent 或空 Action");
+            return;
+        }
+
+        String action = intent.getAction();
+        LogUtils.d(TAG, "onReceive: 接收到广播 | Action=" + action);
+
+        // 处理开机完成广播
+        if (ACTION_BOOT_COMPLETED.equals(action)) {
+            LogUtils.i(TAG, "onReceive: 监听到开机完成广播，自动启动 MainService");
+            ToastUtils.show("设备开机，启动拨号主服务");
+            MainService.startMainService(context);
+        } else {
+            LogUtils.i(TAG, "onReceive: 接收到未处理的广播 | Action=" + action);
+            ToastUtils.show("收到广播：" + action);
+        }
+    }
+
+    // ====================== 广播注册/注销方法区 ======================
+    /**
+     * 注册广播接收器，监听指定系统广播
+     * @param context 上下文对象
+     */
+    public void registerAction(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "registerAction: Context 为 null，注册失败");
+            return;
+        }
+
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(ACTION_BOOT_COMPLETED);
+        // 可按需添加其他监听的 Action
+        // intentFilter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
+
+        context.registerReceiver(this, intentFilter);
+        LogUtils.d(TAG, "registerAction: 广播接收器注册成功 | 监听 Action=" + ACTION_BOOT_COMPLETED);
+    }
+
+    /**
+     * 注销广播接收器，释放资源（解决 mMainReceiver.unregisterAction(this) 调用缺失问题）
+     * @param context 上下文对象
+     */
+    public void unregisterAction(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "unregisterAction: Context 为 null，注销失败");
+            return;
+        }
+
+        try {
+            context.unregisterReceiver(this);
+            LogUtils.d(TAG, "unregisterAction: 广播接收器注销成功");
+        } catch (IllegalArgumentException e) {
+            LogUtils.w(TAG, "unregisterAction: 广播接收器未注册，无需注销", e);
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java b/contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java
new file mode 100644
index 0000000..efb2ced
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java
@@ -0,0 +1,251 @@
+package cc.winboll.studio.contacts.services;
+
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Binder;
+import android.os.IBinder;
+import cc.winboll.studio.contacts.model.MainServiceBean;
+import cc.winboll.studio.contacts.utils.NotificationManagerUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/14 03:38:31
+ * @Describe 守护进程服务，用于监控并保活主服务 MainService
+ * 适配 Android 12+ 后台服务启动限制，支持前台服务运行
+ * 兼容 Java 7 语法 & 低版本 SDK 编译
+ * 移除无关的 microphone 类型配置，修复前台服务类型不匹配崩溃
+ */
+public class AssistantService extends Service {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "AssistantService";
+    // 前台服务通知配置
+    private static final String FOREGROUND_CHANNEL_ID = "assistant_service_foreground_channel";
+    private static final int FOREGROUND_NOTIFICATION_ID = 1002;
+    // 修复：前台服务类型改为 dataSync(0x00000001)，与 Manifest 保持一致，移除 microphone 类型
+    private static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 0x00000001;
+    // Android 版本常量硬编码（Java 7 兼容）
+    private static final int ANDROID_8_API = 26;      // 通知渠道最低版本
+    private static final int ANDROID_10_API = 29;     // 前台服务类型最低支持版本
+    private static final int ANDROID_12_API = 31;     // 后台启动限制最低版本
+    // 重试延迟时间（避免频繁触发后台启动限制）
+    private static final long RETRY_DELAY_MS = 3000L;
+
+    // ====================== 成员变量区 ======================
+    private MainServiceBean mMainServiceBean;
+    private MyServiceConnection mMyServiceConnection;
+    private MainService mMainService;
+    private boolean mIsBound = false;
+    private volatile boolean mIsThreadAlive = false;
+
+    // ====================== Binder 内部类 ======================
+    /**
+     * 对外暴露服务实例的 Binder
+     */
+    public class MyBinder extends Binder {
+        public AssistantService getService() {
+            LogUtils.d(TAG, "MyBinder.getService: 获取 AssistantService 实例");
+            return AssistantService.this;
+        }
+    }
+
+    // ====================== ServiceConnection 内部类 ======================
+    /**
+     * 主服务连接状态监听回调
+     */
+    private class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            if (service == null) {
+                LogUtils.w(TAG, "MyServiceConnection.onServiceConnected: 绑定的 IBinder 为 null");
+                mIsBound = false;
+                return;
+            }
+
+            try {
+                MainService.MyBinder binder = (MainService.MyBinder) service;
+                mMainService = binder.getService();
+                mIsBound = true;
+                LogUtils.d(TAG, "MyServiceConnection.onServiceConnected: 主服务绑定成功 | MainService=" + mMainService);
+            } catch (ClassCastException e) {
+                LogUtils.e(TAG, "MyServiceConnection.onServiceConnected: IBinder 类型转换失败", e);
+                mIsBound = false;
+            }
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            LogUtils.w(TAG, "MyServiceConnection.onServiceDisconnected: 主服务连接断开");
+            mMainService = null;
+            mIsBound = false;
+
+            // 尝试重新绑定主服务（如果配置为启用）
+            reloadMainServiceConfig();
+            if (mMainServiceBean != null && mMainServiceBean.isEnable()) {
+                LogUtils.d(TAG, "MyServiceConnection.onServiceDisconnected: 延迟重试绑定主服务");
+                wakeupAndBindMain();
+            }
+        }
+    }
+
+    // ====================== 对外方法区 ======================
+    /**
+     * 设置线程存活状态
+     */
+    public synchronized void setIsThreadAlive(boolean isThreadAlive) {
+        this.mIsThreadAlive = isThreadAlive;
+        LogUtils.d(TAG, "setIsThreadAlive: 线程存活状态变更 | " + isThreadAlive);
+    }
+
+    /**
+     * 获取线程存活状态
+     */
+    public boolean isThreadAlive() {
+        return mIsThreadAlive;
+    }
+
+    // ====================== 前台服务辅助方法 ======================
+    /**
+     * 创建前台服务通知（Android 8.0+ 必须配置渠道）
+     */
+//    private Notification createForegroundNotification() {
+//        // 1. 创建通知渠道（API 26+ 必需）
+//        if (Build.VERSION.SDK_INT >= ANDROID_8_API) {
+//            NotificationChannel channel = new NotificationChannel(
+//				FOREGROUND_CHANNEL_ID,
+//				"守护服务",
+//				NotificationManager.IMPORTANCE_LOW
+//            );
+//            channel.setDescription("守护服务后台运行，保障主服务存活");
+//            // 空指针防护
+//            NotificationManager manager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+//            if (manager != null) {
+//                manager.createNotificationChannel(channel);
+//                LogUtils.d(TAG, "createForegroundNotification: 通知渠道创建成功");
+//            }
+//        }
+//
+//        // 2. 构建通知（Java 7 分步设置，取消链式调用简化）
+//        Notification.Builder builder;
+//        if (Build.VERSION.SDK_INT >= ANDROID_8_API) {
+//            builder = new Notification.Builder(this, FOREGROUND_CHANNEL_ID);
+//        } else {
+//            builder = new Notification.Builder(this);
+//        }
+//        builder.setSmallIcon(R.drawable.ic_launcher);
+//        builder.setContentTitle("守护服务运行中");
+//        builder.setContentText("正在监控主服务状态");
+//        builder.setPriority(Notification.PRIORITY_LOW);
+//        builder.setOngoing(true); // 不可手动取消
+//
+//        return builder.build();
+//    }
+
+    // ====================== Service 生命周期方法区 ======================
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate: 守护服务创建");
+
+        // 初始化主服务连接回调
+        if (mMyServiceConnection == null) {
+            mMyServiceConnection = new MyServiceConnection();
+            LogUtils.d(TAG, "onCreate: 初始化 MyServiceConnection 完成");
+        }
+
+        // 初始化运行状态
+        setIsThreadAlive(false);
+        // 启动守护逻辑
+        assistantService();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        LogUtils.d(TAG, "onBind: 服务被绑定 | Intent=" + intent);
+        return new MyBinder();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand: 服务被启动 | startId=" + startId);
+        // 每次启动都执行守护逻辑，确保主服务存活
+        assistantService();
+        // START_STICKY：服务被杀死后系统尝试重启
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy: 守护服务销毁");
+
+        // 停止线程并解除主服务绑定
+        setIsThreadAlive(false);
+        if (mIsBound && mMyServiceConnection != null) {
+            try {
+                unbindService(mMyServiceConnection);
+                LogUtils.d(TAG, "onDestroy: 解除主服务绑定成功");
+            } catch (IllegalArgumentException e) {
+                LogUtils.w(TAG, "onDestroy: 解除绑定失败，服务未绑定", e);
+            }
+            mIsBound = false;
+        }
+        mMainService = null;
+    }
+
+    // ====================== 核心守护逻辑方法区 ======================
+    /**
+     * 守护服务核心逻辑：检查配置并保活主服务
+     */
+    private void assistantService() {
+        LogUtils.d(TAG, "assistantService: 执行守护逻辑");
+
+        // 加载主服务配置
+        reloadMainServiceConfig();
+        if (mMainServiceBean == null) {
+            LogUtils.e(TAG, "assistantService: 主服务配置加载失败，终止守护逻辑");
+            return;
+        }
+
+        LogUtils.d(TAG, "assistantService: 主服务启用状态 | " + mMainServiceBean.isEnable());
+        // 配置启用且线程未存活时，唤醒并绑定主服务
+        if (mMainServiceBean.isEnable() && !isThreadAlive()) {
+            setIsThreadAlive(true);
+            wakeupAndBindMain();
+        } else if (!mMainServiceBean.isEnable()) {
+            setIsThreadAlive(false);
+            LogUtils.d(TAG, "assistantService: 主服务已禁用，停止保活");
+        }
+    }
+
+    /**
+     * 唤醒并绑定主服务 MainService（适配后台启动限制）
+     */
+    private void wakeupAndBindMain() {
+        if (mMyServiceConnection == null) {
+            LogUtils.e(TAG, "wakeupAndBindMain: MyServiceConnection 未初始化，绑定失败");
+            return;
+        }
+
+        Intent intent = new Intent(this, MainService.class);
+        // 根据应用前后台状态选择启动方式（Android 12+ 后台用 startForegroundService）
+        startForegroundService(intent);
+
+        // BIND_IMPORTANT：提高绑定优先级，主服务被杀时会回调断开
+        bindService(intent, mMyServiceConnection, Context.BIND_IMPORTANT);
+        LogUtils.d(TAG, "wakeupAndBindMain: 已启动并绑定主服务 MainService");
+    }
+
+    // ====================== 辅助方法区 ======================
+    /**
+     * 重新加载主服务配置
+     */
+    private void reloadMainServiceConfig() {
+        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        LogUtils.d(TAG, "reloadMainServiceConfig: 主服务配置重新加载完成 | " + mMainServiceBean);
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/services/LimitedTimeSpecialChannelService.java b/contacts/src/main/java/cc/winboll/studio/contacts/services/LimitedTimeSpecialChannelService.java
new file mode 100644
index 0000000..aa62f02
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/LimitedTimeSpecialChannelService.java
@@ -0,0 +1,327 @@
+package cc.winboll.studio.contacts.services;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/18 15:00:00 (GMT+8)
+ * @LastEditTime 2026/04/22 17:20:00 (GMT+8)
+ * @Describe 限时特殊通道服务
+ * 提供安全的服务启动、令牌校验及循环任务管理
+ * 新增功能：
+ * 1. 计时过程中实时输出剩余秒数
+ * 2. 服务销毁前，发送本地广播通知应用内其他组件，并携带剩余秒数信息
+ * 3. 每秒发送一次倒计时状态的本地广播
+ */
+public class LimitedTimeSpecialChannelService extends Service {
+
+    // ========================= 常量定义 =========================
+    public static final String TAG = "LimitedTimeSpecialChannelService";
+    public static final String EXTRA_DELAY_MILLIS = "EXTRA_DELAY_MILLIS";
+    private static final String EXTRA_SECURITY_TOKEN = "EXTRA_SECURITY_TOKEN";
+
+    // 本地广播 Action 常量
+    public static final String ACTION_SERVICE_DESTROYED = "cc.winboll.studio.contacts.services.ACTION_SERVICE_DESTROYED";
+
+    // 倒计时心跳广播 Action
+    public static final String ACTION_COUNTDOWN_TICK = "cc.winboll.studio.contacts.services.ACTION_COUNTDOWN_TICK";
+    // 广播携带的额外参数：剩余秒数
+    public static final String EXTRA_REMAINING_SECONDS = "EXTRA_REMAINING_SECONDS";
+    // 广播携带的额外参数：总定时秒数
+    public static final String EXTRA_TOTAL_SECONDS = "EXTRA_TOTAL_SECONDS";
+
+    // ========================= 静态变量 =========================
+    /**
+     * 公共静态私有字段：安全校验令牌
+     * 确保全局可访问且值不可变更
+     */
+    public static final String mValidToken = "VALID_TOKEN_" + System.currentTimeMillis();
+
+    private static volatile LimitedTimeSpecialChannelService sInstance = null;
+    private static volatile boolean sIsServiceRunning = false;
+
+    // ========================= 成员变量 =========================
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+    private long mTotalMillis = 0;      // 总定时时长
+    private long mRemainingMillis = 0;  // 剩余时长
+    private LocalBroadcastManager mLocalBroadcastManager; // 本地广播管理器实例
+
+    // ========================= 公共静态方法 =========================
+    /**
+     * 公共静态方法：启动服务
+     * @param context 上下文
+     * @param delayMillis 定时时长（毫秒）
+     */
+    public static void startService(Context context, long delayMillis) {
+        LogUtils.i(TAG, "调用静态入口方法 startService");
+        LogUtils.i(TAG, "入参 - context: " + context + ", delayMillis: " + delayMillis);
+
+        if (context == null) {
+            LogUtils.w(TAG, "启动失败，上下文为null");
+            return;
+        }
+        if (isServiceRunning()) {
+            LogUtils.i(TAG, "服务已运行，忽略重复启动请求");
+            return;
+        }
+
+        // 构建Intent传递参数
+        Intent intent = new Intent(context, LimitedTimeSpecialChannelService.class);
+        intent.putExtra(EXTRA_SECURITY_TOKEN, mValidToken);
+        intent.putExtra(EXTRA_DELAY_MILLIS, delayMillis);
+
+        context.startService(intent);
+        LogUtils.i(TAG, "服务启动命令已发出");
+    }
+
+    /**
+     * 公共静态方法：停止服务
+     * @param context 上下文
+     */
+    public static void stopService(Context context) {
+        LogUtils.i(TAG, "调用静态入口方法 stopService");
+        LogUtils.i(TAG, "入参 - context: " + context);
+
+        if (context == null) {
+            LogUtils.w(TAG, "停止失败，上下文为null");
+            return;
+        }
+        Intent intent = new Intent(context, LimitedTimeSpecialChannelService.class);
+        context.stopService(intent);
+        LogUtils.i(TAG, "服务停止命令已发出");
+    }
+
+    /**
+     * 公共静态方法：查询服务运行状态
+     * @return true if running
+     */
+    public static boolean isServiceRunning() {
+        return sIsServiceRunning;
+    }
+
+    /**
+     * 【核心单元测试方法】
+     * 执行完整的单元测试流程
+     * @param context 上下文
+     */
+    public static void unitTest(Context context) {
+        LogUtils.i(TAG, "=== 开始执行单元测试 ===");
+
+        // 测试1: 初始状态应为未运行
+        boolean initialState = isServiceRunning();
+        LogUtils.i(TAG, "测试1 - 初始状态检查: " + (initialState ? "失败(不应运行)" : "成功(未运行)"));
+
+        // 启动服务，设置5秒定时
+        startService(context, 5000L);
+
+        // 核心修复：同步等待服务启动完成
+        try {
+            Thread.sleep(1200);
+        } catch (InterruptedException e) {
+            LogUtils.e(TAG, "单元测试等待被中断", e);
+        }
+
+        // 测试3: 验证服务已启动
+        boolean runningState = isServiceRunning();
+        LogUtils.i(TAG, "测试3 - 运行状态检查: " + (runningState ? "成功(运行中)" : "失败(未运行)"));
+
+        // 测试4: 尝试重复启动
+        LogUtils.i(TAG, "测试4 - 尝试重复启动(预期忽略)");
+        startService(context, 5000L);
+
+        // 测试5: 等待服务自动停止
+        LogUtils.i(TAG, "测试5 - 等待服务自动停止(5秒)...");
+        try {
+            // 等待超过服务的5秒运行时间，确保能观测到销毁状态
+            Thread.sleep(6000);
+        } catch (InterruptedException e) {
+            LogUtils.e(TAG, "测试等待被中断", e);
+        }
+
+        // 验证最终状态
+        boolean finalState = isServiceRunning();
+        LogUtils.i(TAG, "测试5 - 最终状态检查: " + (!finalState ? "成功(已销毁)" : "失败(仍运行)"));
+        LogUtils.i(TAG, "=== 单元测试执行完成 ===");
+    }
+
+    // ========================= 生命周期 =========================
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.i(TAG, "服务 onCreate，创建实例");
+        sInstance = this;
+        sIsServiceRunning = true;
+
+        // 初始化本地广播管理器
+        mLocalBroadcastManager = LocalBroadcastManager.getInstance(this);
+        LogUtils.i(TAG, "本地广播管理器初始化完成");
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.i(TAG, "服务 onStartCommand，处理启动请求");
+        LogUtils.i(TAG, "入参 - intent: " + intent + ", flags: " + flags + ", startId: " + startId);
+
+        if (!isValidToken(intent)) {
+            LogUtils.w(TAG, "安全校验失败，拒绝启动服务");
+            stopSelf();
+            return START_NOT_STICKY;
+        }
+
+        long delayMillis = intent.getLongExtra(EXTRA_DELAY_MILLIS, 0);
+        if (delayMillis <= 0) {
+            LogUtils.w(TAG, "无效的定时时长: " + delayMillis + "，服务将退出");
+            stopSelf();
+            return START_NOT_STICKY;
+        }
+
+        // 初始化总时长和剩余时长
+        mTotalMillis = delayMillis;
+        mRemainingMillis = delayMillis;
+        LogUtils.i(TAG, "初始化定时时长: " + (mTotalMillis / 1000) + " 秒");
+
+        startLoopTask();
+        // 设置自动停止定时器
+        mHandler.postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					LogUtils.i(TAG, "定时时长结束，准备停止服务");
+					stopSelf();
+				}
+			}, delayMillis);
+
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        LogUtils.i(TAG, "服务 onDestroy，准备销毁");
+
+        // 发送本地广播，通知应用内其他组件服务即将销毁
+        // 此处携带剩余秒数信息，方便接收端知晓具体的结束状态
+        sendServiceDestroyedBroadcast();
+
+        // 重置运行状态
+        sIsServiceRunning = false;
+        sInstance = null;
+
+        // 清理所有回调
+        mHandler.removeCallbacksAndMessages(null);
+
+        // 执行父类销毁
+        super.onDestroy();
+
+        LogUtils.i(TAG, "服务销毁流程完成");
+    }
+
+    /**
+     * 发送服务销毁的本地广播
+     * 确保应用内所有注册了该广播接收器的组件都能收到通知
+     * [新增] 携带当前剩余秒数信息
+     */
+    private void sendServiceDestroyedBroadcast() {
+        LogUtils.i(TAG, "准备发送服务销毁本地广播");
+        try {
+            Intent intent = new Intent(ACTION_SERVICE_DESTROYED);
+            // 新增：将当前剩余秒数放入广播附加数据中
+            intent.putExtra(EXTRA_REMAINING_SECONDS, mRemainingMillis / 1000);
+
+            mLocalBroadcastManager.sendBroadcast(intent);
+            LogUtils.i(TAG, "服务销毁广播发送成功，Action: " + ACTION_SERVICE_DESTROYED);
+            LogUtils.i(TAG, "广播附加数据 - 剩余秒数: " + (mRemainingMillis / 1000));
+        } catch (Exception e) {
+            LogUtils.e(TAG, "发送服务销毁广播失败", e);
+        }
+    }
+
+    /**
+     * 发送倒计时心跳的本地广播
+     * 每秒执行一次，携带当前剩余秒数和总时长
+     */
+    private void sendCountdownTickBroadcast() {
+        try {
+            Intent intent = new Intent(ACTION_COUNTDOWN_TICK);
+            intent.putExtra(EXTRA_REMAINING_SECONDS, mRemainingMillis / 1000);
+            intent.putExtra(EXTRA_TOTAL_SECONDS, mTotalMillis / 1000);
+
+            mLocalBroadcastManager.sendBroadcast(intent);
+            // 日志已精简，只在关键节点打印
+        } catch (Exception e) {
+            LogUtils.e(TAG, "发送倒计时广播失败", e);
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        LogUtils.i(TAG, "服务 onBind，不支持绑定操作");
+        // 不支持绑定
+        return null;
+    }
+
+    // ========================= 私有辅助方法 =========================
+    /**
+     * 校验令牌有效性
+     */
+    private boolean isValidToken(Intent intent) {
+        LogUtils.i(TAG, "调用 isValidToken 方法进行安全校验");
+        LogUtils.i(TAG, "入参 - intent: " + intent);
+
+        if (intent == null) {
+            return false;
+        }
+        String incomingToken = intent.getStringExtra(EXTRA_SECURITY_TOKEN);
+        LogUtils.i(TAG, "接收到外部传入令牌: " + incomingToken);
+        LogUtils.i(TAG, "本地校验令牌: " + mValidToken);
+        return mValidToken.equals(incomingToken);
+    }
+
+    /**
+     * 启动循环任务
+     */
+    private void startLoopTask() {
+        LogUtils.i(TAG, "启动倒计时循环任务");
+        mHandler.removeCallbacks(mLoopTaskRunnable);
+        mHandler.postDelayed(mLoopTaskRunnable, 1000);
+    }
+
+    /**
+     * 循环任务心跳
+     * 核心逻辑：先递减时长，再发送广播，确保0秒能被正确发送
+     */
+    private final Runnable mLoopTaskRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (sIsServiceRunning) {
+                // 核心修复：先递减剩余时长
+                if (mRemainingMillis >= 1000) {
+                    mRemainingMillis -= 1000;
+                } else {
+                    // 兜底：防止负数，直接置为0
+                    mRemainingMillis = 0;
+                }
+
+                // 计算并发送当前剩余秒数
+                long remainingSeconds = mRemainingMillis / 1000;
+                // 日志已精简，只在非0状态打印，避免日志刷屏
+                if (remainingSeconds > 0) {
+                    LogUtils.i(TAG, "循环心跳：剩余 " + remainingSeconds + " 秒");
+                }
+
+                // 发送倒计时广播
+                sendCountdownTickBroadcast();
+
+                // 递归调用，形成循环
+                startLoopTask();
+            }
+        }
+    };
+
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java
new file mode 100644
index 0000000..1b7d469
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java
@@ -0,0 +1,593 @@
+package cc.winboll.studio.contacts.services;
+
+import android.app.ActivityManager;
+import android.app.Notification;
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.media.AudioManager;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import cc.winboll.studio.contacts.bobulltoon.TomCat;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.handlers.MainServiceHandler;
+import cc.winboll.studio.contacts.listenphonecall.CallListenerService;
+import cc.winboll.studio.contacts.model.MainServiceBean;
+import cc.winboll.studio.contacts.model.RingTongBean;
+import cc.winboll.studio.contacts.receivers.MainReceiver;
+import cc.winboll.studio.contacts.utils.NotificationManagerUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/13 06:56:41
+ * @Describe 拨号主服务，负责核心业务逻辑、守护进程绑定、铃声音量监控及通话监听启动
+ * 严格适配 Android API 30 + Java 7 语法规范 | 解决前台服务启动超时崩溃
+ * 核心优化：1. 移除延迟启动逻辑 2. 标准化日志管理 3. 强化资源清理 4. 结构分层重构
+ */
+public class MainService extends Service {
+
+    // ====================== 常量定义区（全硬编码，无高版本API依赖） ======================
+    public static final String TAG = "MainService";
+    public static final int MSG_UPDATE_STATUS = 0;
+
+    // 铃声音量监控参数（定时检查+恢复）
+    private static final long VOLUME_CHECK_DELAY = 1000L;    // 首次检查延迟1s
+    private static final long VOLUME_CHECK_PERIOD = 60000L; // 后续每60s检查一次
+
+    // 前台服务配置（固定ID+渠道，避免重复创建）
+    private static final String FOREGROUND_CHANNEL_ID = "main_service_foreground_channel";
+    private static final int FOREGROUND_NOTIFICATION_ID = 1001;
+    private static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 0x00000001; // dataSync类型硬编码
+
+    // Android版本常量（替代Build.VERSION_CODES，适配Java7）
+    private static final int ANDROID_8_API = 26;  // Android 8.0
+    private static final int ANDROID_10_API = 29; // Android 10
+    private static final int ANDROID_12_API = 31; // Android 12
+
+    // 守护服务重绑定延迟（仅保留核心重试逻辑）
+    private static final long RETRY_DELAY_MS = 3000L;
+
+    // ====================== 静态成员属性区（全局共享实例，统一前缀s） ======================
+    private static MainService sMainServiceInstance;    // 主服务全局实例
+    private static volatile TomCat sTomCatInstance;     // 号码识别核心实例（volatile保证可见性）
+
+    // ====================== 成员属性区（业务+UI+资源，统一前缀m） ======================
+    private volatile boolean mIsServiceRunning;         // 服务运行状态标记（volatile防指令重排）
+    private MainServiceBean mMainServiceBean;           // 服务配置实体（启用状态存储）
+    private MainServiceHandler mMainServiceHandler;     // 服务消息处理器（主线程通信）
+    private MyServiceConnection mServiceConnection;     // 守护服务连接实例
+    private AssistantService mAssistantService;         // 绑定的守护服务实例
+    private boolean mIsAssistantBound;                  // 守护服务绑定状态标记
+    private MainReceiver mMainReceiver;                 // 全局广播接收器（监听系统事件）
+    private Timer mVolumeCheckTimer;                    // 铃声音量检查定时器（定时恢复配置）
+
+    // ====================== 内部类：Binder（服务绑定通信，优先定义） ======================
+    public class MyBinder extends Binder {
+        /**
+         * 外部组件绑定服务时，获取主服务实例
+         * @return MainService 主服务实例
+         */
+        public MainService getService() {
+            LogUtils.d(TAG, "MyBinder.getService: 外部获取主服务实例");
+            return MainService.this;
+        }
+    }
+
+    // ====================== 内部类：ServiceConnection（守护服务绑定回调） ======================
+    private class MyServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            if (service == null) {
+                LogUtils.w(TAG, "MyServiceConnection.onServiceConnected: 绑定的IBinder为空，绑定失败");
+                mIsAssistantBound = false;
+                return;
+            }
+
+            try {
+                // 类型转换获取守护服务实例
+                AssistantService.MyBinder binder = (AssistantService.MyBinder) service;
+                mAssistantService = binder.getService();
+                mIsAssistantBound = true;
+                LogUtils.d(TAG, "MyServiceConnection.onServiceConnected: 守护服务绑定成功");
+            } catch (ClassCastException e) {
+                LogUtils.e(TAG, "MyServiceConnection.onServiceConnected: IBinder类型转换失败", e);
+                mIsAssistantBound = false;
+            }
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            LogUtils.w(TAG, "MyServiceConnection.onServiceDisconnected: 守护服务连接断开");
+            mAssistantService = null;
+            mIsAssistantBound = false;
+
+            // 服务启用状态下，重试绑定守护服务（主服务存活核心保障）
+            if (mMainServiceBean != null && mMainServiceBean.isEnable()) {
+                LogUtils.d(TAG, "MyServiceConnection.onServiceDisconnected: " + RETRY_DELAY_MS + "ms后重试绑定守护服务");
+                new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							wakeupAndBindAssistantService();
+						}
+					}, RETRY_DELAY_MS);
+            } else {
+                LogUtils.w(TAG, "MyServiceConnection.onServiceDisconnected: 主服务已禁用，跳过重试绑定");
+            }
+        }
+    }
+
+    // ====================== 对外静态方法区（服务启停/重启/状态查询，全局调用） ======================
+    /**
+     * 检查号码是否在BoBullToon库中（外部组件调用，静态入口）
+     * @param phone 待查询号码
+     * @return true=是BoBullToon号码，false=否/初始化失败
+     */
+    public static boolean isPhoneInBoBullToon(String phone) {
+        if (sTomCatInstance != null && phone != null && !phone.isEmpty()) {
+            boolean result = sTomCatInstance.isPhoneBoBullToon(phone);
+            LogUtils.d(TAG, "isPhoneInBoBullToon: 号码" + phone + "查询结果：" + (result ? "是" : "否"));
+            return result;
+        }
+        LogUtils.w(TAG, "isPhoneInBoBullToon: TomCat未初始化或号码为空，查询失败");
+        return false;
+    }
+
+    /**
+     * 停止主服务（仅停止，不修改配置）
+     * @param context 上下文（非空校验）
+     */
+    public static void stopMainService(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "stopMainService: 上下文为空，无法停止服务");
+            return;
+        }
+        LogUtils.d(TAG, "stopMainService: 执行停止主服务操作");
+        context.stopService(new Intent(context, MainService.class));
+    }
+
+    /**
+     * 启动主服务（仅启动，不修改配置）
+     * @param context 上下文（非空校验）
+     */
+    public static void startMainService(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "startMainService: 上下文为空，无法启动服务");
+            return;
+        }
+        LogUtils.d(TAG, "startMainService: 执行启动主服务操作（前台服务模式）");
+        Intent intent = new Intent(context, MainService.class);
+        context.startForegroundService(intent);
+    }
+
+    /**
+     * 重启主服务（先停后启，需服务已启用）
+     * @param context 上下文（非空校验）
+     */
+    public static void restartMainService(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "restartMainService: 上下文为空，无法重启服务");
+            return;
+        }
+        LogUtils.d(TAG, "restartMainService: 执行主服务重启流程");
+
+        MainServiceBean config = MainServiceBean.loadBean(context, MainServiceBean.class);
+        if (config != null && config.isEnable()) {
+            stopMainService(context);
+            startMainService(context);
+            LogUtils.i(TAG, "restartMainService: 主服务重启完成");
+        } else {
+            LogUtils.w(TAG, "restartMainService: 服务未启用或配置为空，跳过重启");
+        }
+    }
+
+    /**
+     * 停止服务并保存禁用状态（更新配置+停止服务）
+     * @param context 上下文（非空校验）
+     */
+    public static void stopMainServiceAndSaveStatus(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "stopMainServiceAndSaveStatus: 上下文为空，操作失败");
+            return;
+        }
+        LogUtils.d(TAG, "stopMainServiceAndSaveStatus: 保存禁用状态并停止服务");
+        MainServiceBean config = new MainServiceBean();
+        config.setIsEnable(false);
+        MainServiceBean.saveBean(context, config);
+        stopMainService(context);
+    }
+
+    /**
+     * 启动服务并保存启用状态（更新配置+启动服务，先停后启避免重复）
+     * @param context 上下文（非空校验）
+     */
+    public static void startMainServiceAndSaveStatus(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "startMainServiceAndSaveStatus: 上下文为空，操作失败");
+            return;
+        }
+        LogUtils.d(TAG, "startMainServiceAndSaveStatus: 保存启用状态并启动服务");
+        MainServiceBean config = new MainServiceBean();
+        config.setIsEnable(true);
+        MainServiceBean.saveBean(context, config);
+        stopMainService(context); // 先停止旧服务，避免冲突
+        startMainService(context);
+    }
+
+    // ====================== 核心工具方法区（服务状态检查+前台通知创建，通用功能） ======================
+    /**
+     * 补充消息追加方法（外部组件向服务发送消息）
+     * @param message 待追加消息（空值防护）
+     */
+    public void appenMessage(String message) {
+        String msg = message == null ? "null" : message;
+        LogUtils.d(TAG, "appenMessage: 接收外部消息：" + msg);
+
+        if (mMainServiceHandler != null) {
+            android.os.Message handlerMsg = android.os.Message.obtain();
+            handlerMsg.what = MSG_UPDATE_STATUS;
+            handlerMsg.obj = msg;
+            mMainServiceHandler.sendMessage(handlerMsg);
+            LogUtils.d(TAG, "appenMessage: 消息已发送至Handler处理");
+        } else {
+            LogUtils.w(TAG, "appenMessage: MainServiceHandler未初始化，消息发送失败");
+        }
+    }
+
+    /**
+     * 创建前台服务通知（Android8.0+需渠道，低版本兼容）
+     * @return Notification 前台服务通知实例
+     */
+//    private Notification createForegroundNotification() {
+//        // 1. Android8.0+创建通知渠道（必需，否则通知不显示）
+//        if (Build.VERSION.SDK_INT >= ANDROID_8_API) {
+//            NotificationChannel channel = new NotificationChannel(
+//				FOREGROUND_CHANNEL_ID,
+//				"拨号主服务",
+//				NotificationManager.IMPORTANCE_LOW
+//            );
+//            channel.setDescription("主服务后台运行，保障通话监听与号码识别功能正常");
+//            channel.setSound(null, null); // 关闭通知声音
+//            channel.enableVibration(false); // 关闭振动
+//
+//            NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+//            if (notificationManager != null) {
+//                notificationManager.createNotificationChannel(channel);
+//                LogUtils.d(TAG, "createForegroundNotification: Android8.0+通知渠道创建成功");
+//            } else {
+//                LogUtils.e(TAG, "createForegroundNotification: NotificationManager获取失败，渠道创建失败");
+//            }
+//        }
+//
+//        // 2. 构建通知实例（分版本兼容Builder）
+//        Notification.Builder builder;
+//        if (Build.VERSION.SDK_INT >= ANDROID_8_API) {
+//            builder = new Notification.Builder(this, FOREGROUND_CHANNEL_ID);
+//        } else {
+//            builder = new Notification.Builder(this);
+//        }
+//        builder.setSmallIcon(R.drawable.ic_launcher);
+//        builder.setContentTitle("拨号服务运行中");
+//        builder.setContentText("后台保障通话监听与号码识别，请勿手动关闭");
+//        builder.setPriority(Notification.PRIORITY_LOW); // 低优先级，不打扰用户
+//        builder.setOngoing(true); // 不可手动清除，保障服务存活
+//
+//        LogUtils.d(TAG, "createForegroundNotification: 前台服务通知构建完成");
+//        return builder.build();
+//    }
+
+    /**
+     * 检查指定服务是否正在运行（通过ActivityManager查询）
+     * @param serviceClass 待检查服务类
+     * @return true=运行中，false=未运行/查询失败
+     */
+    private boolean isServiceRunning(Class<?> serviceClass) {
+        if (serviceClass == null) {
+            LogUtils.e(TAG, "isServiceRunning: 服务类为空，检查失败");
+            return false;
+        }
+
+        ActivityManager activityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        if (activityManager == null) {
+            LogUtils.w(TAG, "isServiceRunning: ActivityManager获取失败，检查失败");
+            return false;
+        }
+
+        // 遍历运行中服务，匹配类名
+        for (ActivityManager.RunningServiceInfo serviceInfo : activityManager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(serviceInfo.service.getClassName())) {
+                LogUtils.d(TAG, "isServiceRunning: 服务" + serviceClass.getSimpleName() + "正在运行");
+                return true;
+            }
+        }
+        LogUtils.d(TAG, "isServiceRunning: 服务" + serviceClass.getSimpleName() + "未运行");
+        return false;
+    }
+
+    // ====================== Service生命周期方法区（按执行顺序：创建→绑定→启动→销毁） ======================
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "===== onCreate: 主服务开始创建 =====");
+        sMainServiceInstance = this;
+        mIsServiceRunning = false;
+
+        // 初始化核心组件（无延迟，直接初始化）
+        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        mServiceConnection = new MyServiceConnection();
+        mMainServiceHandler = new MainServiceHandler(this);
+
+        // 初始化音量监控定时器（服务启动即开启，保障音量配置）
+        initVolumeCheckTimer();
+
+        // 执行核心业务启动逻辑（无延迟，优先启动）
+        startCoreBusiness();
+
+        LogUtils.d(TAG, "===== onCreate: 主服务创建完成 =====");
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        LogUtils.d(TAG, "onBind: 主服务被外部组件绑定，Intent=" + (intent != null ? intent.getAction() : "null"));
+        return new MyBinder();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand: 主服务被启动，startId=" + startId);
+        // 重复启动时再次执行核心业务（避免服务被杀死后重启失败）
+        startCoreBusiness();
+
+        // 服务启用则返回START_STICKY（系统杀死后自动重启），否则默认行为
+        int result = (mMainServiceBean != null && mMainServiceBean.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
+        LogUtils.d(TAG, "onStartCommand: 服务启动模式：" + (result == START_STICKY ? "START_STICKY（自动重启）" : "默认模式"));
+        return result;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "===== onDestroy: 主服务开始销毁，全量清理资源 =====");
+
+        // 1. 停止音量监控定时器（释放线程资源）
+        cancelVolumeCheckTimer();
+
+        // 2. 解除守护服务绑定（避免内存泄漏）
+        if (mIsAssistantBound && mServiceConnection != null) {
+            try {
+                unbindService(mServiceConnection);
+                LogUtils.d(TAG, "onDestroy: 守护服务绑定已解除");
+            } catch (IllegalArgumentException e) {
+                LogUtils.w(TAG, "onDestroy: 解除守护服务绑定失败（服务未绑定）", e);
+            }
+            mIsAssistantBound = false;
+            mServiceConnection = null;
+        }
+
+        // 3. 注销广播接收器（释放系统资源）
+        if (mMainReceiver != null) {
+            mMainReceiver.unregisterAction(this);
+            mMainReceiver = null;
+            LogUtils.d(TAG, "onDestroy: 全局广播接收器已注销");
+        }
+
+        // 4. 停止所有子服务（强制停止，避免子服务残留）
+        stopService(new Intent(this, AssistantService.class));
+        stopService(new Intent(this, CallListenerService.class));
+        stopService(new Intent(this, MyCallScreeningService.class));
+        LogUtils.d(TAG, "onDestroy: 所有子服务已强制停止");
+
+        // 5. 清空所有引用（静态+成员，彻底避免内存泄漏，不修改配置Bean）
+        sMainServiceInstance = null;
+        sTomCatInstance = null;
+        mMainServiceHandler = null;
+        mAssistantService = null;
+        mMainServiceBean = null;
+
+        // 标记服务为未运行
+        mIsServiceRunning = false;
+        LogUtils.d(TAG, "===== onDestroy: 主服务销毁完成，资源全清理 =====");
+    }
+
+    // ====================== 核心业务逻辑区（服务启动核心流程，无延迟） ======================
+    /**
+     * 启动核心业务（主服务核心入口，避免重复启动）
+     */
+    private synchronized void startCoreBusiness() {
+        // 服务已运行则直接返回，避免重复执行启动流程
+        if (mIsServiceRunning) {
+            LogUtils.d(TAG, "startCoreBusiness: 主服务已运行，跳过重复启动");
+            return;
+        }
+        mIsServiceRunning = true;
+
+        // 重新加载最新配置（避免配置修改后未生效）
+        mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class);
+        if (mMainServiceBean == null || !mMainServiceBean.isEnable()) {
+            LogUtils.w(TAG, "startCoreBusiness: 服务配置未启用或配置为空，启动流程终止");
+            mIsServiceRunning = false;
+            stopSelf(); // 未启用则主动停止服务
+            return;
+        }
+
+        LogUtils.i(TAG, "startCoreBusiness: 服务配置已启用，启动核心流程");
+
+        // 1. 优先启动前台服务（避免前台服务启动超时崩溃，核心优先级）
+        try {
+			NotificationManagerUtils notificationManagerUtils = new NotificationManagerUtils(this);
+			notificationManagerUtils.startForegroundServiceNotify(this, "主要拨号服务已启动。");
+            LogUtils.i(TAG, "startCoreBusiness: 前台服务启动成功，通知ID=" + FOREGROUND_NOTIFICATION_ID);
+        } catch (IllegalArgumentException e) {
+            LogUtils.e(TAG, "startCoreBusiness: 前台服务启动失败（服务类型不匹配）", e);
+            mIsServiceRunning = false;
+            stopSelf();
+            return;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "startCoreBusiness: 前台服务启动异常", e);
+            mIsServiceRunning = false;
+            stopSelf();
+            return;
+        }
+
+        // 2. 绑定守护服务（保障主服务存活，防系统杀死）
+        wakeupAndBindAssistantService();
+
+        // 3. 初始化核心业务组件（号码识别+黑白名单规则）
+        initTomCatComponent();
+        initRulesConfig();
+
+        // 4. 启动通话监听相关服务（无延迟，直接启动，保障功能生效）
+        startCallRelatedServices();
+
+        LogUtils.i(TAG, "startCoreBusiness: 主服务核心流程启动完成，服务正常运行");
+    }
+
+    /**
+     * 唤醒并绑定守护服务（分版本适配启动方式，Android10+前台服务启动）
+     */
+    private void wakeupAndBindAssistantService() {
+        if (mServiceConnection == null) {
+            LogUtils.e(TAG, "wakeupAndBindAssistantService: 服务连接实例未初始化，绑定失败");
+            return;
+        }
+
+        Intent assistantIntent = new Intent(this, AssistantService.class);
+        // Android10+应用后台启动服务需用前台服务模式
+        LogUtils.d(TAG, "wakeupAndBindAssistantService: Android10+，前台服务模式启动守护服务");
+		startService(assistantIntent);
+
+        // 绑定守护服务（BIND_IMPORTANT：高优先级绑定，断开时回调）
+        bindService(assistantIntent, mServiceConnection, Context.BIND_IMPORTANT);
+        LogUtils.d(TAG, "wakeupAndBindAssistantService: 守护服务启动并发起绑定请求");
+    }
+
+    // ====================== 铃声音量监控方法区（定时检查+恢复配置） ======================
+    /**
+     * 初始化音量检查定时器（先取消旧定时器，避免重复创建）
+     */
+    private void initVolumeCheckTimer() {
+        cancelVolumeCheckTimer();
+        mVolumeCheckTimer = new Timer();
+        mVolumeCheckTimer.schedule(new TimerTask() {
+				@Override
+				public void run() {
+					checkAndRestoreRingerVolume();
+				}
+			}, VOLUME_CHECK_DELAY, VOLUME_CHECK_PERIOD);
+        LogUtils.d(TAG, "initVolumeCheckTimer: 铃声音量监控定时器启动，周期" + VOLUME_CHECK_PERIOD + "ms");
+    }
+
+    /**
+     * 检查并恢复铃声音量（对比配置值，不一致则恢复，保障用户配置生效）
+     */
+    private void checkAndRestoreRingerVolume() {
+        AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
+        if (audioManager == null) {
+            LogUtils.e(TAG, "checkAndRestoreRingerVolume: AudioManager获取失败，音量检查终止");
+            return;
+        }
+
+        // 加载音量配置（无配置则初始化默认值）
+        RingTongBean ringConfig = RingTongBean.loadBean(this, RingTongBean.class);
+        if (ringConfig == null) {
+            ringConfig = new RingTongBean();
+            RingTongBean.saveBean(this, ringConfig);
+            LogUtils.d(TAG, "checkAndRestoreRingerVolume: 音量配置未存在，初始化默认配置");
+            return;
+        }
+
+        try {
+            int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
+            int configVolume = ringConfig.getStreamVolume();
+            // 音量不一致则恢复配置值
+            if (currentVolume != configVolume) {
+                audioManager.setStreamVolume(AudioManager.STREAM_RING, configVolume, 0);
+                LogUtils.d(TAG, "checkAndRestoreRingerVolume: 铃声音量已恢复，配置值=" + configVolume + "，原当前值=" + currentVolume);
+			} else {
+                LogUtils.v(TAG, "checkAndRestoreRingerVolume: 铃声音量与配置一致，无需调整");
+            }
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, "checkAndRestoreRingerVolume: 音量设置权限不足，恢复失败", e);
+        }
+    }
+
+    /**
+     * 取消音量检查定时器（释放Timer资源，避免内存泄漏）
+     */
+    private void cancelVolumeCheckTimer() {
+        if (mVolumeCheckTimer != null) {
+            mVolumeCheckTimer.cancel();
+            mVolumeCheckTimer = null;
+            LogUtils.d(TAG, "cancelVolumeCheckTimer: 铃声音量监控定时器已取消");
+        }
+    }
+
+    // ====================== 辅助初始化方法区（业务组件初始化，统一归类） ======================
+    /**
+     * 初始化TomCat组件（号码识别核心，加载本地数据）
+     */
+    private void initTomCatComponent() {
+        sTomCatInstance = TomCat.getInstance(this);
+        if (sTomCatInstance.loadPhoneBoBullToon()) {
+            LogUtils.d(TAG, "initTomCatComponent: BoBullToon号码库加载成功");
+        } else {
+            LogUtils.w(TAG, "initTomCatComponent: BoBullToon号码库未下载，加载失败（不影响服务运行）");
+        }
+    }
+
+    /**
+     * 初始化黑白名单规则配置（加载本地规则，保障通话筛选生效）
+     */
+    private void initRulesConfig() {
+        Rules rules = Rules.getInstance(this);
+        if (rules != null) {
+            rules.loadRules();
+            LogUtils.d(TAG, "initRulesConfig: 黑白名单通话规则加载完成");
+        } else {
+            LogUtils.e(TAG, "initRulesConfig: Rules实例获取失败，通话规则加载失败");
+        }
+    }
+
+    /**
+     * 初始化广播接收器（监听系统事件，如开机启动、网络变化）
+     */
+    private void initMainReceiver() {
+        if (mMainReceiver == null) {
+            mMainReceiver = new MainReceiver(this);
+            mMainReceiver.registerAction(this);
+            LogUtils.d(TAG, "initMainReceiver: 全局广播接收器注册完成");
+        } else {
+            LogUtils.d(TAG, "initMainReceiver: 广播接收器已初始化，跳过重复注册");
+        }
+    }
+
+    /**
+     * 启动通话相关服务（通话监听+通话筛选，核心功能服务）
+     */
+    private void startCallRelatedServices() {
+        // 启动通话监听服务
+        try {
+            Intent callListenerIntent = new Intent(this, CallListenerService.class);
+            startService(callListenerIntent);
+            LogUtils.d(TAG, "startCallRelatedServices: CallListenerService启动成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "startCallRelatedServices: CallListenerService启动失败", e);
+        }
+
+        // 启动通话筛选服务（API10+生效，低版本兼容）
+        try {
+            Intent screeningIntent = new Intent(this, MyCallScreeningService.class);
+            startService(screeningIntent);
+            LogUtils.d(TAG, "startCallRelatedServices: MyCallScreeningService启动成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "startCallRelatedServices: MyCallScreeningService启动失败", e);
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/services/MyCallScreeningService.java b/contacts/src/main/java/cc/winboll/studio/contacts/services/MyCallScreeningService.java
new file mode 100644
index 0000000..95a0884
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/MyCallScreeningService.java
@@ -0,0 +1,246 @@
+package cc.winboll.studio.contacts.services;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.telecom.CallScreeningService;
+import android.telephony.TelephonyManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import cc.winboll.studio.contacts.model.MainServiceBean;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Describe 通话筛选服务（无前台服务），负责识别通话类型、拦截指定号码、处理正常通话逻辑
+ * 严格适配 Java7 语法 + Android API29-30 | 轻量稳定 | 强化空指针防护 | 无冗余代码
+ */
+@RequiresApi(api = 29) // 父类 CallScreeningService 最低要求 API29，明确标注
+public class MyCallScreeningService extends CallScreeningService {
+
+    // ====================== 常量定义区（全硬编码，无高版本API依赖） ======================
+    public static final String TAG = "MyCallScreeningService";
+
+    // 通话方向常量（硬编码替代 Call.Details 高版本字段，适配API29-30）
+    private static final int CALL_DIRECTION_INCOMING = 1; // 来电
+    private static final int CALL_DIRECTION_OUTGOING = 2; // 外拨
+
+    // ====================== 成员属性区（精简必要属性，命名规范） ======================
+    private Context mContext; // 上下文对象，避免重复调用 getApplicationContext()
+
+    // ====================== Service生命周期方法区（按执行顺序排列） ======================
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mContext = this;
+        LogUtils.d(TAG, "===== onCreate: 通话筛选服务启动 =====");
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand: 服务被启动，startId=" + startId);
+
+        // 加载服务配置，决定重启策略（启用则自动重启，禁用则默认）
+        MainServiceBean serviceConfig = MainServiceBean.loadBean(this, MainServiceBean.class);
+        int startMode = (serviceConfig != null && serviceConfig.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
+        LogUtils.d(TAG, "onStartCommand: 服务启动模式：" + (startMode == START_STICKY ? "START_STICKY（自动重启）" : "默认模式"));
+
+        return startMode;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        // 置空上下文，释放引用，避免内存泄漏
+        mContext = null;
+        LogUtils.d(TAG, "===== onDestroy: 通话筛选服务销毁完成 =====");
+    }
+
+    // ====================== 核心通话筛选方法区（父类抽象方法实现） ======================
+    /**
+     * 核心：通话筛选入口（API29-30标准方法，100%兼容）
+     * 功能：识别通话号码/类型、拦截指定号码、处理正常通话
+     */
+    @Override
+    @RequiresApi(api = 29)
+    public void onScreenCall(@NonNull android.telecom.Call.Details details) {
+        LogUtils.d(TAG, "===== onScreenCall: 开始筛选通话 =====");
+
+        // 1. 安全获取通话号码（多层空指针防护，Java7规范写法）
+        String phoneNumber = getSafePhoneNumber(details);
+        // 2. 识别通话方向（来电/外拨/未知）
+        int callDirection = details.getCallDirection();
+        String callTypeDesc = getCallDirectionDesc(callDirection);
+        int callState = getCallStateByDirection(callDirection);
+
+        LogUtils.d(TAG, "筛选结果：通话类型=" + callTypeDesc + "，号码=" + phoneNumber);
+
+        // 3. 自定义拦截逻辑（示例：拦截指定号码10086，可按需扩展黑白名单）
+        boolean isNeedBlock = isTargetBlockNumber(phoneNumber);
+
+        // 4. 构建筛选响应（Java7分步调用，不使用链式写法，避免兼容问题）
+        CallResponse callResponse = buildCallScreeningResponse(isNeedBlock);
+
+        // 5. 提交筛选结果（必须调用父类方法，完成拦截/放行逻辑）
+        respondToCall(details, callResponse);
+
+        // 6. 分场景处理后续逻辑（拦截日志/正常通话业务）
+        handleCallAfterScreening(phoneNumber, callTypeDesc, isNeedBlock);
+
+        LogUtils.d(TAG, "===== onScreenCall: 通话筛选完成 =====");
+    }
+
+    // ====================== 业务逻辑方法区（按功能拆分，低耦合） ======================
+    /**
+     * 安全获取通话号码（多层空指针+空字符串防护，避免崩溃）
+     */
+    private String getSafePhoneNumber(android.telecom.Call.Details details) {
+        String phoneNumber = "未知号码";
+        if (details == null) {
+            LogUtils.w(TAG, "getSafePhoneNumber: 通话详情为空，无法获取号码");
+            return phoneNumber;
+        }
+
+        Uri handle = details.getHandle();
+        if (handle != null) {
+            String schemePart = handle.getSchemeSpecificPart();
+            if (schemePart != null && !schemePart.trim().isEmpty()) {
+                phoneNumber = schemePart.trim();
+                LogUtils.d(TAG, "getSafePhoneNumber: 成功获取号码，原始值=" + schemePart + "，处理后=" + phoneNumber);
+            } else {
+                LogUtils.w(TAG, "getSafePhoneNumber: 号码格式异常，schemePart=" + schemePart);
+            }
+        } else {
+            LogUtils.w(TAG, "getSafePhoneNumber: 通话 handle 为空，无法获取号码");
+        }
+        return phoneNumber;
+    }
+
+    /**
+     * 判断是否为目标拦截号码（可扩展黑白名单逻辑，当前示例拦截10086）
+     */
+    private boolean isTargetBlockNumber(String phoneNumber) {
+        if (phoneNumber == null || phoneNumber.trim().isEmpty()) {
+            LogUtils.w(TAG, "isTargetBlockNumber: 号码为空，不拦截");
+            return false;
+        }
+
+        // 示例拦截逻辑：拦截 10086（实际可替换为黑白名单查询）
+        boolean isBlock = "10086".equals(phoneNumber.trim());
+        if (isBlock) {
+            LogUtils.d(TAG, "isTargetBlockNumber: 命中拦截规则，号码=" + phoneNumber);
+        } else {
+            LogUtils.d(TAG, "isTargetBlockNumber: 未命中拦截规则，号码=" + phoneNumber);
+        }
+        return isBlock;
+    }
+
+    /**
+     * 构建通话筛选响应（按需配置拦截/放行参数，适配API29-30）
+     */
+    private CallResponse buildCallScreeningResponse(boolean isNeedBlock) {
+        CallResponse.Builder responseBuilder = new CallResponse.Builder();
+        // 拦截配置：是否禁止通话+是否拒绝通话（两者配合实现拦截）
+        responseBuilder.setDisallowCall(isNeedBlock);
+        responseBuilder.setRejectCall(isNeedBlock);
+        // 日志/通知配置：拦截的通话跳过日志和通知，正常通话保留
+        responseBuilder.setSkipCallLog(isNeedBlock);
+        responseBuilder.setSkipNotification(isNeedBlock);
+
+        CallResponse response = responseBuilder.build();
+        LogUtils.d(TAG, "buildCallScreeningResponse: 响应构建完成，拦截状态=" + isNeedBlock);
+        return response;
+    }
+
+    /**
+     * 筛选后分场景处理（拦截日志/正常通话业务扩展）
+     */
+    private void handleCallAfterScreening(String phoneNumber, String callTypeDesc, boolean isNeedBlock) {
+        if (isNeedBlock) {
+            // 拦截场景：仅打日志（可扩展：添加拦截记录、本地存储等）
+            LogUtils.d(TAG, "handleCallAfterScreening: 已拦截通话，类型=" + callTypeDesc + "，号码=" + phoneNumber);
+        } else {
+            // 正常通话场景：处理业务逻辑（可扩展：通话记录、广播通知、号码识别等）
+            int callState = getCallStateByDirection(getCallDirectionFromDesc(callTypeDesc));
+            handleNormalCallBusiness(phoneNumber, callState);
+        }
+    }
+
+    /**
+     * 正常通话业务处理（核心业务扩展入口，强化空指针防护）
+     */
+    private void handleNormalCallBusiness(String phoneNumber, int callState) {
+        if (phoneNumber == null || phoneNumber.trim().isEmpty()) {
+            LogUtils.w(TAG, "handleNormalCallBusiness: 号码为空，跳过业务处理");
+            return;
+        }
+
+        String callStateDesc = getCallStateDesc(callState);
+        LogUtils.d(TAG, "handleNormalCallBusiness: 处理正常通话业务，号码=" + phoneNumber + "，状态=" + callStateDesc);
+
+        // 此处可扩展业务逻辑（示例）：
+        // 1. 保存通话记录到本地
+        // 2. 发送广播通知其他组件（如通话监听服务）
+        // 3. 调用号码识别接口，匹配联系人信息
+    }
+
+    // ====================== 工具辅助方法区（统一归类，复用性强） ======================
+    /**
+     * 通话方向转文字描述（便于日志查看，快速定位场景）
+     */
+    private String getCallDirectionDesc(int callDirection) {
+        switch (callDirection) {
+            case CALL_DIRECTION_INCOMING:
+                return "来电";
+            case CALL_DIRECTION_OUTGOING:
+                return "外拨";
+            default:
+                return "未知通话";
+        }
+    }
+
+    /**
+     * 文字描述转通话方向（配合业务逻辑反向匹配，避免重复判断）
+     */
+    private int getCallDirectionFromDesc(String callTypeDesc) {
+        if ("来电".equals(callTypeDesc)) {
+            return CALL_DIRECTION_INCOMING;
+        } else if ("外拨".equals(callTypeDesc)) {
+            return CALL_DIRECTION_OUTGOING;
+        } else {
+            return -1; // 未知方向
+        }
+    }
+
+    /**
+     * 通话方向转 TelephonyManager 状态（统一状态标准，便于业务复用）
+     */
+    private int getCallStateByDirection(int callDirection) {
+        switch (callDirection) {
+            case CALL_DIRECTION_INCOMING:
+                return TelephonyManager.CALL_STATE_RINGING; // 来电=响铃中
+            case CALL_DIRECTION_OUTGOING:
+                return TelephonyManager.CALL_STATE_OFFHOOK; // 外拨=通话中
+            default:
+                return TelephonyManager.CALL_STATE_IDLE; // 未知=空闲
+        }
+    }
+
+    /**
+     * TelephonyManager 状态转文字描述（统一日志格式，提升可读性）
+     */
+    private String getCallStateDesc(int callState) {
+        switch (callState) {
+            case TelephonyManager.CALL_STATE_RINGING:
+                return "响铃中";
+            case TelephonyManager.CALL_STATE_OFFHOOK:
+                return "通话中";
+            case TelephonyManager.CALL_STATE_IDLE:
+                return "空闲";
+            default:
+                return "未知状态";
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java b/contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java
new file mode 100644
index 0000000..5f0e01b
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java
@@ -0,0 +1,104 @@
+package cc.winboll.studio.contacts.threads;
+
+import android.content.Context;
+import cc.winboll.studio.contacts.handlers.MainServiceHandler;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.lang.ref.WeakReference;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/14 03:46:44
+ * @Describe 主服务后台工作线程，负责定时轮询与消息调度
+ */
+public class MainServiceThread extends Thread {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "MainServiceThread";
+    // 线程休眠周期（1秒）
+    private static final long THREAD_SLEEP_INTERVAL = 1000L;
+
+    // ====================== 静态成员变量区 ======================
+    private static volatile MainServiceThread sInstance;
+
+    // ====================== 成员变量区 ======================
+    // 线程运行控制标记
+    private volatile boolean mIsExit;
+    private volatile boolean mIsStarted;
+    // 弱引用持有上下文和Handler，避免内存泄漏
+    private WeakReference<Context> mContextWeakRef;
+    private WeakReference<MainServiceHandler> mHandlerWeakRef;
+
+    // ====================== 私有构造函数 ======================
+    private MainServiceThread(Context context, MainServiceHandler handler) {
+        this.mContextWeakRef = new WeakReference<>(context);
+        this.mHandlerWeakRef = new WeakReference<>(handler);
+        this.mIsExit = false;
+        this.mIsStarted = false;
+        LogUtils.d(TAG, "MainServiceThread: 线程实例初始化完成");
+    }
+
+    // ====================== 单例获取方法 ======================
+    public static MainServiceThread getInstance(Context context, MainServiceHandler handler) {
+        // 若已有实例，先标记退出并销毁旧实例
+        if (sInstance != null) {
+            LogUtils.d(TAG, "getInstance: 存在旧线程实例，标记退出");
+            sInstance.setIsExit(true);
+            sInstance = null;
+        }
+        // 创建新线程实例
+        sInstance = new MainServiceThread(context, handler);
+        LogUtils.d(TAG, "getInstance: 新线程实例已创建");
+        return sInstance;
+    }
+
+    // ====================== 运行状态控制方法 ======================
+    public void setIsExit(boolean isExit) {
+        this.mIsExit = isExit;
+        LogUtils.d(TAG, "setIsExit: 线程退出标记已更新 | " + isExit);
+    }
+
+    public boolean isExit() {
+        return mIsExit;
+    }
+
+    public void setIsStarted(boolean isStarted) {
+        this.mIsStarted = isStarted;
+    }
+
+    public boolean isStarted() {
+        return mIsStarted;
+    }
+
+    // ====================== 线程核心执行方法 ======================
+    @Override
+    public void run() {
+        // 防止重复启动
+        if (mIsStarted) {
+            LogUtils.w(TAG, "run: 线程已启动，避免重复执行");
+            return;
+        }
+
+        // 标记线程启动状态
+        mIsStarted = true;
+        LogUtils.i(TAG, "run: 线程开始运行");
+
+        // 线程主循环
+        while (!mIsExit) {
+            try {
+                // 此处可添加业务逻辑（如定时任务、消息分发）
+                Thread.sleep(THREAD_SLEEP_INTERVAL);
+            } catch (InterruptedException e) {
+                LogUtils.e(TAG, "run: 线程休眠被中断", e);
+                // 恢复线程中断状态
+                Thread.currentThread().interrupt();
+            }
+        }
+
+        // 线程退出清理
+        mIsStarted = false;
+        mContextWeakRef.clear();
+        mHandlerWeakRef.clear();
+        sInstance = null;
+        LogUtils.i(TAG, "run: 线程正常退出");
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/AppGoToSettingsUtil.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/AppGoToSettingsUtil.java
new file mode 100644
index 0000000..839b342
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/AppGoToSettingsUtil.java
@@ -0,0 +1,268 @@
+package cc.winboll.studio.contacts.utils;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+
+import cc.winboll.studio.contacts.MainActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/09/27 14:27
+ * @Describe 应用权限设置页跳转工具类，适配主流手机厂商的权限页路径，跳转失败时降级到应用详情页
+ */
+public class AppGoToSettingsUtil {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "AppGoToSettingsUtil";
+    // 跳转设置页的 Activity 结果码，复用 MainActivity 的请求码
+    public static final int ACTIVITY_RESULT_APP_SETTINGS = MainActivity.REQUEST_APP_SETTINGS;
+
+    // 主流手机厂商品牌常量
+    private static final String MANUFACTURER_HUAWEI = "Huawei";
+    private static final String MANUFACTURER_MEIZU = "Meizu";
+    private static final String MANUFACTURER_XIAOMI = "Xiaomi";
+    private static final String MANUFACTURER_SONY = "Sony";
+    private static final String MANUFACTURER_OPPO = "OPPO";
+    private static final String MANUFACTURER_LG = "LG";
+    private static final String MANUFACTURER_VIVO = "vivo";
+    private static final String MANUFACTURER_SAMSUNG = "samsung";
+    private static final String MANUFACTURER_LETV = "Letv";
+    private static final String MANUFACTURER_ZTE = "ZTE";
+    private static final String MANUFACTURER_YULONG = "YuLong";
+    private static final String MANUFACTURER_LENOVO = "LENOVO";
+
+    // ====================== 成员变量区 ======================
+    // 标记当前跳转的是应用详情页(true)还是厂商权限页(false)
+    public static boolean isAppSettingOpen = false;
+
+    // ====================== 核心跳转方法区 ======================
+    /**
+     * 跳转到对应品牌手机的系统权限设置页，跳转失败则降级到应用详情页
+     * @param activity 上下文 Activity
+     */
+    public static void goToSetting(Activity activity) {
+        // 空值校验，避免空指针异常
+        if (activity == null) {
+            LogUtils.e(TAG, "goToSetting: Activity 为 null，无法跳转设置页");
+            return;
+        }
+
+        String manufacturer = Build.MANUFACTURER;
+        LogUtils.d(TAG, "goToSetting: 当前设备厂商 | " + manufacturer);
+
+        // 根据厂商跳转对应权限页
+        switch (manufacturer) {
+            case MANUFACTURER_HUAWEI:
+                gotoHuaweiSetting(activity);
+                break;
+            case MANUFACTURER_MEIZU:
+                gotoMeizuSetting(activity);
+                break;
+            case MANUFACTURER_XIAOMI:
+                gotoXiaomiSetting(activity);
+                break;
+            case MANUFACTURER_SONY:
+                gotoSonySetting(activity);
+                break;
+            case MANUFACTURER_OPPO:
+                gotoOppoSetting(activity);
+                break;
+            case MANUFACTURER_LG:
+                gotoLgSetting(activity);
+                break;
+            case MANUFACTURER_LETV:
+                gotoLetvSetting(activity);
+                break;
+            default:
+                LogUtils.w(TAG, "goToSetting: 未适配当前厂商，跳转应用详情页");
+                openAppDetailSetting(activity);
+                break;
+        }
+    }
+
+    // ====================== 各厂商权限页跳转方法区 ======================
+    /**
+     * 跳转华为手机权限设置页
+     */
+    private static void gotoHuaweiSetting(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            intent.setComponent(new ComponentName("com.huawei.systemmanager",
+												  "com.huawei.permissionmanager.ui.MainActivity"));
+            activity.startActivityForResult(intent, ACTIVITY_RESULT_APP_SETTINGS);
+            isAppSettingOpen = false;
+            LogUtils.d(TAG, "gotoHuaweiSetting: 跳转华为权限设置页成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "gotoHuaweiSetting: 跳转失败，降级到应用详情页", e);
+            openAppDetailSetting(activity);
+        }
+    }
+
+    /**
+     * 跳转魅族手机权限设置页
+     */
+    private static void gotoMeizuSetting(Activity activity) {
+        try {
+            Intent intent = new Intent("com.meizu.safe.security.SHOW_APPSEC");
+            intent.addCategory(Intent.CATEGORY_DEFAULT);
+            intent.putExtra("packageName", activity.getPackageName());
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+            LogUtils.d(TAG, "gotoMeizuSetting: 跳转魅族权限设置页成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "gotoMeizuSetting: 跳转失败，降级到应用详情页", e);
+            openAppDetailSetting(activity);
+        }
+    }
+
+    /**
+     * 跳转小米手机权限设置页
+     */
+    private static void gotoXiaomiSetting(Activity activity) {
+        try {
+            // 适配 MIUI 8/9 及以上版本
+            Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+            intent.setClassName("com.miui.securitycenter",
+								"com.miui.permcenter.permissions.PermissionsEditorActivity");
+            intent.putExtra("extra_pkgname", activity.getPackageName());
+            activity.startActivityForResult(intent, ACTIVITY_RESULT_APP_SETTINGS);
+            isAppSettingOpen = false;
+            LogUtils.d(TAG, "gotoXiaomiSetting: 跳转小米权限设置页(MIUI8+)成功");
+        } catch (Exception e) {
+            try {
+                // 适配 MIUI 5/6/7 版本
+                Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
+                intent.setClassName("com.miui.securitycenter",
+									"com.miui.permcenter.permissions.AppPermissionsEditorActivity");
+                intent.putExtra("extra_pkgname", activity.getPackageName());
+                activity.startActivityForResult(intent, ACTIVITY_RESULT_APP_SETTINGS);
+                isAppSettingOpen = false;
+                LogUtils.d(TAG, "gotoXiaomiSetting: 跳转小米权限设置页(MIUI5-7)成功");
+            } catch (Exception e1) {
+                LogUtils.e(TAG, "gotoXiaomiSetting: 所有版本适配失败，降级到应用详情页", e1);
+                openAppDetailSetting(activity);
+            }
+        }
+    }
+
+    /**
+     * 跳转索尼手机权限设置页
+     */
+    private static void gotoSonySetting(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            intent.setComponent(new ComponentName("com.sonymobile.cta",
+												  "com.sonymobile.cta.SomcCTAMainActivity"));
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+            LogUtils.d(TAG, "gotoSonySetting: 跳转索尼权限设置页成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "gotoSonySetting: 跳转失败，降级到应用详情页", e);
+            openAppDetailSetting(activity);
+        }
+    }
+
+    /**
+     * 跳转OPPO手机权限设置页
+     */
+    private static void gotoOppoSetting(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            intent.setComponent(new ComponentName("com.color.safecenter",
+												  "com.color.safecenter.permission.PermissionManagerActivity"));
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+            LogUtils.d(TAG, "gotoOppoSetting: 跳转OPPO权限设置页成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "gotoOppoSetting: 跳转失败，降级到应用详情页", e);
+            openAppDetailSetting(activity);
+        }
+    }
+
+    /**
+     * 跳转LG手机权限设置页
+     */
+    private static void gotoLgSetting(Activity activity) {
+        try {
+            Intent intent = new Intent("android.intent.action.MAIN");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            intent.setComponent(new ComponentName("com.android.settings",
+												  "com.android.settings.Settings$AccessLockSummaryActivity"));
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+            LogUtils.d(TAG, "gotoLgSetting: 跳转LG权限设置页成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "gotoLgSetting: 跳转失败，降级到应用详情页", e);
+            openAppDetailSetting(activity);
+        }
+    }
+
+    /**
+     * 跳转乐视手机权限设置页
+     */
+    private static void gotoLetvSetting(Activity activity) {
+        try {
+            Intent intent = new Intent();
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra("packageName", activity.getPackageName());
+            intent.setComponent(new ComponentName("com.letv.android.letvsafe",
+												  "com.letv.android.letvsafe.PermissionAndApps"));
+            activity.startActivity(intent);
+            isAppSettingOpen = false;
+            LogUtils.d(TAG, "gotoLetvSetting: 跳转乐视权限设置页成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "gotoLetvSetting: 跳转失败，降级到应用详情页", e);
+            openAppDetailSetting(activity);
+        }
+    }
+
+    // ====================== 降级跳转方法区 ======================
+    /**
+     * 跳转系统设置主界面
+     */
+    public static void gotoSystemConfig(Activity activity) {
+        if (activity == null) {
+            LogUtils.e(TAG, "gotoSystemConfig: Activity 为 null，无法跳转");
+            return;
+        }
+        Intent intent = new Intent(Settings.ACTION_SETTINGS);
+        activity.startActivity(intent);
+        LogUtils.d(TAG, "gotoSystemConfig: 跳转系统设置主界面成功");
+    }
+
+    /**
+     * 获取应用详情页的 Intent
+     */
+    private static Intent getAppDetailSettingIntent(Activity activity) {
+        Intent intent = new Intent();
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS");
+        intent.setData(Uri.fromParts("package", activity.getPackageName(), null));
+        return intent;
+    }
+
+    /**
+     * 打开应用详情设置页
+     */
+    public static void openAppDetailSetting(Activity activity) {
+        if (activity == null) {
+            LogUtils.e(TAG, "openAppDetailSetting: Activity 为 null，无法跳转");
+            return;
+        }
+        activity.startActivityForResult(getAppDetailSettingIntent(activity), ACTIVITY_RESULT_APP_SETTINGS);
+        isAppSettingOpen = true;
+        LogUtils.d(TAG, "openAppDetailSetting: 跳转应用详情设置页成功");
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java
new file mode 100644
index 0000000..9d2fc6c
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java
@@ -0,0 +1,351 @@
+package cc.winboll.studio.contacts.utils;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/08/30 14:32
+ * @Describe 联系人工具集：提供联系人查询、添加、编辑、号码格式化等功能，适配主流机型
+ */
+public class ContactUtils {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "ContactUtils";
+    // 手机号正则（11位中国大陆手机号）
+    private static final String REGEX_CHINA_MOBILE = "^1[0-9]{10}$";
+
+    // ====================== 单例与成员变量区 ======================
+    // 单例实例（volatile 保证多线程可见性）
+    private static volatile ContactUtils sInstance;
+    // 上下文（弱引用避免内存泄漏，Java7 兼容）
+    private final Context mContext;
+    // 缓存联系人：key=纯数字号码，value=联系人姓名
+    private final Map<String, String> mContactMap = new HashMap<>();
+
+    // ====================== 单例构造区 ======================
+    /**
+     * 私有构造器：初始化上下文并加载联系人
+     */
+    private ContactUtils(Context context) {
+        // 传入应用上下文，避免Activity上下文泄漏
+        this.mContext = context.getApplicationContext();
+        LogUtils.d(TAG, "ContactUtils 初始化，开始加载联系人");
+        reloadContacts();
+    }
+
+    /**
+     * 获取单例实例（双重校验锁，Java7 安全）
+     */
+    public static ContactUtils getInstance(Context context) {
+        if (context == null) {
+            LogUtils.e(TAG, "getInstance: 上下文为null，无法创建实例");
+            throw new IllegalArgumentException("Context cannot be null");
+        }
+        if (sInstance == null) {
+            synchronized (ContactUtils.class) {
+                if (sInstance == null) {
+                    sInstance = new ContactUtils(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    // ====================== 联系人缓存与查询区 ======================
+    /**
+     * 重新加载联系人到缓存
+     */
+    public void reloadContacts() {
+        LogUtils.d(TAG, "reloadContacts: 开始刷新联系人缓存");
+        mContactMap.clear();
+        readContactsFromSystem();
+        LogUtils.d(TAG, "reloadContacts: 联系人缓存刷新完成，共缓存 " + mContactMap.size() + " 个联系人");
+    }
+
+    /**
+     * 从系统通讯录读取所有联系人（核心方法）
+     */
+    private void readContactsFromSystem() {
+        ContentResolver resolver = mContext.getContentResolver();
+        // 只查询姓名和号码字段，减少IO开销
+        String[] projection = {
+			ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME,
+			ContactsContract.CommonDataKinds.Phone.NUMBER
+        };
+
+        Cursor cursor = null;
+        try {
+            cursor = resolver.query(
+				ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+				projection,
+				null,
+				null,
+				null
+            );
+
+            if (cursor == null) {
+                LogUtils.w(TAG, "readContactsFromSystem: 通讯录查询Cursor为null，可能缺少权限");
+                return;
+            }
+
+            while (cursor.moveToNext()) {
+                String name = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+                String phone = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
+
+                if (phone != null) {
+                    String simplePhone = formatToSimplePhoneNumber(phone);
+                    mContactMap.put(simplePhone, name != null ? name : "[UnknownName]");
+                    LogUtils.v(TAG, "readContactsFromSystem: 缓存联系人 - 号码：" + simplePhone + "，姓名：" + name);
+                }
+            }
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, "readContactsFromSystem: 读取通讯录失败，缺少 READ_CONTACTS 权限", e);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "readContactsFromSystem: 读取通讯录异常", e);
+        } finally {
+            if (cursor != null) {
+                cursor.close(); // 确保游标关闭，避免内存泄漏
+            }
+        }
+    }
+
+    /**
+     * 从缓存中获取联系人姓名
+     */
+    public String getContactName(String phone) {
+        if (phone == null) {
+            LogUtils.w(TAG, "getContactName: 输入号码为null");
+            return "[NotInContacts]";
+        }
+        String simplePhone = formatToSimplePhoneNumber(phone);
+        String name = mContactMap.get(simplePhone);
+        LogUtils.d(TAG, "getContactName: 查询号码 " + simplePhone + "，姓名：" + (name == null ? "[NotInContacts]" : name));
+        return name == null ? "[NotInContacts]" : name;
+    }
+
+    // ====================== 号码格式化工具区 ======================
+    /**
+     * 格式化号码为纯数字（去除所有非数字字符）
+     */
+    public static String formatToSimplePhoneNumber(String number) {
+        if (number == null || number.isEmpty()) {
+            LogUtils.w(TAG, "formatToSimplePhoneNumber: 输入号码为空");
+            return "";
+        }
+        String simpleNumber = number.replaceAll("[^0-9]", "");
+        LogUtils.v(TAG, "formatToSimplePhoneNumber: 原号码 " + number + " → 纯数字号码 " + simpleNumber);
+        return simpleNumber;
+    }
+
+    /**
+     * 格式化11位手机号为带空格格式（如：138 0000 1234）
+     */
+    public static String formatToSpacePhoneNumber(String simpleNumber) {
+        if (simpleNumber == null || !simpleNumber.matches(REGEX_CHINA_MOBILE)) {
+            LogUtils.v(TAG, "formatToSpacePhoneNumber: 号码不符合11位手机号格式，无需格式化");
+            return simpleNumber;
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(simpleNumber.substring(0, 3))
+			.append(" ")
+			.append(simpleNumber.substring(3, 7))
+			.append(" ")
+			.append(simpleNumber.substring(7, 11));
+
+        String formatted = sb.toString();
+        LogUtils.v(TAG, "formatToSpacePhoneNumber: 纯数字号码 " + simpleNumber + " → 带空格号码 " + formatted);
+        return formatted;
+    }
+
+    // ====================== 联系人查询（直接查系统，不走缓存）区 ======================
+    /**
+     * 直接查询系统通讯录获取联系人姓名（按原始号码匹配）
+     */
+    public static String getDisplayNameByPhone(Context context, String phoneNumber) {
+        if (context == null || phoneNumber == null) {
+            LogUtils.w(TAG, "getDisplayNameByPhone: 上下文或号码为空");
+            return null;
+        }
+
+        ContentResolver resolver = context.getContentResolver();
+        String[] projection = {ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME};
+        Cursor cursor = null;
+        String displayName = null;
+
+        try {
+            cursor = resolver.query(
+				ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+				projection,
+				ContactsContract.CommonDataKinds.Phone.NUMBER + "=?",
+				new String[]{phoneNumber},
+				null
+            );
+
+            if (cursor != null && cursor.moveToFirst()) {
+                displayName = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+            }
+            LogUtils.d(TAG, "getDisplayNameByPhone: 按原始号码 " + phoneNumber + " 查询，姓名：" + displayName);
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, "getDisplayNameByPhone: 缺少 READ_CONTACTS 权限", e);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "getDisplayNameByPhone: 查询异常", e);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return displayName;
+    }
+
+    /**
+     * 直接查询系统通讯录获取联系人姓名（按纯数字号码匹配）
+     */
+    public static String getDisplayNameByPhoneSimple(Context context, String phoneNumber) {
+        if (phoneNumber == null) {
+            LogUtils.w(TAG, "getDisplayNameByPhoneSimple: 输入号码为null");
+            return null;
+        }
+        String simplePhone = formatToSimplePhoneNumber(phoneNumber);
+        LogUtils.d(TAG, "getDisplayNameByPhoneSimple: 按纯数字号码 " + simplePhone + " 查询");
+        return getDisplayNameByPhone(context, simplePhone);
+    }
+
+    /**
+     * 判断号码是否在系统通讯录中
+     */
+    public static boolean isPhoneInContacts(Context context, String phoneNumber) {
+        if (context == null || phoneNumber == null) {
+            LogUtils.w(TAG, "isPhoneInContacts: 上下文或号码为空");
+            return false;
+        }
+
+        String simplePhone = formatToSimplePhoneNumber(phoneNumber);
+        String displayName = getDisplayNameByPhone(context, simplePhone);
+
+        if (displayName == null) {
+            LogUtils.d(TAG, "isPhoneInContacts: 号码 " + simplePhone + " 未找到联系人（纯数字匹配）");
+            String spacePhone = formatToSpacePhoneNumber(simplePhone);
+            displayName = getDisplayNameByPhone(context, spacePhone);
+            if (displayName == null) {
+                LogUtils.d(TAG, "isPhoneInContacts: 号码 " + spacePhone + " 未找到联系人（带空格匹配）");
+                return false;
+            }
+        }
+
+        LogUtils.d(TAG, "isPhoneInContacts: 号码 " + simplePhone + " 已在联系人中，姓名：" + displayName);
+        return true;
+    }
+
+    /**
+     * 通过电话号码查询联系人ID（适配定制机型）
+     */
+    public static Long getContactIdByPhone(Context context, String phoneNumber) {
+        if (context == null || phoneNumber == null || phoneNumber.isEmpty()) {
+            LogUtils.w(TAG, "getContactIdByPhone: 上下文或号码为空");
+            return -1L;
+        }
+
+        ContentResolver resolver = context.getContentResolver();
+        Uri queryUri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Phone.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
+        String[] projection = {ContactsContract.CommonDataKinds.Phone.CONTACT_ID};
+        Cursor cursor = null;
+        Long contactId = -1L;
+
+        try {
+            cursor = resolver.query(queryUri, projection, null, null, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                contactId = cursor.getLong(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.CONTACT_ID));
+            }
+            LogUtils.d(TAG, "getContactIdByPhone: 号码 " + phoneNumber + " 对应的联系人ID：" + contactId);
+        } catch (SecurityException e) {
+            LogUtils.e(TAG, "getContactIdByPhone: 缺少 READ_CONTACTS 权限", e);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "getContactIdByPhone: 查询异常", e);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return contactId;
+    }
+
+    // ====================== 联系人跳转工具区 ======================
+    /**
+     * 跳转至系统添加联系人界面
+     * @param context 上下文
+     * @param phoneNumber 预填号码（可为null）
+     */
+    public static void jumpToAddContact(Context context, String phoneNumber) {
+        if (context == null) {
+            LogUtils.e(TAG, "jumpToAddContact: 上下文为null");
+            return;
+        }
+
+        Intent intent = new Intent(Intent.ACTION_INSERT);
+        intent.setType("vnd.android.cursor.dir/person");
+        if (phoneNumber != null) {
+            intent.putExtra(ContactsContract.Intents.Insert.PHONE, phoneNumber);
+            LogUtils.d(TAG, "jumpToAddContact: 跳转添加联系人，预填号码：" + phoneNumber);
+        } else {
+            LogUtils.d(TAG, "jumpToAddContact: 跳转添加联系人，无预填号码");
+        }
+
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 支持非Activity上下文调用
+        context.startActivity(intent);
+    }
+
+    /**
+     * 跳转至系统编辑联系人界面（适配小米等定制机型）
+     * @param context 上下文
+     * @param phoneNumber 待编辑号码（必传）
+     * @param contactId 联系人ID（可选，优先使用）
+     */
+    public static void jumpToEditContact(Context context, String phoneNumber, Long contactId) {
+        if (context == null) {
+            LogUtils.e(TAG, "jumpToEditContact: 上下文为null");
+            return;
+        }
+
+        // 校验必要参数
+        if (contactId == null || contactId <= 0) {
+            if (phoneNumber == null || phoneNumber.isEmpty()) {
+                LogUtils.e(TAG, "jumpToEditContact: 联系人ID和号码均为空，无法编辑");
+                return;
+            }
+        }
+
+        Intent intent = new Intent(Intent.ACTION_EDIT);
+        intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        // 优先通过ID定位（精准）
+        if (contactId != null && contactId > 0) {
+            Uri contactUri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, contactId);
+            intent.setData(contactUri);
+            LogUtils.d(TAG, "jumpToEditContact: 通过ID " + contactId + " 定位联系人，准备编辑");
+        } else {
+            // 通过号码定位
+            Uri phoneUri = Uri.withAppendedPath(ContactsContract.CommonDataKinds.Phone.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
+            intent.setData(phoneUri);
+            LogUtils.d(TAG, "jumpToEditContact: 通过号码 " + phoneNumber + " 定位联系人，准备编辑");
+        }
+
+        // 预填最新号码
+        if (phoneNumber != null && !phoneNumber.isEmpty()) {
+            intent.putExtra(ContactsContract.CommonDataKinds.Phone.NUMBER, phoneNumber);
+            intent.putExtra(ContactsContract.CommonDataKinds.Phone.TYPE, ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE);
+        }
+
+        context.startActivity(intent);
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/EditTextIntUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/EditTextIntUtils.java
new file mode 100644
index 0000000..b0a44d5
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/EditTextIntUtils.java
@@ -0,0 +1,51 @@
+package cc.winboll.studio.contacts.utils;
+
+import android.widget.EditText;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/04/13 00:59:13
+ * @Describe Int类型数字输入框工具集：安全读取 EditText 中的整数内容
+ */
+public class EditTextIntUtils {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "EditTextIntUtils";
+    // 默认返回值：读取失败时返回
+    private static final int DEFAULT_INT_VALUE = 0;
+
+    // ====================== 工具方法区 ======================
+    /**
+     * 从 EditText 中安全读取整数
+     * @param editText 目标输入框
+     * @return 输入框中的整数，读取失败返回 0
+     */
+    public static int getIntFromEditText(EditText editText) {
+        // 空值校验：防止 EditText 为 null 导致空指针
+        if (editText == null) {
+            LogUtils.w(TAG, "getIntFromEditText: EditText 实例为 null，返回默认值 " + DEFAULT_INT_VALUE);
+            return DEFAULT_INT_VALUE;
+        }
+
+        // 获取并去除首尾空格
+        String inputStr = editText.getText().toString().trim();
+        LogUtils.d(TAG, "getIntFromEditText: 输入框原始内容 | " + inputStr);
+
+        // 校验空字符串
+        if (inputStr.isEmpty()) {
+            LogUtils.w(TAG, "getIntFromEditText: 输入框内容为空，返回默认值 " + DEFAULT_INT_VALUE);
+            return DEFAULT_INT_VALUE;
+        }
+
+        // 安全转换整数，捕获格式异常
+        try {
+            int result = Integer.parseInt(inputStr);
+            LogUtils.d(TAG, "getIntFromEditText: 转换成功 | 结果=" + result);
+            return result;
+        } catch (NumberFormatException e) {
+            LogUtils.e(TAG, "getIntFromEditText: 内容不是有效整数 | 输入内容=" + inputStr, e);
+            return DEFAULT_INT_VALUE;
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/IntUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/IntUtils.java
new file mode 100644
index 0000000..a5564c8
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/IntUtils.java
@@ -0,0 +1,64 @@
+package cc.winboll.studio.contacts.utils;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/04/13 01:16:28
+ * @Describe Int数字操作工具集：提供整数范围限制、数值边界校准功能
+ */
+public class IntUtils {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "IntUtils";
+
+    // ====================== 核心工具方法区 ======================
+    /**
+     * 将整数限制在指定区间内，自动校准超出边界的数值
+     * @param origin  原始整数
+     * @param range_a 区间端点1（无需区分大小）
+     * @param range_b 区间端点2（无需区分大小）
+     * @return 校准后的整数，结果始终在 [min(range_a,range_b), max(range_a,range_b)] 内
+     */
+    public static int getIntInRange(int origin, int range_a, int range_b) {
+        int min = Math.min(range_a, range_b);
+        int max = Math.max(range_a, range_b);
+        int res = Math.min(origin, max);
+        res = Math.max(res, min);
+
+        // 打印调试日志，记录参数与计算结果
+        LogUtils.d(TAG, String.format("getIntInRange: 原始值=%d, 区间=[%d,%d], 校准后=%d",
+									  origin, min, max, res));
+        return res;
+    }
+
+    // ====================== 单元测试方法区 ======================
+    /**
+     * 单元测试：验证 getIntInRange 方法在不同场景下的正确性
+     */
+    public static void unittest_getIntInRange() {
+        LogUtils.i(TAG, "unittest_getIntInRange: 开始执行单元测试");
+
+        // 正数区间测试
+        LogUtils.d(TAG, String.format("测试1: getIntInRange(-100, 5, 10) = %d", getIntInRange(-100, 5, 10)));
+        LogUtils.d(TAG, String.format("测试2: getIntInRange(8, 5, 10) = %d", getIntInRange(8, 5, 10)));
+        LogUtils.d(TAG, String.format("测试3: getIntInRange(200, 5, 10) = %d", getIntInRange(200, 5, 10)));
+
+        // 跨正负区间测试
+        LogUtils.d(TAG, String.format("测试4: getIntInRange(-100, -5, 10) = %d", getIntInRange(-100, -5, 10)));
+        LogUtils.d(TAG, String.format("测试5: getIntInRange(9, -5, 10) = %d", getIntInRange(9, -5, 10)));
+        LogUtils.d(TAG, String.format("测试6: getIntInRange(100, -5, 10) = %d", getIntInRange(100, -5, 10)));
+
+        // 端点顺序颠倒测试
+        LogUtils.d(TAG, String.format("测试7: getIntInRange(500, 5, -10) = %d", getIntInRange(500, 5, -10)));
+        LogUtils.d(TAG, String.format("测试8: getIntInRange(4, 5, -10) = %d", getIntInRange(4, 5, -10)));
+        LogUtils.d(TAG, String.format("测试9: getIntInRange(-20, 5, -10) = %d", getIntInRange(-20, 5, -10)));
+
+        // 大数区间测试
+        LogUtils.d(TAG, String.format("测试10: getIntInRange(500, 50, 10) = %d", getIntInRange(500, 50, 10)));
+        LogUtils.d(TAG, String.format("测试11: getIntInRange(30, 50, 10) = %d", getIntInRange(30, 50, 10)));
+        LogUtils.d(TAG, String.format("测试12: getIntInRange(6, 50, 10) = %d", getIntInRange(6, 50, 10)));
+
+        LogUtils.i(TAG, "unittest_getIntInRange: 单元测试执行完毕");
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/NotificationManagerUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/NotificationManagerUtils.java
new file mode 100644
index 0000000..1cc3bae
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/NotificationManagerUtils.java
@@ -0,0 +1,505 @@
+package cc.winboll.studio.contacts.utils;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.media.RingtoneManager;
+import android.os.Build;
+import android.provider.Settings;
+
+import cc.winboll.studio.contacts.MainActivity;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * 通知工具类：统一管理前台服务/临时通知
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2025/12/14 21:01:00
+ * @LastEditTime 2026/01/07 22:00:00
+ * @Describe 适配API30，支持拨号服务前台保活通知、临时通知提醒，提供通知的创建、更新、取消功能；支持通知版本管理，版本变更时自动清理旧渠道
+ */
+public class NotificationManagerUtils {
+    // ================================== 静态常量（置顶统一管理，杜绝魔法值）=================================
+    public static final String TAG = "NotificationManagerUtils";
+    // ********** 新增：通知版本管理常量 **********
+    /** 通知版本标识（源码标记版本，变更时会清理旧渠道） */
+    public static final String NOTIFICATION_VERSION = "v1.0.3";
+    /** SP存储键：已保存的通知版本 */
+    private static final String SP_KEY_NOTIFICATION_VERSION = "sp_key_notification_version";
+    /** SP文件名 */
+    private static final String SP_NAME_NOTIFICATION = "sp_notification_manager";
+    // ******************************************
+    // 通知渠道ID（API26+ 必需，区分通知类型）
+    public static final String CHANNEL_ID_FOREGROUND = "cc.winboll.studio.contacts.channel.foreground";
+    public static final String CHANNEL_ID_TEMPORARY = "cc.winboll.studio.contacts.channel.temporary";
+    // 通知ID（唯一标识，避免重复）
+    public static final int NOTIFY_ID_FOREGROUND_SERVICE = 1001;
+    public static final int NOTIFY_ID_TEMPORARY = 1002;
+    // 低版本兼容：默认通知图标（API<21 避免显示异常）
+    private static final int NOTIFICATION_DEFAULT_ICON = R.drawable.ic_launcher;
+    // 通知内容兜底常量
+    private static final String FOREGROUND_NOTIFY_TITLE_DEFAULT = "拨号服务前台通知";
+    private static final String FOREGROUND_NOTIFY_CONTENT_DEFAULT = "前台通知内容";
+    private static final String TEMPORARY_NOTIFY_TITLE_DEFAULT = "拨号服务临时通知";
+    private static final String TEMPORARY_NOTIFY_CONTENT_DEFAULT = "临时通知内容";
+    // PendingIntent请求码
+    private static final int PENDING_INTENT_REQUEST_CODE_FOREGROUND = 0;
+    private static final int PENDING_INTENT_REQUEST_CODE_TEMPORARY = 1;
+    // 消息通知自增ID（起始值）
+    private static int snMessageNotificationID = 10000;
+
+    // ================================== 成员变量（私有封装，按依赖优先级排序）=================================
+    // 核心上下文（应用级，避免内存泄漏）
+    private Context mContext;
+    // 系统通知服务（核心依赖）
+    private NotificationManager mNotificationManager;
+    // 前台服务通知实例（单独持有，便于更新/取消）
+    private Notification mForegroundServiceNotify;
+    // ********** 新增：SP实例（用于版本存储） **********
+    private SharedPreferences mSp;
+
+    // ================================== 构造方法（初始化核心资源，前置校验）=================================
+    public NotificationManagerUtils(Context context) {
+        LogUtils.d(TAG, "NotificationManagerUtils() 构造方法调用 | context=" + context);
+        // 前置校验：Context非空
+        if (context == null) {
+            LogUtils.e(TAG, "NotificationManagerUtils() 构造失败：context is null");
+            return;
+        }
+        // 初始化核心资源
+        this.mContext = context.getApplicationContext();
+        this.mNotificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        // ********** 新增：初始化SP **********
+        this.mSp = mContext.getSharedPreferences(SP_NAME_NOTIFICATION, Context.MODE_PRIVATE);
+        LogUtils.d(TAG, "NotificationManagerUtils() 核心资源初始化完成 | mContext=" + mContext + " | mNotificationManager=" + mNotificationManager + " | mSp=" + mSp);
+
+        // ********** 新增：版本检查与旧渠道清理 **********
+        checkNotificationVersionAndCleanOldChannels();
+
+        // 初始化通知渠道（API26+ 必需）
+        initNotificationChannels();
+        LogUtils.d(TAG, "NotificationManagerUtils() 构造完成");
+    }
+
+    // ================================== 新增核心方法：通知版本检查与旧渠道清理 =================================
+    /**
+     * 检查当前通知版本与SP中保存的版本是否一致
+     * 若不一致，清理所有旧通知渠道，并更新SP中的版本记录
+     */
+    private void checkNotificationVersionAndCleanOldChannels() {
+        LogUtils.d(TAG, "checkNotificationVersionAndCleanOldChannels() 方法调用 | 源码版本=" + NOTIFICATION_VERSION + " | SP版本=" + getSavedNotificationVersion());
+        // 1. 版本一致，无需处理
+        if (NOTIFICATION_VERSION.equals(getSavedNotificationVersion())) {
+            LogUtils.d(TAG, "checkNotificationVersionAndCleanOldChannels() 版本一致，无需清理渠道");
+            return;
+        }
+
+        // 2. 版本不一致，清理所有旧渠道
+        LogUtils.w(TAG, "checkNotificationVersionAndCleanOldChannels() 版本不一致，开始清理所有旧通知渠道");
+        cleanAllNotificationChannels();
+
+        // 3. 取消所有旧通知
+        cancelAllNotifications();
+        LogUtils.d(TAG, "checkNotificationVersionAndCleanOldChannels() 已取消所有旧通知");
+
+        // 4. 更新SP中的版本记录
+        saveNotificationVersion(NOTIFICATION_VERSION);
+        LogUtils.d(TAG, "checkNotificationVersionAndCleanOldChannels() 已更新SP版本记录为：" + NOTIFICATION_VERSION);
+    }
+
+    /**
+     * 从SP中获取已保存的通知版本
+     * @return 已保存的版本号，无则返回空字符串
+     */
+    private String getSavedNotificationVersion() {
+        return mSp.getString(SP_KEY_NOTIFICATION_VERSION, "");
+    }
+
+    /**
+     * 将当前通知版本保存到SP
+     * @param version 要保存的版本号
+     */
+    private void saveNotificationVersion(String version) {
+        mSp.edit().putString(SP_KEY_NOTIFICATION_VERSION, version).commit();
+    }
+
+    /**
+     * 清理所有已创建的通知渠道（API26+ 有效）
+     */
+    private void cleanAllNotificationChannels() {
+        LogUtils.d(TAG, "cleanAllNotificationChannels() 方法调用");
+        // API<26 无渠道机制，直接返回
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || mNotificationManager == null) {
+            LogUtils.d(TAG, "cleanAllNotificationChannels() API<26 或 NotificationManager为空，无需清理");
+            return;
+        }
+
+        // 遍历所有渠道并删除
+        for (NotificationChannel channel : mNotificationManager.getNotificationChannels()) {
+            LogUtils.d(TAG, "cleanAllNotificationChannels() 正在删除渠道：" + channel.getId() + " | " + channel.getName());
+            mNotificationManager.deleteNotificationChannel(channel.getId());
+        }
+        LogUtils.d(TAG, "cleanAllNotificationChannels() 所有旧渠道清理完成");
+    }
+
+    // ================================== 核心初始化方法（通知渠道，API分级适配）=================================
+    /**
+     * 初始化通知渠道：前台服务渠道（无铃声+无振动）、临时提醒渠道（系统默认铃声+无振动）
+     */
+    private void initNotificationChannels() {
+        LogUtils.d(TAG, "initNotificationChannels() 执行通知渠道初始化");
+        // API<26 无渠道机制，直接返回
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            LogUtils.d(TAG, "initNotificationChannels() API<26，无需创建渠道");
+            return;
+        }
+        // 通知服务为空，避免空指针
+        if (mNotificationManager == null) {
+            LogUtils.e(TAG, "initNotificationChannels() 失败：NotificationManager is null");
+            return;
+        }
+
+        // 1. 拨号前台服务渠道（低优先级，后台保活无打扰）
+        NotificationChannel foregroundChannel = new NotificationChannel(
+			CHANNEL_ID_FOREGROUND,
+			"拨号前台服务",
+			NotificationManager.IMPORTANCE_LOW
+        );
+        foregroundChannel.setDescription("拨号前台服务后台运行，无声音、无振动");
+        foregroundChannel.enableLights(false);
+        foregroundChannel.enableVibration(false);
+        foregroundChannel.setSound(null, null); // 强制无铃声
+        foregroundChannel.setShowBadge(false);
+        foregroundChannel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
+        LogUtils.d(TAG, "initNotificationChannels() 拨号前台服务渠道配置完成");
+
+        // 2. 其他临时通知渠道（中优先级，系统默认铃声，无振动）
+        NotificationChannel temporaryChannel = new NotificationChannel(
+			CHANNEL_ID_TEMPORARY,
+			"临时通知",
+			NotificationManager.IMPORTANCE_DEFAULT
+        );
+        temporaryChannel.setDescription("其他临时通知，系统默认铃声，无振动");
+        temporaryChannel.enableLights(true);
+        temporaryChannel.enableVibration(false);
+        temporaryChannel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION), Notification.AUDIO_ATTRIBUTES_DEFAULT);
+        temporaryChannel.setShowBadge(false);
+        temporaryChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
+        LogUtils.d(TAG, "initNotificationChannels() 其他临时通知渠道配置完成");
+
+        // 注册渠道到系统
+        mNotificationManager.createNotificationChannel(foregroundChannel);
+        mNotificationManager.createNotificationChannel(temporaryChannel);
+        LogUtils.d(TAG, "initNotificationChannels() 成功：创建前台服务+其他临时通知渠道");
+    }
+
+    // ================================== 对外核心方法（前台服务通知：启动/更新/取消）=================================
+    /**
+     * 启动前台服务通知（API30适配，无铃声）
+     * @param service 前台服务实例
+     * @param message 通知内容
+     */
+    public void startForegroundServiceNotify(Service service, String message) {
+        LogUtils.d(TAG, "startForegroundServiceNotify() 方法调用 | notifyId=" + NOTIFY_ID_FOREGROUND_SERVICE + " | service=" + service + " | message=" + message);
+        // 前置校验：参数非空
+        if (service == null || mNotificationManager == null) {
+            LogUtils.e(TAG, "startForegroundServiceNotify() 失败：param is null | service=" + service + " | mNotificationManager=" + mNotificationManager);
+            return;
+        }
+
+        // 构建前台通知
+        mForegroundServiceNotify = buildForegroundNotification(message);
+        if (mForegroundServiceNotify == null) {
+            LogUtils.e(TAG, "startForegroundServiceNotify() 失败：构建通知为空");
+            return;
+        }
+
+        // 启动前台服务（API30无FOREGROUND_SERVICE_TYPE限制）
+        try {
+            service.startForeground(NOTIFY_ID_FOREGROUND_SERVICE, mForegroundServiceNotify);
+            LogUtils.d(TAG, "startForegroundServiceNotify() 成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "startForegroundServiceNotify() 异常", e);
+        }
+    }
+
+    /**
+     * 更新前台服务通知内容（复用通知ID，保持无铃声）
+     * @param message 新的通知内容
+     */
+    public void updateForegroundServiceNotify(String message) {
+        LogUtils.d(TAG, "updateForegroundServiceNotify() 方法调用 | notifyId=" + NOTIFY_ID_FOREGROUND_SERVICE + " | message=" + message);
+        if (mNotificationManager == null) {
+            LogUtils.e(TAG, "updateForegroundServiceNotify() 失败：mNotificationManager is null");
+            return;
+        }
+
+        mForegroundServiceNotify = buildForegroundNotification(message);
+        if (mForegroundServiceNotify == null) {
+            LogUtils.e(TAG, "updateForegroundServiceNotify() 失败：构建通知为空");
+            return;
+        }
+
+        try {
+            mNotificationManager.notify(NOTIFY_ID_FOREGROUND_SERVICE, mForegroundServiceNotify);
+            LogUtils.d(TAG, "updateForegroundServiceNotify() 成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "updateForegroundServiceNotify() 异常", e);
+        }
+    }
+
+    /**
+     * 取消前台服务通知（Service销毁时调用）
+     */
+    public void cancelForegroundServiceNotify() {
+        LogUtils.d(TAG, "cancelForegroundServiceNotify() 方法调用 | notifyId=" + NOTIFY_ID_FOREGROUND_SERVICE);
+        cancelNotification(NOTIFY_ID_FOREGROUND_SERVICE);
+        mForegroundServiceNotify = null;
+        LogUtils.d(TAG, "cancelForegroundServiceNotify() 成功");
+    }
+
+    // ================================== 对外核心方法（临时通知：发送）=================================
+    /**
+     * 发送临时通知（自增ID，避免覆盖，系统默认铃声）
+     * @param context 上下文
+     * @param message 通知内容
+     */
+    public synchronized void showTemporaryNotification(Context context, String message) {
+        snMessageNotificationID++;
+        LogUtils.d(TAG, "showTemporaryNotification() 方法调用 | notifyId=" + snMessageNotificationID + " | context=" + context + " | message=" + message);
+        // 前置校验：参数非空
+        if (context == null || mNotificationManager == null) {
+            LogUtils.e(TAG, "showTemporaryNotification() 失败：param is null | context=" + context + " | mNotificationManager=" + mNotificationManager);
+            return;
+        }
+
+        Notification temporaryNotify = buildTemporaryNotification(context, message);
+        if (temporaryNotify == null) {
+            LogUtils.e(TAG, "showTemporaryNotification() 失败：构建通知为空");
+            return;
+        }
+
+        try {
+            mNotificationManager.notify(snMessageNotificationID, temporaryNotify);
+            LogUtils.d(TAG, "showTemporaryNotification() 成功 | notifyId=" + snMessageNotificationID);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "showTemporaryNotification() 异常 | notifyId=" + snMessageNotificationID, e);
+        }
+    }
+
+    // ================================== 对外工具方法（通知取消：单个/全部）=================================
+    /**
+     * 取消指定ID的通知
+     * @param notifyId 通知唯一标识
+     */
+    public void cancelNotification(int notifyId) {
+        LogUtils.d(TAG, "cancelNotification() 方法调用 | notifyId=" + notifyId);
+        if (mNotificationManager == null) {
+            LogUtils.e(TAG, "cancelNotification() 失败：NotificationManager is null");
+            return;
+        }
+        try {
+            mNotificationManager.cancel(notifyId);
+            LogUtils.d(TAG, "cancelNotification() 成功 | notifyId=" + notifyId);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "cancelNotification() 异常 | notifyId=" + notifyId, e);
+        }
+    }
+
+    /**
+     * 取消所有通知（兜底场景使用）
+     */
+    public void cancelAllNotifications() {
+        LogUtils.d(TAG, "cancelAllNotifications() 方法调用");
+        if (mNotificationManager == null) {
+            LogUtils.e(TAG, "cancelAllNotifications() 失败：NotificationManager is null");
+            return;
+        }
+        try {
+            mNotificationManager.cancelAll();
+            LogUtils.d(TAG, "cancelAllNotifications() 成功");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "cancelAllNotifications() 异常", e);
+        }
+    }
+
+    // ================================== 内部辅助方法（通知构建：前台服务通知）=================================
+    /**
+     * 构建前台服务通知（全版本无铃声+无振动）
+     * @param message 通知内容
+     * @return 构建完成的前台通知实例
+     */
+    private Notification buildForegroundNotification(String message) {
+        LogUtils.d(TAG, "buildForegroundNotification() 方法调用 | message=" + message);
+        if (mContext == null) {
+            LogUtils.e(TAG, "buildForegroundNotification() 失败：mContext is null");
+            return null;
+        }
+
+        // 内容兜底
+        String title = FOREGROUND_NOTIFY_TITLE_DEFAULT;
+        String content = (message != null && !message.isEmpty()) ? message : FOREGROUND_NOTIFY_CONTENT_DEFAULT;
+        LogUtils.d(TAG, "buildForegroundNotification() 内容兜底完成 | title=" + title + " | content=" + content);
+
+        Notification.Builder builder;
+        // API分级构建
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder = new Notification.Builder(mContext, CHANNEL_ID_FOREGROUND);
+            LogUtils.d(TAG, "buildForegroundNotification() 使用API26+渠道构建");
+        } else {
+            builder = new Notification.Builder(mContext);
+            builder.setSound(null);
+            builder.setVibrate(new long[]{0});
+            builder.setDefaults(0);
+            LogUtils.d(TAG, "buildForegroundNotification() 使用API<26手动配置");
+        }
+
+        // 通用配置
+        builder.setSmallIcon(NOTIFICATION_DEFAULT_ICON)
+			.setContentTitle(title)
+			.setContentText(content)
+			.setAutoCancel(false)
+			.setOngoing(true)
+			.setWhen(System.currentTimeMillis())
+			.setContentIntent(createJumpPendingIntent(mContext, PENDING_INTENT_REQUEST_CODE_FOREGROUND));
+
+        // API21+ 新增大图标+主题色
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            builder.setLargeIcon(getAppIcon(mContext))
+				.setColor(mContext.getResources().getColor(R.color.colorPrimary))
+				.setPriority(Notification.PRIORITY_LOW);
+            LogUtils.d(TAG, "buildForegroundNotification() 补充API21+配置");
+        }
+
+        Notification notification = builder.build();
+        LogUtils.d(TAG, "buildForegroundNotification() 成功构建前台通知");
+        return notification;
+    }
+
+    // ================================== 内部辅助方法（通知构建：临时通知）=================================
+    /**
+     * 构建临时通知（全版本系统默认铃声+无振动）
+     * @param context 上下文
+     * @param message 通知内容
+     * @return 构建完成的临时通知实例
+     */
+    private Notification buildTemporaryNotification(Context context, String message) {
+        LogUtils.d(TAG, "buildTemporaryNotification() 方法调用 | context=" + context + " | message=" + message);
+        if (context == null) {
+            LogUtils.e(TAG, "buildTemporaryNotification() 失败：context is null");
+            return null;
+        }
+
+        // 内容兜底
+        String title = TEMPORARY_NOTIFY_TITLE_DEFAULT;
+        String content = (message != null && !message.isEmpty()) ? message : TEMPORARY_NOTIFY_CONTENT_DEFAULT;
+        LogUtils.d(TAG, "buildTemporaryNotification() 内容兜底完成 | title=" + title + " | content=" + content);
+
+        Notification.Builder builder;
+        // API分级构建
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            builder = new Notification.Builder(context, CHANNEL_ID_TEMPORARY);
+            LogUtils.d(TAG, "buildTemporaryNotification() 使用API26+渠道构建");
+        } else {
+            builder = new Notification.Builder(context);
+            builder.setSound(Settings.System.DEFAULT_NOTIFICATION_URI);
+            builder.setVibrate(new long[]{0});
+            builder.setDefaults(Notification.DEFAULT_LIGHTS | Notification.DEFAULT_SOUND);
+            LogUtils.d(TAG, "buildTemporaryNotification() 使用API<26手动配置");
+        }
+
+        // 通用配置
+        builder.setSmallIcon(NOTIFICATION_DEFAULT_ICON)
+			.setContentTitle(title)
+			.setContentText(content)
+			.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION), Notification.AUDIO_ATTRIBUTES_DEFAULT)
+			.setAutoCancel(true)
+			.setOngoing(false)
+			.setWhen(System.currentTimeMillis())
+			.setContentIntent(createJumpPendingIntent(context, PENDING_INTENT_REQUEST_CODE_TEMPORARY));
+
+        // API21+ 新增大图标+主题色
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            builder.setLargeIcon(getAppIcon(context))
+				.setColor(context.getResources().getColor(R.color.colorPrimary))
+				.setPriority(Notification.PRIORITY_DEFAULT);
+            LogUtils.d(TAG, "buildTemporaryNotification() 补充API21+配置");
+        }
+
+        Notification notification = builder.build();
+        LogUtils.d(TAG, "buildTemporaryNotification() 成功构建临时通知");
+        return notification;
+    }
+
+    // ================================== 内部辅助方法（创建跳转PendingIntent，API30安全适配）=================================
+    /**
+     * 创建跳转MainActivity的PendingIntent，API23+ 添加IMMUTABLE标记
+     * @param context 上下文
+     * @param requestCode 请求码
+     * @return 构建完成的PendingIntent
+     */
+    private PendingIntent createJumpPendingIntent(Context context, int requestCode) {
+        LogUtils.d(TAG, "createJumpPendingIntent() 方法调用 | requestCode=" + requestCode + " | context=" + context);
+        Intent intent = new Intent(context, MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        LogUtils.d(TAG, "createJumpPendingIntent() 跳转Intent配置完成");
+
+        // API23+ 必需添加IMMUTABLE，适配API30安全规范
+        int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            flags |= PendingIntent.FLAG_IMMUTABLE;
+            LogUtils.d(TAG, "createJumpPendingIntent() 添加FLAG_IMMUTABLE标记（API23+）");
+        }
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags);
+        LogUtils.d(TAG, "createJumpPendingIntent() 成功 | requestCode=" + requestCode);
+        return pendingIntent;
+    }
+
+    // ================================== 内部辅助方法（获取APP图标，异常兜底）=================================
+    /**
+     * 获取APP图标，失败返回默认图标
+     * @param context 上下文
+     * @return APP图标Bitmap实例
+     */
+    private Bitmap getAppIcon(Context context) {
+        LogUtils.d(TAG, "getAppIcon() 方法调用 | context=" + context);
+        try {
+            PackageInfo pkgInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+            Bitmap appIcon = BitmapFactory.decodeResource(context.getResources(), pkgInfo.applicationInfo.icon);
+            LogUtils.d(TAG, "getAppIcon() 成功：获取应用图标");
+            return appIcon;
+        } catch (PackageManager.NameNotFoundException e) {
+            LogUtils.e(TAG, "getAppIcon() 异常：获取应用图标失败，使用默认图标", e);
+            return BitmapFactory.decodeResource(context.getResources(), NOTIFICATION_DEFAULT_ICON);
+        }
+    }
+
+    // ================================== 资源释放方法（避免内存泄漏）=================================
+    /**
+     * 释放资源，销毁时调用
+     */
+    public void release() {
+        LogUtils.d(TAG, "release() 方法调用：执行资源释放");
+        cancelForegroundServiceNotify();
+        mNotificationManager = null;
+        mContext = null;
+        mSp = null; // ********** 新增：释放SP实例 **********
+        LogUtils.d(TAG, "release() 成功：所有资源已释放");
+    }
+
+    // ================================== 对外 getter 方法（仅前台通知实例，只读）=================================
+    public Notification getForegroundServiceNotify() {
+        return mForegroundServiceNotify;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/PermissionUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/PermissionUtils.java
new file mode 100644
index 0000000..6b3e774
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/PermissionUtils.java
@@ -0,0 +1,254 @@
+package cc.winboll.studio.contacts.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+import android.telecom.TelecomManager;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/12 16:28
+ * @Describe 敏感权限申请工具类（完全适配 Android API 30 + Java 7 语法）
+ * 修复 ACTION_CHANGE_DEFAULT_CALL_SCREENING_APP / EXTRA_PACKAGE_NAME 未定义问题
+ */
+public class PermissionUtils {
+    public static final String TAG = "PermissionUtils";
+
+    // API 版本硬编码常量（Java 7 兼容，不依赖 Build.VERSION_CODES 高版本字段）
+    private static final int ANDROID_6_API = 23;
+    private static final int ANDROID_10_API = 29;
+    private static final int ANDROID_13_API = 33;
+    private static final int ANDROID_14_API = 34;
+
+    // 硬编码系统常量字符串，解决 API 30 下未定义问题
+    private static final String ACTION_CHANGE_DEFAULT_CALL_SCREENING_APP =
+	"android.telecom.action.CHANGE_DEFAULT_CALL_SCREENING_APP";
+    private static final String EXTRA_PACKAGE_NAME =
+	"android.telecom.extra.PACKAGE_NAME";
+
+    // 基础权限组（严格适配 API 30，移除废弃/不存在的权限）
+    public static final String[] BASE_PERMISSIONS = {
+		android.Manifest.permission.READ_CONTACTS,
+		android.Manifest.permission.WRITE_CONTACTS,
+		android.Manifest.permission.READ_CALL_LOG,
+		android.Manifest.permission.CALL_PHONE,
+		android.Manifest.permission.RECORD_AUDIO,
+		android.Manifest.permission.MODIFY_AUDIO_SETTINGS
+    };
+
+    /**
+     * 获取所有需要申请的权限（Java 7 传统 for 循环，无菱形运算符）
+     */
+    public static String[] getAllNeedPermissions() {
+        List<String> permissions = new ArrayList<String>();
+        // Java 7 传统循环遍历数组
+        for (int i = 0; i < BASE_PERMISSIONS.length; i++) {
+            permissions.add(BASE_PERMISSIONS[i]);
+        }
+        // 显式创建数组并转换，避免 Java 7 泛型转换警告
+        String[] permissionArray = new String[permissions.size()];
+        return permissions.toArray(permissionArray);
+    }
+
+    /**
+     * 检查单个权限是否授予（使用 PackageManager 标准常量）
+     */
+    public static boolean checkPermission(@NonNull Context context, @NonNull String permission) {
+        return ActivityCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    /**
+     * 检查权限组是否全部授予（Java 7 传统循环）
+     */
+    public static boolean checkPermissions(@NonNull Context context, @NonNull String[] permissions) {
+        // Java 7 遍历数组，避免增强 for 循环的语法糖问题
+        for (int i = 0; i < permissions.length; i++) {
+            String permission = permissions[i];
+            if (!checkPermission(context, permission)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 申请权限组（Activity 中调用，Java 7 兼容）
+     */
+    public static void requestPermissions(@NonNull FragmentActivity activity,
+                                          @NonNull String[] permissions,
+                                          int requestCode) {
+        ActivityCompat.requestPermissions(activity, permissions, requestCode);
+    }
+
+    /**
+     * 申请权限组（Fragment 中调用，Java 7 兼容）
+     */
+    public static void requestPermissions(@NonNull Fragment fragment,
+                                          @NonNull String[] permissions,
+                                          int requestCode) {
+        fragment.requestPermissions(permissions, requestCode);
+    }
+
+    /**
+     * 检查悬浮窗权限（API 30 适配）
+     */
+    public static boolean isOverlayPermissionGranted(@NonNull Context context) {
+        if (Build.VERSION.SDK_INT >= ANDROID_6_API) {
+            return Settings.canDrawOverlays(context);
+        }
+        // 6.0 以下默认授予
+        return true;
+    }
+
+    /**
+     * 申请悬浮窗权限（Java 7 规范，拆分 Intent 创建步骤）
+     */
+    public static void requestOverlayPermission(@NonNull Context context, int requestCode) {
+        if (Build.VERSION.SDK_INT >= ANDROID_6_API && !isOverlayPermissionGranted(context)) {
+            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+            Uri uri = Uri.parse("package:" + context.getPackageName());
+            intent.setData(uri);
+            if (context instanceof FragmentActivity) {
+                ((FragmentActivity) context).startActivityForResult(intent, requestCode);
+            }
+        }
+    }
+
+    /**
+     * 检查修改系统设置权限（API 30 适配）
+     */
+    public static boolean isWriteSettingsPermissionGranted(@NonNull Context context) {
+        if (Build.VERSION.SDK_INT >= ANDROID_6_API) {
+            return Settings.System.canWrite(context);
+        }
+        // 6.0 以下默认授予
+        return true;
+    }
+
+    /**
+     * 申请修改系统设置权限（Java 7 规范）
+     */
+    public static void requestWriteSettingsPermission(@NonNull Context context, int requestCode) {
+        if (Build.VERSION.SDK_INT >= ANDROID_6_API && !isWriteSettingsPermissionGranted(context)) {
+            Intent intent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
+            Uri uri = Uri.parse("package:" + context.getPackageName());
+            intent.setData(uri);
+            if (context instanceof FragmentActivity) {
+                ((FragmentActivity) context).startActivityForResult(intent, requestCode);
+            }
+        }
+    }
+
+    /**
+     * 检查通话筛选权限（适配 API 30，优化反射逻辑 + 异常捕获）
+     */
+    public static boolean isCallScreeningPermissionGranted(@NonNull Context context) {
+        if (Build.VERSION.SDK_INT >= ANDROID_10_API) {
+            TelecomManager telecomManager = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
+            if (telecomManager == null) {
+                return false;
+            }
+            String defaultPackage = null;
+            // 反射调用高版本方法，捕获所有异常避免崩溃（Java 7 必须显式捕获 Exception）
+            try {
+                Method method = TelecomManager.class.getMethod("getDefaultCallScreeningAppPackage");
+                defaultPackage = (String) method.invoke(telecomManager);
+            } catch (NoSuchMethodException e) {
+                // API 30-32 无此方法，返回 false
+                return false;
+            } catch (Exception e) {
+                // 其他反射异常，返回 false
+                return false;
+            }
+            return defaultPackage != null && defaultPackage.equals(context.getPackageName());
+        }
+        // 10.0 以下无此权限，默认返回 true
+        return true;
+    }
+
+    /**
+     * 申请通话筛选权限（完全适配 API 30，解决 ActivityNotFoundException 崩溃）
+     */
+    public static void requestCallScreeningPermission(@NonNull Context context, int requestCode) {
+        if (Build.VERSION.SDK_INT >= ANDROID_10_API && !isCallScreeningPermissionGranted(context)) {
+            FragmentActivity activity = null;
+            if (context instanceof FragmentActivity) {
+                activity = (FragmentActivity) context;
+            }
+            if (activity == null) {
+                return;
+            }
+
+            Intent intent = null;
+            // 版本分级处理：避免高版本 ACTION 失效
+            if (Build.VERSION.SDK_INT >= ANDROID_14_API) {
+                // Android 14+：跳转默认应用设置页
+                intent = new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);
+                Uri uri = Uri.parse("package:" + context.getPackageName());
+                intent.setData(uri);
+            } else if (Build.VERSION.SDK_INT >= ANDROID_13_API) {
+                // Android 13：使用硬编码 ACTION
+                intent = new Intent(ACTION_CHANGE_DEFAULT_CALL_SCREENING_APP);
+                intent.putExtra(EXTRA_PACKAGE_NAME, context.getPackageName());
+            } else {
+                // API 30-32：直接跳转应用详情页
+                goAppDetailsSettings(context);
+                return;
+            }
+
+            // 捕获 Activity 找不到异常，兜底处理（Java 7 必须显式捕获）
+            try {
+                activity.startActivityForResult(intent, requestCode);
+            } catch (android.content.ActivityNotFoundException e) {
+                // 兜底：跳转应用详情页
+                goAppDetailsSettings(context);
+            }
+        }
+    }
+
+    /**
+     * 跳转应用详情页（权限兜底引导，Java 7 规范）
+     */
+    public static void goAppDetailsSettings(@NonNull Context context) {
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        Uri uri = Uri.fromParts("package", context.getPackageName(), null);
+        intent.setData(uri);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    /**
+     * 解析被拒绝的权限（Java 7 字符串操作，无 Lambda）
+     */
+    public static String getDeniedPermissions(@NonNull Context context, @NonNull String[] permissions) {
+        StringBuilder deniedPerms = new StringBuilder();
+        // Java 7 传统循环遍历权限数组
+        for (int i = 0; i < permissions.length; i++) {
+            String permission = permissions[i];
+            if (!checkPermission(context, permission)) {
+                // 截取权限名称，优化展示
+                int lastDotIndex = permission.lastIndexOf(".");
+                if (lastDotIndex != -1 && lastDotIndex < permission.length() - 1) {
+                    String permName = permission.substring(lastDotIndex + 1);
+                    deniedPerms.append(permName).append("、");
+                }
+            }
+        }
+        // 移除最后一个分隔符（Java 7 字符串操作）
+        if (deniedPerms.length() > 0) {
+            deniedPerms.deleteCharAt(deniedPerms.length() - 1);
+        }
+        return deniedPerms.toString();
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java
new file mode 100644
index 0000000..34641de
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java
@@ -0,0 +1,58 @@
+package cc.winboll.studio.contacts.utils;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import androidx.core.app.ActivityCompat;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/02/26 15:21:48
+ * @Describe 拨打电话工具类：封装拨打电话逻辑与权限校验
+ */
+public class PhoneUtils {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "PhoneUtils";
+    // 拨打电话 Action 与 Uri 前缀
+    private static final String CALL_ACTION = Intent.ACTION_CALL;
+    private static final String TEL_URI_PREFIX = "tel:";
+
+    // ====================== 核心工具方法区 ======================
+    /**
+     * 直接拨打电话（需申请 CALL_PHONE 权限）
+     * @param context     上下文对象
+     * @param phoneNumber 目标电话号码
+     */
+    public static void call(Context context, String phoneNumber) {
+        // 空值校验：防止上下文或号码为空导致异常
+        if (context == null) {
+            LogUtils.e(TAG, "call: Context 为 null，无法执行拨打电话操作");
+            return;
+        }
+        if (phoneNumber == null || phoneNumber.trim().isEmpty()) {
+            LogUtils.e(TAG, "call: 电话号码为空，无法执行拨打电话操作");
+            return;
+        }
+        String targetPhone = phoneNumber.trim();
+        LogUtils.d(TAG, "call: 准备拨打号码 | " + targetPhone);
+
+        // 权限校验：检查是否持有拨打电话权限
+        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+            LogUtils.w(TAG, "call: 缺少 CALL_PHONE 权限，无法直接拨打电话");
+            return;
+        }
+
+        // 构建拨打电话 Intent 并启动
+        Intent callIntent = new Intent(CALL_ACTION);
+        callIntent.setData(Uri.parse(TEL_URI_PREFIX + targetPhone));
+        // 添加 FLAG 支持非 Activity 上下文启动
+        callIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        context.startActivity(callIntent);
+        LogUtils.i(TAG, "call: 拨打电话 Intent 已发送 | 号码=" + targetPhone);
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/utils/RegexPPiUtils.java b/contacts/src/main/java/cc/winboll/studio/contacts/utils/RegexPPiUtils.java
new file mode 100644
index 0000000..1f91c60
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/RegexPPiUtils.java
@@ -0,0 +1,42 @@
+package cc.winboll.studio.contacts.utils;
+
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2024/12/09 19:00:21
+ * @Describe 正则前置校验工具类（RegexPPi）：检验文本是否满足基础正则匹配要求
+ */
+public class RegexPPiUtils {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "RegexPPiUtils";
+    // 基础匹配正则：匹配任意文本（包括空字符串）
+    private static final String BASE_REGEX = ".*";
+    // 预编译正则 Pattern，提升重复调用效率
+    private static final Pattern BASE_PATTERN = Pattern.compile(BASE_REGEX);
+
+    // ====================== 核心校验方法区 ======================
+    /**
+     * 检验文本是否满足基础正则表达式模式（.*）匹配要求
+     * @param text 待校验的文本内容
+     * @return 匹配结果，文本为null时返回false
+     */
+    public static boolean isPPiOK(String text) {
+        // 空值校验，避免空指针异常
+        if (text == null) {
+            LogUtils.w(TAG, "isPPiOK: 待校验文本为 null，返回 false");
+            return false;
+        }
+
+        // 执行正则匹配
+        Matcher matcher = BASE_PATTERN.matcher(text);
+        boolean isMatch = matcher.matches();
+
+        // 打印调试日志，记录校验结果
+        LogUtils.d(TAG, String.format("isPPiOK: 文本=[%s]，匹配结果=%b", text, isMatch));
+        return isMatch;
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/views/DuInfoTextView.java b/contacts/src/main/java/cc/winboll/studio/contacts/views/DuInfoTextView.java
new file mode 100644
index 0000000..3b4a40d
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/views/DuInfoTextView.java
@@ -0,0 +1,117 @@
+package cc.winboll.studio.contacts.views;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.widget.TextView;
+import cc.winboll.studio.contacts.dun.Rules;
+import cc.winboll.studio.contacts.model.SettingsBean;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/03/02 21:11:03
+ * @Describe 云盾防御信息视图控件：展示云盾防御值统计，并支持消息驱动更新
+ */
+public class DuInfoTextView extends TextView {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "DuInfoTextView";
+    public static final int MSG_NOTIFY_INFO_UPDATE = 0;
+
+    // ====================== 成员变量区 ======================
+    private Context mContext;
+    private Handler mHandler;
+
+    // ====================== 构造函数区 ======================
+    public DuInfoTextView(Context context) {
+        super(context);
+        initView(context);
+    }
+
+    public DuInfoTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView(context);
+    }
+
+    public DuInfoTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView(context);
+    }
+
+    public DuInfoTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        initView(context);
+    }
+
+    // ====================== 初始化方法区 ======================
+    private void initView(Context context) {
+        LogUtils.d(TAG, "initView: 开始初始化云盾信息控件");
+        this.mContext = context;
+        initHandler();
+        updateInfo();
+        LogUtils.d(TAG, "initView: 云盾信息控件初始化完成");
+    }
+
+    /**
+     * 初始化 Handler，处理信息更新消息
+     */
+    private void initHandler() {
+        mHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                if (msg.what == MSG_NOTIFY_INFO_UPDATE) {
+                    LogUtils.d(TAG, "handleMessage: 收到信息更新消息，开始刷新视图");
+                    updateInfo();
+                }
+            }
+        };
+    }
+
+    // ====================== 视图更新方法区 ======================
+    /**
+     * 更新云盾防御信息显示
+     */
+    private void updateInfo() {
+        LogUtils.d(TAG, "updateInfo: 开始更新云盾防御信息");
+        // 空值校验，避免上下文为空导致异常
+        if (mContext == null) {
+            LogUtils.w(TAG, "updateInfo: 上下文为空，跳过信息更新");
+            setText("(云盾防御值【--/--】)");
+            return;
+        }
+
+        try {
+            SettingsBean settingsModel = Rules.getInstance(mContext).getSettingsModel();
+            // 校验 SettingsBean 非空，防止空指针
+            if (settingsModel == null) {
+                LogUtils.w(TAG, "updateInfo: SettingsBean 为空，显示默认值");
+                setText("(云盾防御值【--/--】)");
+                return;
+            }
+
+            int currentCount = settingsModel.getDunCurrentCount();
+            int totalCount = settingsModel.getDunTotalCount();
+            String info = String.format("(云盾防御值【%d/%d】)", currentCount, totalCount);
+            setText(info);
+            LogUtils.d(TAG, "updateInfo: 云盾防御信息更新完成 | " + info);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "updateInfo: 信息更新异常", e);
+            setText("(云盾防御值【--/--】)");
+        }
+    }
+
+    /**
+     * 对外提供的信息更新通知方法
+     */
+    public void notifyInfoUpdate() {
+        LogUtils.d(TAG, "notifyInfoUpdate: 发送信息更新通知");
+        if (mHandler != null) {
+            mHandler.sendMessage(mHandler.obtainMessage(MSG_NOTIFY_INFO_UPDATE));
+        } else {
+            LogUtils.w(TAG, "notifyInfoUpdate: Handler 未初始化，无法发送更新消息");
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/views/DunTemperatureView.java b/contacts/src/main/java/cc/winboll/studio/contacts/views/DunTemperatureView.java
new file mode 100644
index 0000000..7cce563
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/views/DunTemperatureView.java
@@ -0,0 +1,393 @@
+package cc.winboll.studio.contacts.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.util.WeakHashMap;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/19 14:04:20
+ * @Describe 云盾华氏度热力视图，垂直盾值温度视图控件（带颜色渐变+静态Handler更新）
+ * 采用绘图方式展示盾值温度，填充色随盾值比例渐变，支持设置文本在温度条左侧/右侧，底部对齐竖排显示
+ * 温度条宽度=5dp，文本区宽度固定=5dp，整体左右边距=0，无任何多余空白间距
+ */
+public class DunTemperatureView extends View {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "DunTemperatureView";
+    // 控件默认高度
+    private static final int DEFAULT_HEIGHT = 200;
+    // 温度条宽度（5dp）、文本区宽度（固定5dp）
+    private static final int THERMOMETER_WIDTH_DP = 5;
+    private static final int TEXT_AREA_WIDTH_DP = 5;
+    // 填充区域内边距（左右=0，上下=2避免贴边）
+    private static final int FILL_PADDING_HORIZONTAL = 0;
+    private static final int FILL_PADDING_VERTICAL = 2;
+    // 竖排文本字间距
+    private static final float TEXT_CHAR_SPACING = 8f;
+    // Handler消息标识
+    public static final int MSG_UPDATE_DUN_VALUE = 0x01;
+    // 消息参数Key
+    public static final String KEY_MAX_VALUE = "max_value";
+    public static final String KEY_CURRENT_VALUE = "current_value";
+
+    // ====================== 静态成员区 ======================
+    // 弱引用缓存控件实例，避免内存泄漏
+    private static WeakHashMap<DunTemperatureView, Object> sViewCache = new WeakHashMap<>();
+    // 静态Handler，处理跨线程更新消息
+    private static Handler sStaticHandler;
+
+    // ====================== 成员变量区 ======================
+    // 画笔相关
+    private Paint mThermometerPaint;
+    private Paint mFillPaint;
+    private Paint mTextPaint;
+    // 尺寸参数（dp转px后的值）
+    private int mThermometerWidth;
+    private int mTextAreaWidth;
+    private int mMaxValue = 100; // 最高盾值
+    private int mCurrentValue = 0; // 当前盾值
+    private RectF mThermometerRect; // 温度条矩形区域
+    // 渐变颜色配置（低→中→高 对应绿→黄→红）
+    private int[] mGradientColors = {Color.GREEN, Color.YELLOW, Color.RED};
+    private float[] mGradientPositions = {0.0f, 0.5f, 1.0f};
+    // 布局配置：true=文本在温度条右侧（默认），false=文本在温度条左侧
+    private boolean isTextOnRight = true;
+    // 其他颜色配置
+    private int mBorderColor = Color.parseColor("#FF444444");
+    private int mTextColor = Color.parseColor("#FF000000");
+
+    // ====================== 静态代码块 ======================
+    static {
+        // 初始化静态Handler，绑定主线程Looper
+        sStaticHandler = new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                if (msg.what == MSG_UPDATE_DUN_VALUE) {
+                    // 获取消息中的盾值参数
+                    int maxValue = msg.getData().getInt(KEY_MAX_VALUE, 100);
+                    int currentValue = msg.getData().getInt(KEY_CURRENT_VALUE, 0);
+                    LogUtils.d(TAG, "sStaticHandler: 收到更新消息，max=" + maxValue + ", current=" + currentValue);
+
+                    // 遍历缓存的控件实例，更新所有实例
+                    for (DunTemperatureView view : sViewCache.keySet()) {
+                        if (view != null && view.isShown()) {
+                            view.setMaxValue(maxValue);
+                            view.setCurrentValue(currentValue);
+                        }
+                    }
+                }
+            }
+        };
+    }
+
+    // ====================== 构造函数区 ======================
+    public DunTemperatureView(Context context) {
+        super(context);
+        init();
+    }
+
+    public DunTemperatureView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public DunTemperatureView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    // ====================== 初始化方法区 ======================
+    /**
+     * 初始化画笔和参数
+     */
+    private void init() {
+        LogUtils.d(TAG, "init: 开始初始化云盾温度视图控件");
+        // dp转px（适配不同分辨率）
+        mThermometerWidth = dp2px(getContext(), THERMOMETER_WIDTH_DP);
+        mTextAreaWidth = dp2px(getContext(), TEXT_AREA_WIDTH_DP);
+        LogUtils.d(TAG, "init: 温度条宽度5dp转px=" + mThermometerWidth + "，文本区宽度5dp转px=" + mTextAreaWidth);
+
+        // 温度条边框画笔（宽度1px，适配5dp宽度）
+        mThermometerPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mThermometerPaint.setColor(mBorderColor);
+        mThermometerPaint.setStyle(Paint.Style.STROKE);
+        mThermometerPaint.setStrokeWidth(1);
+
+        // 温度条填充画笔（支持渐变）
+        mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mFillPaint.setStyle(Paint.Style.FILL);
+
+        // 文本画笔（适配5dp窄文本区，文字居中绘制）
+        mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mTextPaint.setColor(mTextColor);
+        mTextPaint.setTextSize(18); // 缩小字号适配5dp窄文本区（避免文字超出）
+        mTextPaint.setTextAlign(Paint.Align.CENTER);
+        mTextPaint.setFakeBoldText(true); // 文字加粗，提升窄区域可读性
+
+        // 初始化温度条矩形
+        mThermometerRect = new RectF();
+
+        // 将当前实例加入静态缓存
+        sViewCache.put(this, null);
+        LogUtils.d(TAG, "init: 云盾温度视图控件初始化完成，实例已加入缓存");
+    }
+
+    // ====================== 工具方法区 ======================
+    /**
+     * dp 转 px（适配不同屏幕分辨率）
+     */
+    private int dp2px(Context context, float dpValue) {
+        return (int) TypedValue.applyDimension(
+			TypedValue.COMPLEX_UNIT_DIP,
+			dpValue,
+			context.getResources().getDisplayMetrics()
+        );
+    }
+
+    // ====================== 对外控制方法区 ======================
+    /**
+     * 设置文本相对于温度条的位置
+     * @param isOnRight true=文本在温度条右侧（默认），false=文本在温度条左侧
+     */
+    public void setTextPosition(boolean isOnRight) {
+        this.isTextOnRight = isOnRight;
+        invalidate(); // 刷新布局绘制
+    }
+
+    /**
+     * 获取当前文本位置配置
+     * @return true=右侧，false=左侧
+     */
+    public boolean isTextOnRight() {
+        return isTextOnRight;
+    }
+
+    // ====================== 对外静态方法区 ======================
+    /**
+     * 静态外部方法：发送消息更新所有 DunTemperatureView 实例的盾值
+     * 可在子线程中调用
+     * @param maxValue 最高盾值
+     * @param currentValue 当前盾值
+     */
+    public static void updateDunValue(int maxValue, int currentValue) {
+        if (sStaticHandler == null) {
+            LogUtils.w(TAG, "updateDunValue: 静态Handler未初始化");
+            return;
+        }
+        // 封装参数到消息
+        Message msg = sStaticHandler.obtainMessage(MSG_UPDATE_DUN_VALUE);
+        msg.getData().putInt(KEY_MAX_VALUE, maxValue);
+        msg.getData().putInt(KEY_CURRENT_VALUE, currentValue);
+        // 发送消息
+        sStaticHandler.sendMessage(msg);
+    }
+
+    // ====================== 对外实例方法区 ======================
+    /**
+     * 设置最高盾值
+     * @param maxValue 最高盾值（需大于0）
+     */
+    public void setMaxValue(int maxValue) {
+        if (maxValue <= 0) {
+            LogUtils.w(TAG, "setMaxValue: 最高盾值必须大于0，当前值=" + maxValue);
+            return;
+        }
+        this.mMaxValue = maxValue;
+        // 限制当前值不超过最大值
+        mCurrentValue = Math.min(mCurrentValue, maxValue);
+        invalidate(); // 重绘控件
+    }
+
+    /**
+     * 设置当前盾值
+     * @param currentValue 当前盾值（范围 0~maxValue）
+     */
+    public void setCurrentValue(int currentValue) {
+        int oldValue = this.mCurrentValue;
+        this.mCurrentValue = Math.max(0, Math.min(currentValue, mMaxValue));
+        if (oldValue != this.mCurrentValue) {
+            LogUtils.d(TAG, "setCurrentValue: 当前盾值从" + oldValue + "更新为" + mCurrentValue);
+            invalidate(); // 重绘控件
+        }
+    }
+
+    /**
+     * 获取当前盾值
+     */
+    public int getCurrentValue() {
+        return mCurrentValue;
+    }
+
+    /**
+     * 获取最高盾值
+     */
+    public int getMaxValue() {
+        return mMaxValue;
+    }
+
+    /**
+     * 设置自定义渐变颜色
+     * @param colors 渐变颜色数组（至少2种颜色）
+     * @param positions 颜色位置数组（与colors长度一致，0.0~1.0）
+     */
+    public void setGradientColors(int[] colors, float[] positions) {
+        if (colors == null || colors.length < 2 || positions == null || positions.length != colors.length) {
+            LogUtils.w(TAG, "setGradientColors: 渐变颜色参数不合法，颜色数组长度=" + (colors == null ? "null" : colors.length));
+            return;
+        }
+        this.mGradientColors = colors;
+        this.mGradientPositions = positions;
+        LogUtils.d(TAG, "setGradientColors: 自定义渐变颜色已设置");
+        invalidate();
+    }
+
+    /**
+     * 设置温度条边框颜色
+     */
+    public void setBorderColor(int color) {
+        this.mBorderColor = color;
+        mThermometerPaint.setColor(color);
+        LogUtils.d(TAG, "setBorderColor: 边框颜色已更新");
+        invalidate();
+    }
+
+    /**
+     * 设置文本颜色
+     */
+    public void setTextColor(int color) {
+        this.mTextColor = color;
+        mTextPaint.setColor(color);
+        LogUtils.d(TAG, "setTextColor: 文本颜色已更新");
+        invalidate();
+    }
+
+    // ====================== 生命周期方法 ======================
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        // 控件从窗口移除时，从缓存中清除，避免内存泄漏
+        sViewCache.remove(this);
+        LogUtils.d(TAG, "onDetachedFromWindow: 控件实例已从缓存移除");
+    }
+
+    // ====================== 测量与绘制区 ======================
+    /**
+     * 测量辅助函数
+     */
+    private int measureSize(int defaultSize, int measureSpec) {
+        int result = defaultSize;
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+        if (specMode == MeasureSpec.EXACTLY) {
+            result = specSize;
+        } else if (specMode == MeasureSpec.AT_MOST) {
+            result = Math.min(defaultSize, specSize);
+        }
+        return result;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        // 强制控件整体左右内边距=0，彻底消除外部边距
+        setPadding(0, getPaddingTop(), 0, getPaddingBottom());
+
+        // 控件宽度=温度条宽度 + 文本区宽度（均为5dp转px，无额外空白）
+        int defaultWidth = mThermometerWidth + mTextAreaWidth;
+        int width = measureSize(defaultWidth, widthMeasureSpec);
+        int height = measureSize(DEFAULT_HEIGHT, heightMeasureSpec);
+        setMeasuredDimension(width, height);
+
+        // 根据文本位置配置，计算温度条矩形坐标
+        float thermometerLeft, thermometerRight;
+        if (isTextOnRight) {
+            // 文本在右侧：温度条靠左，右接文本区
+            thermometerLeft = 0;
+            thermometerRight = thermometerLeft + mThermometerWidth;
+        } else {
+            // 文本在左侧：温度条靠右，左接文本区
+            thermometerLeft = width - mThermometerWidth;
+            thermometerRight = width;
+        }
+        float thermometerTop = getPaddingTop();
+        float thermometerBottom = height - getPaddingBottom();
+        mThermometerRect.set(thermometerLeft, thermometerTop, thermometerRight, thermometerBottom);
+
+        LogUtils.v(TAG, "onMeasure: 文本位置=" + (isTextOnRight ? "右侧" : "左侧") + "，控件尺寸=" + width + "x" + height + "，温度条区域=" + mThermometerRect.toShortString());
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        // 1. 绘制温度条边框（5dp宽度，小圆角适配）
+        canvas.drawRoundRect(mThermometerRect, 3, 3, mThermometerPaint);
+
+        // 2. 计算填充高度（根据当前值占最大值的比例）
+        float fillRatio = (float) mCurrentValue / mMaxValue;
+        float fillHeight = mThermometerRect.height() * fillRatio;
+        float fillTop = mThermometerRect.bottom - fillHeight;
+
+        // 3. 绘制渐变填充部分（左右贴边框，无间距）
+        if (fillHeight > 0) {
+            RectF fillRect = new RectF(
+                mThermometerRect.left + FILL_PADDING_HORIZONTAL,
+                fillTop + FILL_PADDING_VERTICAL,
+                mThermometerRect.right - FILL_PADDING_HORIZONTAL,
+                mThermometerRect.bottom - FILL_PADDING_VERTICAL
+            );
+            LinearGradient gradient = new LinearGradient(
+                fillRect.centerX(), fillRect.bottom,
+                fillRect.centerX(), fillRect.top,
+                mGradientColors,
+                mGradientPositions,
+                Shader.TileMode.CLAMP
+            );
+            mFillPaint.setShader(gradient);
+            canvas.drawRoundRect(fillRect, 2, 2, mFillPaint);
+            mFillPaint.setShader(null);
+        }
+
+        // 4. 绘制文本（5dp固定宽度文本区，底部对齐竖排，文字居中）
+        String text = String.format("%d/%d", mCurrentValue, mMaxValue);
+        if (text.isEmpty()) return;
+
+        float textBaseX;
+        if (isTextOnRight) {
+            // 文本在右侧：X=温度条右边缘 + 文本区宽度的一半（紧贴温度条）
+            textBaseX = mThermometerRect.right + (mTextAreaWidth / 2f);
+        } else {
+            // 文本在左侧：X=文本区宽度的一半（紧贴控件左边缘）
+            textBaseX = mTextAreaWidth / 2f;
+        }
+
+        // 文本绘制参数（适配5dp窄区域，缩小字间距提升紧凑度）
+        float singleCharHeight = mTextPaint.getTextSize() + (TEXT_CHAR_SPACING - 2f); // 字间距减为6f
+        float totalTextHeight = (singleCharHeight * text.length()) - (TEXT_CHAR_SPACING - 2f);
+        Paint.FontMetrics fontMetrics = mTextPaint.getFontMetrics();
+        float charBottomOffset = fontMetrics.bottom;
+
+        // 文本起始Y（底部对齐控件底部，无间距）
+        float startTextY = getHeight() - getPaddingBottom() - charBottomOffset;
+
+        // 逐字竖排绘制（文字居中于5dp文本区，无超出）
+        for (int i = 0; i < text.length(); i++) {
+            char singleChar = text.charAt(i);
+            float currentTextY = startTextY - (i * singleCharHeight);
+            canvas.drawText(String.valueOf(singleChar), textBaseX, currentTextY, mTextPaint);
+        }
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java b/contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java
new file mode 100644
index 0000000..0cbc2b1
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java
@@ -0,0 +1,306 @@
+package cc.winboll.studio.contacts.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.HorizontalScrollView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/03/04 10:51:50
+ * @Describe 左滑显示操作按钮的自定义滚动视图，支持编辑、删除、上移、下移功能
+ */
+public class LeftScrollView extends HorizontalScrollView {
+    // ====================== 常量定义区 ======================
+    public static final String TAG = "LeftScrollView";
+
+    // ====================== 成员变量区 ======================
+    // 布局控件
+    private LinearLayout contentLayout;
+    private LinearLayout toolLayout;
+    private TextView textView;
+    private Button editButton;
+    private Button deleteButton;
+    private Button upButton;
+    private Button downButton;
+    // 滑动事件相关
+    private float mStartX;
+    private float mEndX;
+    private boolean isScrolling = false;
+    private int nScrollAcceptSize;
+    // 回调接口
+    private OnActionListener onActionListener;
+
+    // ====================== 构造函数区 ======================
+    public LeftScrollView(Context context) {
+        super(context);
+        init();
+    }
+
+    public LeftScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public LeftScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    // ====================== 初始化方法区 ======================
+    private void init() {
+        LogUtils.d(TAG, "init: 开始初始化左滑滚动视图");
+        // 加载布局
+        View viewMain = inflate(getContext(), R.layout.view_left_scroll, null);
+        if (viewMain == null) {
+            LogUtils.e(TAG, "init: 布局加载失败，无法初始化控件");
+            return;
+        }
+
+        // 绑定布局控件
+        contentLayout = viewMain.findViewById(R.id.content_layout);
+        toolLayout = viewMain.findViewById(R.id.action_layout);
+        editButton = viewMain.findViewById(R.id.edit_btn);
+        deleteButton = viewMain.findViewById(R.id.delete_btn);
+        upButton = viewMain.findViewById(R.id.up_btn);
+        downButton = viewMain.findViewById(R.id.down_btn);
+
+        // 校验控件是否绑定成功
+        if (contentLayout == null || toolLayout == null) {
+            LogUtils.e(TAG, "init: 核心布局控件绑定失败");
+            return;
+        }
+
+        // 添加主布局到当前视图
+        addView(viewMain);
+        // 设置按钮点击事件
+        setButtonClickListener();
+
+        LogUtils.d(TAG, "init: 左滑滚动视图初始化完成");
+    }
+
+    /**
+     * 设置操作按钮的点击事件
+     */
+    private void setButtonClickListener() {
+        // 编辑按钮
+        if (editButton != null) {
+            editButton.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.d(TAG, "onClick: 点击编辑按钮");
+						if (onActionListener != null) {
+							onActionListener.onEdit();
+						}
+					}
+				});
+        }
+
+        // 删除按钮
+        if (deleteButton != null) {
+            deleteButton.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.d(TAG, "onClick: 点击删除按钮");
+						if (onActionListener != null) {
+							onActionListener.onDelete();
+						}
+					}
+				});
+        }
+
+        // 上移按钮
+        if (upButton != null) {
+            upButton.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.d(TAG, "onClick: 点击上移按钮");
+						if (onActionListener != null) {
+							onActionListener.onUp();
+						}
+					}
+				});
+        }
+
+        // 下移按钮
+        if (downButton != null) {
+            downButton.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.d(TAG, "onClick: 点击下移按钮");
+						if (onActionListener != null) {
+							onActionListener.onDown();
+						}
+					}
+				});
+        }
+    }
+
+    // ====================== 对外提供的方法区 ======================
+    /**
+     * 添加内容视图到容器
+     * @param viewContent 待添加的内容视图
+     */
+    public void addContentLayout(View viewContent) {
+        if (contentLayout == null) {
+            LogUtils.w(TAG, "addContentLayout: 内容布局未初始化，无法添加视图");
+            return;
+        }
+        if (viewContent == null) {
+            LogUtils.w(TAG, "addContentLayout: 待添加视图为null");
+            return;
+        }
+        contentLayout.addView(viewContent, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+        LogUtils.d(TAG, "addContentLayout: 内容视图添加成功");
+    }
+
+    /**
+     * 设置内容布局的宽度
+     * @param contentWidth 目标宽度
+     */
+    public void setContentWidth(int contentWidth) {
+        if (contentLayout == null) {
+            LogUtils.w(TAG, "setContentWidth: 内容布局未初始化，无法设置宽度");
+            return;
+        }
+        LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) contentLayout.getLayoutParams();
+        layoutParams.width = contentWidth;
+        contentLayout.setLayoutParams(layoutParams);
+        LogUtils.d(TAG, "setContentWidth: 内容布局宽度设置为 " + contentWidth);
+    }
+
+    /**
+     * 设置文本内容（原代码未初始化textView，添加空校验）
+     * @param text 待显示的文本
+     */
+    public void setText(CharSequence text) {
+        if (textView == null) {
+            LogUtils.w(TAG, "setText: 文本控件未初始化，无法设置文本");
+            return;
+        }
+        textView.setText(text);
+        LogUtils.d(TAG, "setText: 文本设置为 " + text);
+    }
+
+    /**
+     * 设置事件回调监听器
+     * @param listener 回调接口实例
+     */
+    public void setOnActionListener(OnActionListener listener) {
+        this.onActionListener = listener;
+        LogUtils.d(TAG, "setOnActionListener: 事件监听器已设置");
+    }
+
+    // ====================== 滑动事件处理区 ======================
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (event == null) {
+            return super.onTouchEvent(event);
+        }
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                mStartX = event.getX();
+                LogUtils.d(TAG, "onTouchEvent: ACTION_DOWN，起始X坐标 = " + mStartX);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                // 可根据需求添加滑动中逻辑
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                mEndX = event.getX();
+                int scrollX = getScrollX();
+                LogUtils.d(TAG, String.format("onTouchEvent: ACTION_UP/CANCEL，起始X=%f 结束X=%f 滚动距离=%d",
+											  mStartX, mEndX, scrollX));
+
+                if (scrollX > 0) {
+                    handleScrollLogic();
+                }
+                break;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    /**
+     * 处理滑动结束后的逻辑，判断滑动方向并执行滚动
+     */
+    private void handleScrollLogic() {
+        float deltaX = Math.abs(mStartX - mEndX);
+        // 校验按钮是否存在，避免空指针
+        float threshold = editButton != null ? editButton.getWidth() : 50;
+
+        if (mEndX < mStartX) {
+            // 向左滑，显示操作按钮
+            if (deltaX > threshold) {
+                smoothScrollToRight();
+            } else {
+                smoothScrollToLeft();
+            }
+        } else {
+            // 向右滑，隐藏操作按钮
+            if (deltaX > threshold) {
+                smoothScrollToLeft();
+            } else {
+                smoothScrollToRight();
+            }
+        }
+    }
+
+    /**
+     * 平滑滚动到右侧（显示操作按钮）
+     */
+    private void smoothScrollToRight() {
+        post(new Runnable() {
+				@Override
+				public void run() {
+					View childView = getChildAt(0);
+					if (childView != null) {
+						int scrollToX = childView.getWidth() - getWidth();
+						int targetX = Math.max(0, scrollToX);
+						smoothScrollTo(targetX, 0);
+						LogUtils.d(TAG, "smoothScrollToRight: 滚动到右侧，目标X坐标 = " + targetX);
+					}
+				}
+			});
+        // 重置坐标
+        resetScrollCoordinate();
+    }
+
+    /**
+     * 平滑滚动到左侧（隐藏操作按钮）
+     */
+    private void smoothScrollToLeft() {
+        post(new Runnable() {
+				@Override
+				public void run() {
+					smoothScrollTo(0, 0);
+					LogUtils.d(TAG, "smoothScrollToLeft: 滚动到左侧");
+				}
+			});
+        // 重置坐标
+        resetScrollCoordinate();
+    }
+
+    /**
+     * 重置滑动坐标
+     */
+    private void resetScrollCoordinate() {
+        mStartX = 0;
+        mEndX = 0;
+    }
+
+    // ====================== 回调接口定义区 ======================
+    public interface OnActionListener {
+        void onEdit();
+        void onDelete();
+        void onUp();
+        void onDown();
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/views/LimitedTimeSpecialChannelView.java b/contacts/src/main/java/cc/winboll/studio/contacts/views/LimitedTimeSpecialChannelView.java
new file mode 100644
index 0000000..c73e168
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/views/LimitedTimeSpecialChannelView.java
@@ -0,0 +1,323 @@
+package cc.winboll.studio.contacts.views;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.Switch;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.services.LimitedTimeSpecialChannelService;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/18 15:05:00 (GMT+8)
+ * @LastEditTime 2026/04/22 17:30:00 (GMT+8)
+ * @Describe 限时特殊通道视图
+ * 功能说明：
+ * 1. Switch 打开时，EditText 不可编辑，布局背景变为绿色，加减按钮不可用
+ * 2. Switch 关闭时，EditText 可编辑，布局背景恢复为白色，加减按钮恢复可用
+ * 3. 监听服务销毁本地广播，到达后自动关闭 Switch 并恢复背景色与按钮状态
+ * 4. 监听倒计时心跳广播，实时更新EditText显示剩余秒数
+ * 5. 加减按钮控制秒数增减，最小值限制为0
+ * 6. 新增快速设置按钮(btn_thisSeconds)，点击直接设置为当前量级3600秒
+ * 7. [新增] 服务销毁时，恢复EditText显示为倒计时剩余秒数
+ */
+public class LimitedTimeSpecialChannelView extends LinearLayout {
+
+    // ====================== 常量定义 =========================
+    public static final String TAG = "LimitedTimeSpecialChannelView";
+    // 定义秒数增量的量级
+    private static final long SECONDS_INCREMENT = 3600;
+
+    // ====================== 成员变量 =========================
+    private Context mContext;
+    private EditText mEtSeconds;
+    private Switch mSwEnable;
+    private LinearLayout mLlMain;
+    private Button mBtnAddSeconds;
+    private Button mBtnSubSeconds;
+    // [新增] 快速设置量级按钮
+    private Button mBtnThisSeconds;
+    private android.content.BroadcastReceiver mCountdownReceiver;
+
+    // ====================== 构造函数 =========================
+    public LimitedTimeSpecialChannelView(Context context) {
+        super(context);
+        initView(context);
+    }
+
+    public LimitedTimeSpecialChannelView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView(context);
+    }
+
+    public LimitedTimeSpecialChannelView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView(context);
+    }
+
+    // ====================== 初始化方法 =========================
+    private void initView(Context context) {
+        LogUtils.i(TAG, "开始初始化视图...");
+        this.mContext = context;
+
+        // 加载布局文件
+        LayoutInflater.from(context).inflate(R.layout.view_limitedtimespecialchannel, this, true);
+        LogUtils.i(TAG, "布局文件加载完成");
+
+        // 绑定控件ID
+        bindViews();
+        // 初始化所有按钮点击事件
+        initButtons();
+        // 初始化开关状态
+        initSwitchState();
+        // 注册广播监听
+        registerServiceDestroyedListener();
+        registerCountdownTickListener();
+
+        LogUtils.i(TAG, "视图初始化流程结束");
+    }
+
+    /**
+     * 绑定布局中的所有控件ID
+     */
+    private void bindViews() {
+        LogUtils.i(TAG, "开始绑定控件ID");
+        mEtSeconds = (EditText) findViewById(R.id.et_seconds);
+        mSwEnable = (Switch) findViewById(R.id.sw_enable);
+        mLlMain = (LinearLayout) findViewById(R.id.ll_main);
+        mBtnAddSeconds = (Button) findViewById(R.id.btn_addSeconds);
+        mBtnSubSeconds = (Button) findViewById(R.id.btn_subSeconds);
+        // [新增] 绑定快速设置按钮ID
+        mBtnThisSeconds = (Button) findViewById(R.id.btn_thisSeconds);
+
+        // 健壮性检查
+        if (mEtSeconds == null) LogUtils.e(TAG, "未找到ID为 et_seconds 的EditText");
+        if (mSwEnable == null) LogUtils.e(TAG, "未找到ID为 sw_enable 的Switch");
+        if (mLlMain == null) LogUtils.w(TAG, "未找到ID为 ll_main 的LinearLayout，将无法设置背景色");
+        if (mBtnAddSeconds == null) LogUtils.e(TAG, "未找到ID为 btn_addSeconds 的Button");
+        if (mBtnSubSeconds == null) LogUtils.e(TAG, "未找到ID为 btn_subSeconds 的Button");
+        if (mBtnThisSeconds == null) LogUtils.e(TAG, "未找到ID为 btn_thisSeconds 的Button");
+
+        LogUtils.i(TAG, "控件ID绑定完成");
+    }
+
+    /**
+     * 初始化所有按钮的点击事件
+     * 包含：加号、减号、快速设置量级按钮
+     */
+    private void initButtons() {
+        LogUtils.i(TAG, "初始化按钮点击事件");
+
+        // 1. 加号按钮：增加一个量级
+        if (mBtnAddSeconds != null) {
+            mBtnAddSeconds.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.i(TAG, "点击加号按钮，准备增加秒数");
+						try {
+							long current = Long.parseLong(mEtSeconds.getText().toString().trim());
+							long newValue = current + SECONDS_INCREMENT;
+							mEtSeconds.setText(String.valueOf(newValue));
+							LogUtils.i(TAG, "增加成功，当前秒数: " + newValue);
+						} catch (NumberFormatException e) {
+							LogUtils.e(TAG, "当前输入格式错误，无法增加", e);
+							mEtSeconds.setText("0");
+						}
+					}
+				});
+        }
+
+        // 2. 减号按钮：减少一个量级，最低为0
+        if (mBtnSubSeconds != null) {
+            mBtnSubSeconds.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.i(TAG, "点击减号按钮，准备减少秒数");
+						try {
+							long current = Long.parseLong(mEtSeconds.getText().toString().trim());
+							long newValue = Math.max(0, current - SECONDS_INCREMENT);
+							mEtSeconds.setText(String.valueOf(newValue));
+							LogUtils.i(TAG, "减少成功，当前秒数: " + newValue);
+						} catch (NumberFormatException e) {
+							LogUtils.e(TAG, "当前输入格式错误，无法减少", e);
+							mEtSeconds.setText("0");
+						}
+					}
+				});
+        }
+
+        // 3. [新增] 快速设置按钮：点击直接设置为量级数值 3600
+        if (mBtnThisSeconds != null) {
+            mBtnThisSeconds.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						LogUtils.i(TAG, "点击快速设置按钮，设置秒数为: " + SECONDS_INCREMENT);
+						// 直接设置为常量数值
+						mEtSeconds.setText(String.valueOf(SECONDS_INCREMENT));
+						LogUtils.i(TAG, "快速设置成功，当前秒数: " + SECONDS_INCREMENT);
+					}
+				});
+        }
+    }
+
+    /**
+     * 初始化开关状态
+     * 设置Switch的监听事件，以及背景色、按钮可点击状态
+     */
+    private void initSwitchState() {
+        LogUtils.i(TAG, "初始化开关状态");
+        boolean isChecked = mSwEnable.isChecked();
+
+        // 设置初始UI状态
+        updateUIState(!isChecked);
+
+        LogUtils.i(TAG, "初始状态 - 开关: " + (isChecked ? "开启" : "关闭") + ", 背景色: " + (isChecked ? "绿色" : "白色") + ", 按钮可用: " + (!isChecked ? "是" : "否"));
+
+        // 设置开关切换监听
+        mSwEnable.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {
+				@Override
+				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+					LogUtils.i(TAG, "开关状态变更为: " + (isChecked ? "开启" : "关闭"));
+					// 根据开关状态更新UI可操作状态
+					updateUIState(!isChecked);
+
+					if (isChecked) {
+						startLimitedTimeSpecialChannelService();
+					} else {
+						LimitedTimeSpecialChannelService.stopService(mContext);
+					}
+				}
+			});
+    }
+
+    /**
+     * 统一更新UI可操作状态
+     * @param enabled 可用状态
+     */
+    private void updateUIState(boolean enabled) {
+        if (mEtSeconds != null) mEtSeconds.setEnabled(enabled);
+        if (mBtnAddSeconds != null) mBtnAddSeconds.setEnabled(enabled);
+        if (mBtnSubSeconds != null) mBtnSubSeconds.setEnabled(enabled);
+        // [新增] 同步快速设置按钮状态
+        if (mBtnThisSeconds != null) mBtnThisSeconds.setEnabled(enabled);
+
+        if (mLlMain != null) {
+            mLlMain.setBackgroundColor(enabled ? android.graphics.Color.WHITE : android.graphics.Color.GREEN);
+        }
+    }
+
+    /**
+     * 注册服务销毁本地广播监听
+     * [修改] 接收广播时检索倒计时剩余秒数参数并设置到EditText
+     */
+    private void registerServiceDestroyedListener() {
+        LogUtils.i(TAG, "注册服务销毁广播监听");
+        IntentFilter filter = new IntentFilter(LimitedTimeSpecialChannelService.ACTION_SERVICE_DESTROYED);
+        LocalBroadcastManager.getInstance(mContext).registerReceiver(new android.content.BroadcastReceiver() {
+				@Override
+				public void onReceive(Context context, Intent intent) {
+					if (LimitedTimeSpecialChannelService.ACTION_SERVICE_DESTROYED.equals(intent.getAction())) {
+						LogUtils.i(TAG, "收到服务销毁广播，执行恢复操作");
+
+						// 1. 恢复开关状态
+						if (mSwEnable != null && mSwEnable.isChecked()) {
+							mSwEnable.setChecked(false);
+						}
+
+						// 2. [核心修改] 检索并设置倒计时剩余秒数参数
+						// 从广播附加数据中获取之前服务发送的剩余秒数
+						long remainingSeconds = intent.getLongExtra(LimitedTimeSpecialChannelService.EXTRA_REMAINING_SECONDS, 0);
+						// 实际倒计时消耗冲正
+						remainingSeconds -= 1;
+						// 倒计时秒数0值保底
+						remainingSeconds = remainingSeconds < 0? 0 : remainingSeconds;
+						LogUtils.i(TAG, "从销毁广播中检索到剩余秒数参数: " + remainingSeconds + " 秒");
+						//ToastUtils.show("从销毁广播中检索到剩余秒数参数: " + remainingSeconds + " 秒");
+
+						// 3. 恢复所有UI状态为可用
+						updateUIState(true);
+						// 4. 设置EditText显示为倒计时剩余秒数
+						if (mEtSeconds != null) {
+							mEtSeconds.setText(String.valueOf(remainingSeconds));
+							LogUtils.i(TAG, "已将EditText设置为剩余秒数: " + remainingSeconds);
+						}
+
+						//ToastUtils.show("服务已销毁，恢复倒计时剩余状态");
+					}
+				}
+			}, filter);
+    }
+
+    /**
+     * 注册倒计时心跳广播监听
+     */
+    private void registerCountdownTickListener() {
+        LogUtils.i(TAG, "注册倒计时心跳广播监听");
+        mCountdownReceiver = new android.content.BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (LimitedTimeSpecialChannelService.ACTION_COUNTDOWN_TICK.equals(intent.getAction())) {
+                    long remainingSeconds = intent.getLongExtra(LimitedTimeSpecialChannelService.EXTRA_REMAINING_SECONDS, 0);
+                    if (mEtSeconds != null) {
+                        mEtSeconds.setText(String.valueOf(remainingSeconds));
+                    }
+					if (mSwEnable != null) {
+                        mSwEnable.setChecked(remainingSeconds>0);
+                    }
+                }
+            }
+        };
+
+        IntentFilter filter = new IntentFilter(LimitedTimeSpecialChannelService.ACTION_COUNTDOWN_TICK);
+        LocalBroadcastManager.getInstance(mContext).registerReceiver(mCountdownReceiver, filter);
+        LogUtils.i(TAG, "倒计时广播注册成功");
+    }
+
+    /**
+     * 启动限时特殊通道服务
+     */
+    private void startLimitedTimeSpecialChannelService() {
+        LogUtils.i(TAG, "准备启动限时特殊通道服务");
+        String secondsStr = mEtSeconds.getText().toString().trim();
+        if (secondsStr.isEmpty()) {
+            LogUtils.w(TAG, "输入框为空，使用默认值 3600 秒");
+            secondsStr = "3600";
+        }
+
+        try {
+            long seconds = Long.parseLong(secondsStr);
+            long delayMillis = seconds * 1000;
+
+            LogUtils.i(TAG, "启动参数 - 输入秒数: " + seconds + ", 转换毫秒: " + delayMillis);
+            //ToastUtils.show("调用 LimitedTimeSpecialChannelService 服务");
+            LimitedTimeSpecialChannelService.startService(mContext, delayMillis);
+        } catch (NumberFormatException e) {
+            LogUtils.e(TAG, "输入的秒数格式错误: " + secondsStr, e);
+        }
+    }
+
+    // ====================== 生命周期方法 =========================
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        LogUtils.i(TAG, "视图销毁，反注册所有广播接收器");
+
+        if (mCountdownReceiver != null) {
+            LocalBroadcastManager.getInstance(mContext).unregisterReceiver(mCountdownReceiver);
+            LogUtils.i(TAG, "反注册倒计时心跳广播接收器");
+        }
+
+        LogUtils.i(TAG, "所有广播反注册完成");
+    }
+}
+
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java
new file mode 100644
index 0000000..edd6b26
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java
@@ -0,0 +1,75 @@
+package cc.winboll.studio.contacts.widgets;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/17 14:49:31
+ * @Describe APPStatusWidget
+ */
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.RemoteViews;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class APPStatusWidget extends AppWidgetProvider {
+
+    public static final String TAG = "APPSOSReportWidget";
+
+    public static final String ACTION_STATUS_ACTIVE = "cc.winboll.studio.contacts.widgets.APPStatusWidget.ACTION_STATUS_ACTIVE";
+    public static final String ACTION_STATUS_NOACTIVE = "cc.winboll.studio.contacts.widgets.APPStatusWidget.ACTION_STATUS_NOACTIVE";
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        for (int appWidgetId : appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId);
+        }
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+        if (intent.getAction().equals(ACTION_STATUS_ACTIVE)) {
+            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPStatusWidget.class));
+            for (int appWidgetId : appWidgetIds) {
+                updateAppWidget(context, appWidgetManager, appWidgetId);
+            }
+        } else if (intent.getAction().equals(ACTION_STATUS_NOACTIVE)) {
+            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPStatusWidget.class));
+            for (int appWidgetId : appWidgetIds) {
+                updateAppWidget(context, appWidgetManager, appWidgetId);
+            }
+        }
+
+    }
+
+    private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
+        LogUtils.d(TAG, "updateAppWidget(...)");
+
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
+        //设置按钮点击事件
+        Intent intentAppButton = new Intent(context, APPStatusWidgetClickListener.class);
+        intentAppButton.setAction(APPStatusWidgetClickListener.ACTION_APPICON_CLICK);
+        PendingIntent pendingIntentAppButton = PendingIntent.getBroadcast(context, 0, intentAppButton, PendingIntent.FLAG_UPDATE_CURRENT);
+        views.setOnClickPendingIntent(R.id.widgetlayoutImageView1, pendingIntentAppButton);
+
+//        boolean isActive = !MainServiceThread.isExist();
+//        if (isActive) {
+//            views.setImageViewResource(R.id.widgetlayoutImageView1, R.drawable.ic_launcher);
+//        } else {
+//            views.setImageViewResource(R.id.widgetlayoutImageView1, R.drawable.ic_launcher_disable);
+//
+//        }
+        appWidgetManager.updateAppWidget(appWidgetId, views);
+    }
+
+    public static void onAPPStatusWidgetClick(Context context) {
+        ToastUtils.show("onAPPStatusWidgetClick");
+    }
+}
diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidgetClickListener.java b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidgetClickListener.java
new file mode 100644
index 0000000..3525067
--- /dev/null
+++ b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidgetClickListener.java
@@ -0,0 +1,32 @@
+package cc.winboll.studio.contacts.widgets;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/17 14:59:55
+ * @Describe WidgetButtonClickListener
+ */
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.Toast;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class APPStatusWidgetClickListener extends BroadcastReceiver {
+
+    public static final String TAG = "APPStatusWidgetClickListener";
+
+    public static final String ACTION_APPICON_CLICK = "cc.winboll.studio.contacts.widgets.APPStatusWidgetClickListener.ACTION_APPICON_CLICK";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (action == null) {
+            LogUtils.d(TAG, String.format("action %s", action));
+            return;
+        }
+        if (action.equals(ACTION_APPICON_CLICK)) {
+            LogUtils.d(TAG, "ACTION_APPICON_CLICK");
+            Toast.makeText(context, "ACTION_APPICON_CLICK", Toast.LENGTH_SHORT).show();
+        }
+    }
+}
diff --git a/contacts/src/main/res/drawable/ic_call.xml b/contacts/src/main/res/drawable/ic_call.xml
new file mode 100644
index 0000000..c5802bb
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_call.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0,0 1,21 16.5V20A1,1 0,0 1,20 21A17,17 0,0 1,3 4A1,1 0,0 1,4 3H7.5A1,1 0,0 1,8.5 4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z"/>
+
+</vector>
\ No newline at end of file
diff --git a/contacts/src/main/res/drawable/ic_launcher.xml b/contacts/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 0000000..d4d1eaf
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true">
+    <item android:drawable="@drawable/ic_launcher_background"/> 
+    <item 
+        android:left="15dp" 
+        android:top="15dp" 
+        android:right="15dp" 
+        android:bottom="15dp"
+        android:drawable="@drawable/ic_launcher_foreground"/>
+</layer-list>
diff --git a/contacts/src/main/res/drawable/ic_launcher_background.xml b/contacts/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..9486190
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="@color/colorPrimary"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/contacts/src/main/res/drawable/ic_launcher_disable.xml b/contacts/src/main/res/drawable/ic_launcher_disable.xml
new file mode 100644
index 0000000..9a31905
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_launcher_disable.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:clickable="true">
+    <item android:drawable="@drawable/ic_launcher_background"/> 
+    <item 
+        android:left="15dp" 
+        android:top="15dp" 
+        android:right="15dp" 
+        android:bottom="15dp"
+        android:drawable="@drawable/ic_launcher_foreground_disable"/>
+</layer-list>
diff --git a/contacts/src/main/res/drawable/ic_launcher_foreground.xml b/contacts/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..872b04e
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
+</vector>
diff --git a/contacts/src/main/res/drawable/ic_launcher_foreground_disable.xml b/contacts/src/main/res/drawable/ic_launcher_foreground_disable.xml
new file mode 100644
index 0000000..763b72c
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_launcher_foreground_disable.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#FFAAAAAA"
+        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
+</vector>
diff --git a/contacts/src/main/res/drawable/ic_phone_call_in.xml b/contacts/src/main/res/drawable/ic_phone_call_in.xml
new file mode 100644
index 0000000..792377d
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_phone_call_in.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M847.53,307.03L597.5,307.03c-8.54,0.17 -13.66,-11.26 -13.66,-19.97 0.17,-8.7 5.12,-14.17 13.66,-14.17h250.02c30.21,-0.34 31.41,34.14 0,34.14zM736.6,428.71c-6.14,6.32 -16.05,6.32 -22.02,0.17l-128.34,-130.56c-5.98,-6.14 -5.8,-16.22 0.17,-22.53l122.37,-124.76c6.14,-6.31 16.05,-6.31 22.02,-0.34 5.98,6.14 5.81,16.22 -0.34,22.36L623.1,289.62l113.5,116.22a16.33,16.33 0,0 1,0 22.87zM833.02,717.99c-18.78,-12.63 -122.37,-64.85 -141.99,-77.14 -2.05,0 -7.34,0.68 -14.85,4.43 -8.02,4.1 -31.23,16.9 -63.66,34.99l-25.26,14.16 -23.9,-16.38c-17.75,-12.11 -56.32,-41.3 -115.03,-98.64 -58.88,-57.69 -88.58,-95.23 -101.04,-112.47l-16.72,-23.38L345.09,418.82c13.99,-23.9 30.72,-52.9 35.84,-62.46 4.1,-7.51 4.44,-12.63 4.44,-14.17v-0.51C374.27,324.44 303.27,219.65 290.3,201.22c-1.88,-0.34 -5.8,0 -10.75,3.42 -40.28,28.5 -82.43,68.95 -88.41,84.65C195.24,373.42 270.85,491.52 404.48,622.25c133.8,130.73 251.22,205.49 336.9,209.41 16.22,-5.63 62.81,-52.05 91.65,-91.14 2.05,-2.9 3.24,-3.58 3.24,-6.99 0,-0.51 -3.07,-15.02 -3.24,-15.53zM867.5,770.73c-0.68,1.02 -81.58,108.03 -126.12,106.67 -125.1,-3.93 -265.73,-128.86 -366.94,-227.84 -101.38,-98.99 -225.45,-238.25 -229.38,-360.96v-1.02c0,-43.01 124.76,-128 125.78,-128.69 19.62,-13.14 36.35,-13.82 52.39,10.41 7.85,10.92 87.73,123.9 96.94,138.58 3.92,6.49 11.09,25.94 11.09,34.48 0,10.92 -3.24,23.21 -9.73,34.98 -6.31,11.61 -26.62,46.59 -36.69,63.83 10.92,15.19 46.76,61.44 103.94,117.25 56.83,55.63 85.16,72.19 100.69,82.77 17.58,-9.73 53.42,-29.7 65.2,-35.67 22.18,-11.44 44.37,-12.8 59.39,-3.42 14.16,8.7 136.02,88.41 147.79,96.6 10.93,7.68 16.9,21.67 16.9,36.69 0.17,11.78 -3.58,24.41 -11.26,35.33z" />
+</vector>
diff --git a/contacts/src/main/res/drawable/ic_phone_call_out.xml b/contacts/src/main/res/drawable/ic_phone_call_out.xml
new file mode 100644
index 0000000..833d25a
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_phone_call_out.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M861.86,307.03L614.4,307.03c-31.06,-0.17 -29.86,-34.48 0,-34.14h247.46c8.54,0.17 13.31,5.46 13.49,14.17 0,8.87 -4.95,20.14 -13.49,19.97zM872.96,298.5l-126.98,130.56c-5.98,6.14 -15.7,5.98 -21.85,-0.17 -6.14,-6.32 -6.14,-16.38 -0.17,-22.36l112.3,-116.22L730.11,173.74c-6.14,-6.31 -6.14,-16.38 -0.17,-22.35 5.97,-6.14 15.7,-5.98 21.84,0.34L872.96,276.48c5.8,5.8 5.98,15.87 0,22.02zM833.02,717.99c-18.78,-12.63 -122.37,-64.85 -141.99,-77.14 -2.05,0 -7.34,0.68 -14.85,4.43 -8.02,4.1 -31.23,16.9 -63.66,34.99l-25.26,14.16 -23.9,-16.38c-17.75,-12.11 -56.32,-41.3 -115.03,-98.64 -58.88,-57.69 -88.41,-95.23 -100.86,-112.47L330.75,443.56l14.5,-24.74c14,-23.9 30.72,-52.9 35.84,-62.46 4.1,-7.51 4.44,-12.63 4.44,-14.17v-0.51C374.44,324.44 303.45,219.65 290.3,201.22c-1.88,-0.34 -5.8,0 -10.75,3.42 -40.28,28.5 -82.43,68.95 -88.41,84.65C195.24,373.42 270.85,491.52 404.48,622.25c133.63,130.73 251.05,205.49 336.9,209.41 16.22,-5.63 62.81,-52.05 91.65,-91.14 2.05,-2.9 3.24,-3.58 3.24,-6.99 0,-0.51 -3.07,-15.02 -3.24,-15.53zM867.5,770.73c-0.68,1.02 -81.58,108.03 -126.12,106.67 -125.1,-3.93 -265.56,-128.86 -366.94,-227.84 -101.38,-98.99 -225.45,-238.25 -229.38,-360.96v-1.02c0,-43.01 124.76,-128 125.78,-128.69 19.62,-13.14 36.35,-13.82 52.39,10.41 7.85,10.92 87.73,123.9 96.94,138.58 4.1,6.49 11.09,25.94 11.09,34.48 0,10.92 -3.24,23.21 -9.73,34.98 -6.14,11.61 -26.62,46.59 -36.69,63.83 10.75,15.19 46.76,61.44 103.94,117.25 56.83,55.63 85.16,72.19 100.69,82.77 17.58,-9.73 53.42,-29.7 65.2,-35.67 22.18,-11.44 44.37,-12.8 59.39,-3.42 14.16,8.7 136.19,88.41 147.79,96.6 10.93,7.68 16.9,21.67 16.9,36.69 0.17,11.78 -3.58,24.41 -11.26,35.33z" />
+</vector>
diff --git a/contacts/src/main/res/drawable/ic_phone_hang_up.xml b/contacts/src/main/res/drawable/ic_phone_hang_up.xml
new file mode 100644
index 0000000..98b57b2
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_phone_hang_up.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#201f1f"
+        android:pathData="M841.22,856.06c185.86,-185.86 185.86,-487.42 0,-673.79C655.36,-3.58 353.79,-3.58 167.42,182.27c-185.86,185.86 -185.86,487.42 0,673.79 186.37,185.86 487.94,185.86 673.79,0zM218.62,495.1c0,-47.62 111.1,-113.66 285.7,-113.66 175.1,0 285.7,66.05 285.7,113.66 0,40.96 10.75,102.4 -73.73,93.18 -84.48,-9.22 -78.85,-40.96 -78.85,-83.46 0,-29.7 -68.61,-36.35 -133.12,-36.35 -65.02,0 -133.12,6.66 -133.12,36.35 0,42.5 5.63,74.24 -78.85,83.46 -84.99,9.22 -73.73,-51.71 -73.73,-93.18z" />
+</vector>
diff --git a/contacts/src/main/res/drawable/ic_phone_pick_up.xml b/contacts/src/main/res/drawable/ic_phone_pick_up.xml
new file mode 100644
index 0000000..23080f1
--- /dev/null
+++ b/contacts/src/main/res/drawable/ic_phone_pick_up.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportHeight="1024"
+    android:viewportWidth="1024">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M277.9,742s167.9,-294.1 465.3,-465.3C575.7,577.8 277.9,742 277.9,742z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M743.1,742S575.2,447.9 277.8,276.7C445.3,577.8 743.1,742 743.1,742z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M284.1,343m-49,0a49,49 0,1 0,98 0,49 49,0 1,0 -98,0Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M284.1,515.5m-49,0a49,49 0,1 0,98 0,49 49,0 1,0 -98,0Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M284.1,683.5m-49,0a49,49 0,1 0,98 0,49 49,0 1,0 -98,0Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M808.4,341.6s-208.5,-61.2 -420,0c211.5,64.8 420,0 420,0zM808.4,516.6s-208.5,-61.2 -420,0c211.5,64.8 420,0 420,0zM808.4,684.6s-208.5,-61.2 -420,0c211.5,64.8 420,0 420,0z" />
+    <path
+        android:fillColor="#0EC469"
+        android:pathData="M512,512m-448,0a448,448 0,1 0,896 0,448 448,0 1,0 -896,0Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M701.4,786.8h-0.3c-3.2,-0.3 -6.4,-0.8 -9.5,-1.4C290,725.2 237.2,331.5 237.2,331.5h0.1c-5.9,-27.8 0.8,-56.8 22.5,-78.5 9.5,-9.5 22.5,-18.1 31.3,-19.2l111.6,111.6c-1.1,8.8 -9.6,21.7 -19.1,31.2 -8.5,8.5 -17.9,14.4 -28.4,18.6 57.7,214.5 272.1,271.5 272.1,271.5l0.3,0.2c4.2,-10.5 9.6,-19.3 18.1,-27.8 9.5,-9.5 22.6,-18.1 31.4,-19.2l111.6,111.6c-1.1,8.8 -9.6,21.7 -19.1,31.2 -18.9,19 -43.4,26.3 -68.2,24.1z" />
+</vector>
diff --git a/contacts/src/main/res/drawable/recycler_view_border.xml b/contacts/src/main/res/drawable/recycler_view_border.xml
new file mode 100644
index 0000000..d538cab
--- /dev/null
+++ b/contacts/src/main/res/drawable/recycler_view_border.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#000000" /> <!-- 设置边框宽度和颜色，这里是黑色 1dp 边框 -->
+    <solid android:color="#ffffff" /> <!-- 设置背景颜色，这里是白色 -->
+</shape>
+
diff --git a/contacts/src/main/res/drawable/shape_gradient.xml b/contacts/src/main/res/drawable/shape_gradient.xml
new file mode 100644
index 0000000..c164fe9
--- /dev/null
+++ b/contacts/src/main/res/drawable/shape_gradient.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="180"
+        android:endColor="#FFFFFFFF"
+        android:startColor="#FFFFFFFF"
+        android:type="linear" />
+
+    <corners android:radius="10dp" />
+</shape>
diff --git a/contacts/src/main/res/layout/activity_about.xml b/contacts/src/main/res/layout/activity_about.xml
new file mode 100644
index 0000000..425769a
--- /dev/null
+++ b/contacts/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">
+
+    <androidx.appcompat.widget.Toolbar
+        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>
diff --git a/contacts/src/main/res/layout/activity_call.xml b/contacts/src/main/res/layout/activity_call.xml
new file mode 100644
index 0000000..460b416
--- /dev/null
+++ b/contacts/src/main/res/layout/activity_call.xml
@@ -0,0 +1,28 @@
+<?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:padding="16dp">
+
+    <EditText
+        android:id="@+id/phone_number"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="请输入电话号码"/>
+
+    <Button
+        android:id="@+id/dial_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="拨号"/>
+
+    <TextView
+        android:id="@+id/call_status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"/>
+
+</LinearLayout>
diff --git a/contacts/src/main/res/layout/activity_dialer.xml b/contacts/src/main/res/layout/activity_dialer.xml
new file mode 100644
index 0000000..dc18c88
--- /dev/null
+++ b/contacts/src/main/res/layout/activity_dialer.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/phone_number_edit_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Enter phone number" />
+
+    <Button
+        android:id="@+id/dial_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Dial" />
+
+</LinearLayout>
diff --git a/contacts/src/main/res/layout/activity_main.xml b/contacts/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..f06ae70
--- /dev/null
+++ b/contacts/src/main/res/layout/activity_main.xml
@@ -0,0 +1,63 @@
+<?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"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<androidx.appcompat.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/activitymainToolbar1"/>
+
+	<cc.winboll.studio.libaes.views.ADsBannerView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/adsbanner"/>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:paddingTop="10dp"
+		android:paddingBottom="10dp">
+
+		<cc.winboll.studio.contacts.views.DunTemperatureView
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:id="@+id/dun_temp_view_left"
+			android:layout_alignParentLeft="true"/>
+
+		<LinearLayout
+			android:orientation="vertical"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/activitymainLinearLayout1"
+			android:layout_toRightOf="@id/dun_temp_view_left"
+			android:layout_toLeftOf="@id/dun_temp_view_right">
+
+			<androidx.viewpager.widget.ViewPager
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1.0"
+				android:id="@+id/viewPager"/>
+
+			<com.google.android.material.tabs.TabLayout
+				android:layout_width="match_parent"
+				android:layout_height="60dp"
+				android:id="@+id/tabLayout"/>
+
+		</LinearLayout>
+
+		<cc.winboll.studio.contacts.views.DunTemperatureView
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:id="@+id/dun_temp_view_right"
+			android:layout_alignParentRight="true"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/activity_phone_call.xml b/contacts/src/main/res/layout/activity_phone_call.xml
new file mode 100644
index 0000000..327130c
--- /dev/null
+++ b/contacts/src/main/res/layout/activity_phone_call.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	tools:context=".phonecallui.PhoneCallActivity">
+
+	<RelativeLayout
+		android:id="@+id/rl_user_info"
+		android:layout_width="match_parent"
+		android:layout_height="300dp"
+		android:background="@color/colorPrimaryDark"
+		android:layout_marginTop="100dp">
+
+		<TextView
+			android:id="@+id/tv_call_number_label"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_above="@+id/tv_call_number"
+			android:layout_marginBottom="16dp"
+			android:gravity="center"
+			android:text="来电号码"
+			android:textColor="@android:color/white"
+			android:textSize="18sp"/>
+
+		<TextView
+			android:id="@+id/tv_call_number"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:textAlignment="center"
+			android:textColor="@android:color/white"
+			android:textSize="28sp"
+			android:textStyle="bold"
+			android:layout_centerInParent="true"
+			tools:text="133-9527-9527"/>
+
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="@android:color/white">
+
+		<TextView
+			android:id="@+id/tv_phone_calling_time"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerHorizontal="true"
+			android:layout_marginTop="24dp"
+			android:text="通话中：01:33"
+			android:textColor="@android:color/black"
+			android:textSize="18sp"
+			android:visibility="gone"
+			tools:visibility="visible"/>
+
+		<RelativeLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerInParent="true">
+
+			<TextView
+				android:id="@+id/tv_phone_hang_up"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:drawablePadding="16dp"
+				android:drawableTop="@drawable/ic_phone_hang_up"
+				android:foreground="?android:attr/selectableItemBackground"
+				android:gravity="center"
+				android:padding="8dp"
+				android:text="挂  断"
+				android:textColor="@android:color/black"
+				tools:visibility="visible"/>
+
+			<TextView
+				android:id="@+id/tv_phone_pick_up"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="50dp"
+				android:layout_toRightOf="@id/tv_phone_hang_up"
+				android:drawablePadding="16dp"
+				android:drawableTop="@drawable/ic_phone_pick_up"
+				android:foreground="?android:attr/selectableItemBackground"
+				android:gravity="center"
+				android:padding="8dp"
+				android:text="接  听"
+				android:textColor="@android:color/black"
+				android:visibility="gone"
+				tools:visibility="visible"/>
+
+		</RelativeLayout>
+
+	</RelativeLayout>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/activity_settings.xml b/contacts/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..08335f9
--- /dev/null
+++ b/contacts/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<androidx.appcompat.widget.Toolbar
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:id="@+id/activitymainToolbar1"/>
+
+		<LinearLayout
+			android:orientation="vertical"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1.0">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="服务设置："/>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<Switch
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="主要服务"
+					android:id="@+id/sw_mainservice"
+					android:layout_margin="5dp"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="云盾设置："/>
+
+				<cc.winboll.studio.contacts.views.DuInfoTextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:id="@+id/tv_DunInfo"/>
+
+			</LinearLayout>
+			
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="特殊通道设置："/>
+
+				<cc.winboll.studio.contacts.views.LimitedTimeSpecialChannelView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:id="@+id/view_LimitedTimeSpecialChannel"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<Switch
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="是否启用云盾防御"
+					android:layout_margin="5dp"
+					android:id="@+id/sw_IsEnableDun"
+					android:onClick="onSW_IsEnableDun"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="初始防御层的叠加数量："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="number"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/et_DunTotalCount"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="防御层每次恢复的时间间隔(秒钟)："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="number"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/et_DunResumeSecondCount"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="防御层每次恢复的叠加数量："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="number"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/et_DunResumeCount"/>
+
+			</LinearLayout>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="应用权限设置："/>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="悬浮窗设置"
+					android:id="@+id/activitysettingsButton2"
+					android:onClick="onCanDrawOverlays"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="默认拨号设置"
+					android:id="@+id/activitysettingsButton1"
+					android:onClick="onDefaultPhone"/>
+
+			</LinearLayout>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="音量设置："/>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="10dp"
+					android:id="@+id/tv_volume"/>
+
+				<SeekBar
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_margin="10dp"
+					android:max="100"
+					android:id="@+id/bellvolume"/>
+
+			</LinearLayout>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="拨不通电话记录查询："/>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right"
+				android:layout_margin="10dp">
+
+				<EditText
+					android:layout_width="match_parent"
+					android:ems="10"
+					android:layout_height="wrap_content"
+					android:id="@+id/bobulltoonurl_et"/>
+
+				<HorizontalScrollView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content">
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="下载数据"
+							android:onClick="onDownloadBoBullToon"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="清空 BoBullToon 数据"
+							android:onClick="onCleanBoBullToonData"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="重置地址"
+							android:onClick="onResetBoBullToonURL"/>
+
+					</LinearLayout>
+
+				</HorizontalScrollView>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right|center_vertical"
+				android:layout_margin="10dp">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="查询电话："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="phone"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/activitysettingsEditText1"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="查询记录"
+					android:onClick="onSearchBoBullToonPhone"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:text="Phone Connect Rule :"
+					android:layout_weight="1.0"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="添加新规则"
+					android:onClick="onAddNewConnectionRule"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_horizontal">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="&lt;&lt;==向左拉动列表项可编辑内容"/>
+
+			</LinearLayout>
+
+			<androidx.recyclerview.widget.RecyclerView
+				android:id="@+id/recycler_view"
+				android:layout_width="match_parent"
+				android:layout_height="300dp"
+				android:background="@drawable/recycler_view_border"
+				android:layout_margin="5dp"/>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="单元测试："/>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="LogView"
+					android:onClick="onLogView"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Unit Test"
+					android:onClick="onUnitTest"/>
+
+			</LinearLayout>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="其他："/>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="关于应用"
+					android:onClick="onAbout"/>
+
+			</LinearLayout>
+
+			<cc.winboll.studio.libaes.views.ADsControlView
+				android:id="@+id/ads_control_view"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</ScrollView>
+
diff --git a/contacts/src/main/res/layout/activity_unittest.xml b/contacts/src/main/res/layout/activity_unittest.xml
new file mode 100644
index 0000000..c2e50cd
--- /dev/null
+++ b/contacts/src/main/res/layout/activity_unittest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="right">
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Add Demo Rules(While size is 0) and Test"
+			android:onClick="onTestMain"
+			android:textSize="10sp"
+			android:textAllCaps="false"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_vertical">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="测试号码："/>
+
+		<EditText
+			android:layout_width="0dp"
+			android:inputType="phone"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:layout_weight="1.0"
+			android:id="@+id/phone_et"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Test Phone"
+			android:onClick="onTestPhone"
+			android:textAllCaps="false"/>
+
+	</LinearLayout>
+
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/logview"/>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/fragment_call_log.xml b/contacts/src/main/res/layout/fragment_call_log.xml
new file mode 100644
index 0000000..32fcbf0
--- /dev/null
+++ b/contacts/src/main/res/layout/fragment_call_log.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/fragment_contacts.xml b/contacts/src/main/res/layout/fragment_contacts.xml
new file mode 100644
index 0000000..77f06a6
--- /dev/null
+++ b/contacts/src/main/res/layout/fragment_contacts.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<EditText
+			android:id="@+id/search_edit_text"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:hint="Search contacts"
+			android:padding="16dp"
+			android:layout_weight="1.0"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Dial"
+			android:id="@+id/btn_dial"/>
+
+	</LinearLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/contacts_recycler_view"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"/>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/fragment_log.xml b/contacts/src/main/res/layout/fragment_log.xml
new file mode 100644
index 0000000..7636182
--- /dev/null
+++ b/contacts/src/main/res/layout/fragment_log.xml
@@ -0,0 +1,12 @@
+<?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.libappbase.LogView
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:id="@+id/logview"/>
+</LinearLayout>
diff --git a/contacts/src/main/res/layout/item_call_log.xml b/contacts/src/main/res/layout/item_call_log.xml
new file mode 100644
index 0000000..0f19546
--- /dev/null
+++ b/contacts/src/main/res/layout/item_call_log.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/phone_number"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/call_status"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="14sp"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/call_date"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="14sp"/>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dp">
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView1"
+			android:layout_alignParentLeft="true"/>
+
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_toRightOf="@id/itemcalllogView1"
+			android:layout_toLeftOf="@id/itemcalllogView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/aohpctcseekbar_dial"/>
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView2"
+			android:layout_alignParentRight="true"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/item_contact.xml b/contacts/src/main/res/layout/item_contact.xml
new file mode 100644
index 0000000..0006eaa
--- /dev/null
+++ b/contacts/src/main/res/layout/item_contact.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/itemcontactLinearLayout1">
+
+		<TextView
+			android:id="@+id/contact_number"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
+
+		<TextView
+			android:id="@+id/contact_number"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:text="☎"
+			android:textStyle="bold"/>
+
+		<TextView
+			android:id="@+id/contact_name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dp">
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView1"
+			android:layout_alignParentLeft="true"/>
+
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_toRightOf="@id/itemcalllogView1"
+			android:layout_toLeftOf="@id/itemcalllogView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/aohpctcseekbar_dial"/>
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView2"
+			android:layout_alignParentRight="true"/>
+
+	</RelativeLayout>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/view_left_scroll.xml b/contacts/src/main/res/layout/view_left_scroll.xml
new file mode 100644
index 0000000..b06c552
--- /dev/null
+++ b/contacts/src/main/res/layout/view_left_scroll.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <!-- 内容区域 -->
+    <LinearLayout
+        android:id="@+id/content_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:background="@color/white">
+        <!-- 这里放置你的列表项内容 -->
+    </LinearLayout>
+
+    <!-- 操作按钮 -->
+    <LinearLayout
+        android:id="@+id/action_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/lightgray">
+
+        <Button
+            android:id="@+id/edit_btn"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:text="编辑"
+            android:background="@color/blue" />
+        <Button
+            android:id="@+id/up_btn"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:text="△"
+            android:background="@color/green" />
+        <Button
+            android:id="@+id/down_btn"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:text="▽"
+            android:background="@color/green" />
+        <Button
+            android:id="@+id/delete_btn"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:text="删除"
+            android:background="@color/red" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/contacts/src/main/res/layout/view_limitedtimespecialchannel.xml b/contacts/src/main/res/layout/view_limitedtimespecialchannel.xml
new file mode 100644
index 0000000..da6d713
--- /dev/null
+++ b/contacts/src/main/res/layout/view_limitedtimespecialchannel.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="center_vertical|center_horizontal"
+	android:id="@+id/ll_main">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center_vertical">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="总倒计时:"/>
+
+		<EditText
+			android:layout_width="85dp"
+			android:inputType="number"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:text="3600"
+			android:id="@+id/et_seconds"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="秒"/>
+
+		<Switch
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/sw_enable"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content">
+
+		<Button
+			android:layout_width="40dp"
+			android:layout_height="40dp"
+			android:text="-"
+			android:id="@+id/btn_subSeconds"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="40dp"
+			android:text="3600秒"
+			android:id="@+id/btn_thisSeconds"/>
+
+		<Button
+			android:layout_width="40dp"
+			android:layout_height="40dp"
+			android:text="+"
+			android:id="@+id/btn_addSeconds"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/view_phone_call.xml b/contacts/src/main/res/layout/view_phone_call.xml
new file mode 100644
index 0000000..5036c76
--- /dev/null
+++ b/contacts/src/main/res/layout/view_phone_call.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rl_user_info"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary">
+
+    <TextView
+        android:id="@+id/tv_call_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="30dp"
+        android:gravity="center"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="18sp"
+        tools:text="133-8892-9579" />
+
+    <Button
+        android:id="@+id/btn_open_app"
+        style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
+        android:layout_width="match_parent"
+        android:textColor="@android:color/white"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv_call_number"
+        android:gravity="center"
+        android:text="打开 Phone Call App"
+        android:textAlignment="center"
+        android:textSize="16sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/contacts/src/main/res/layout/view_phone_connect_rule.xml b/contacts/src/main/res/layout/view_phone_connect_rule.xml
new file mode 100644
index 0000000..89310cc
--- /dev/null
+++ b/contacts/src/main/res/layout/view_phone_connect_rule.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:padding="16dp">
+
+	<EditText
+		android:id="@+id/edit_text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:hint="请输入规则文本"/>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="right|center_vertical">
+
+		<CheckBox
+			android:id="@+id/checkbox_allow"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="连接"/>
+
+        <CheckBox
+            android:id="@+id/checkbox_enable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="启用"/>
+
+        <Button
+            android:id="@+id/button_confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="确定"/>
+        
+	</LinearLayout>
+
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/view_phone_connect_rule_simple.xml b/contacts/src/main/res/layout/view_phone_connect_rule_simple.xml
new file mode 100644
index 0000000..4c59751
--- /dev/null
+++ b/contacts/src/main/res/layout/view_phone_connect_rule_simple.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="horizontal"
+	android:padding="2dp">
+
+	<cc.winboll.studio.contacts.views.LeftScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/scrollView"/>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml b/contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml
new file mode 100644
index 0000000..a3a0d16
--- /dev/null
+++ b/contacts/src/main/res/layout/view_phone_connect_rule_simple_content.xml
@@ -0,0 +1,35 @@
+<?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="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_gravity="center_vertical"
+	android:gravity="center_vertical">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Text"
+		android:layout_weight="1.0"
+		android:id="@+id/ruletext_tv"/>
+
+	<CheckBox
+		android:id="@+id/checkbox_allow"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="连接"
+		android:clickable="false"
+		android:focusable="false"/>
+
+	<CheckBox
+		android:id="@+id/checkbox_enable"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="启用"
+		android:clickable="false"
+		android:focusable="false"/>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/layout/view_toast.xml b/contacts/src/main/res/layout/view_toast.xml
new file mode 100644
index 0000000..d6a9915
--- /dev/null
+++ b/contacts/src/main/res/layout/view_toast.xml
@@ -0,0 +1,32 @@
+<?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>
diff --git a/contacts/src/main/res/layout/widget_layout.xml b/contacts/src/main/res/layout/widget_layout.xml
new file mode 100644
index 0000000..0dc6b46
--- /dev/null
+++ b/contacts/src/main/res/layout/widget_layout.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="40dp"
+	android:layout_height="40dp">
+
+	<ImageView
+		android:layout_width="40dp"
+		android:layout_height="40dp"
+		android:id="@+id/widgetlayoutImageView1"/>
+
+</LinearLayout>
+
diff --git a/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml b/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml
new file mode 100644
index 0000000..2626dd9
--- /dev/null
+++ b/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml
@@ -0,0 +1,15 @@
+<?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_calllog_phonenumber_copy"
+        android:title="Copy"/>
+    <item
+        android:id="@+id/item_calllog_phonenumber_yundun_test"
+        android:title="YunDun Test"/>
+    <item
+        android:id="@+id/item_calllog_phonenumber_add_contact"
+        android:title="Add Contact"/>
+    
+</menu>
diff --git a/contacts/src/main/res/menu/toolbar_contact_phonenumber.xml b/contacts/src/main/res/menu/toolbar_contact_phonenumber.xml
new file mode 100644
index 0000000..3e4a9e9
--- /dev/null
+++ b/contacts/src/main/res/menu/toolbar_contact_phonenumber.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/item_contact_phonenumber_copy"
+        android:title="Copy"/>
+    <item
+        android:id="@+id/item_calllog_phonenumber_edit_contact"
+        android:title="Edit Contact"/>
+    
+</menu>
diff --git a/contacts/src/main/res/menu/toolbar_main.xml b/contacts/src/main/res/menu/toolbar_main.xml
new file mode 100644
index 0000000..00359d9
--- /dev/null
+++ b/contacts/src/main/res/menu/toolbar_main.xml
@@ -0,0 +1,8 @@
+<?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_settings"
+        android:title="Settings"
+        app:showAsAction="ifRoom"/>
+</menu>
diff --git a/contacts/src/main/res/values/colors.xml b/contacts/src/main/res/values/colors.xml
new file mode 100644
index 0000000..5b13816
--- /dev/null
+++ b/contacts/src/main/res/values/colors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- WinBoLL 默认方案 -->
+    <color name="colorPrimary">#FF196ABC</color>
+    <color name="colorPrimaryDark">#FF002B57</color>
+    <color name="colorAccent">#FF80BFFF</color>
+    <color name="blue">#FF379AFF</color>
+    <color name="green">#FF69E551</color>
+    <color name="red">#FFE55151</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="lightgray">#FFE0E0E0</color>
+    
+</resources>
diff --git a/contacts/src/main/res/values/strings.xml b/contacts/src/main/res/values/strings.xml
new file mode 100644
index 0000000..8817cbe
--- /dev/null
+++ b/contacts/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Contacts</string>
+    <string name="default_bobulltoon_url">https://gitea.winboll.cc/Studio/BoBullToon/archive/main.zip</string>
+
+</resources>
diff --git a/contacts/src/main/res/values/styles.xml b/contacts/src/main/res/values/styles.xml
new file mode 100644
index 0000000..fecdea6
--- /dev/null
+++ b/contacts/src/main/res/values/styles.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 方案1：无 ActionBar 主题（推荐，适合自定义标题栏） -->
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+
+    </style>
+
+    <style name="GlobalCrashActivityTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="colorTittle">@color/colorAccent</item>
+        <item name="colorTittleBackgound">@color/colorPrimary</item>
+        <item name="colorText">@color/colorAccent</item>
+        <item name="colorTextBackgound">@color/colorPrimaryDark</item>
+
+    </style>
+
+    <!-- 方案2：带 ActionBar 主题（如需系统默认标题栏，启用此方案） -->
+    <!--
+    <style name="MyAppTheme" parent="Theme.MaterialComponents.Light">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+
+        <item name="android:textSizeHeadline">18sp</item>
+        <item name="android:textSizeBody">16sp</item>
+        <item name="android:textSizeSubtitle">14sp</item>
+        <item name="android:textSizeCaption">12sp</item>
+    </style>
+
+    <style name="GlobalCrashActivityTheme" parent="Theme.MaterialComponents.Light">
+        <item name="colorTittle">@color/colorAccent</item>
+        <item name="colorTittleBackgound">@color/colorPrimary</item>
+        <item name="colorText">@color/colorAccent</item>
+        <item name="colorTextBackgound">@color/colorPrimaryDark</item>
+
+        <item name="android:textSizeHeadline">20sp</item>
+        <item name="android:textSizeBody">14sp</item>
+        <item name="android:textSizeButton">16sp</item>
+    </style>
+    -->
+</resources>
+
diff --git a/contacts/src/main/res/xml/appwidget_provider_info.xml b/contacts/src/main/res/xml/appwidget_provider_info.xml
new file mode 100644
index 0000000..7dda9ab
--- /dev/null
+++ b/contacts/src/main/res/xml/appwidget_provider_info.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="40dp"
+    android:minHeight="40dp"
+    android:updatePeriodMillis="0"
+    android:initialLayout="@layout/widget_layout"
+    android:resizeMode="none">
+</appwidget-provider>
diff --git a/contacts/src/main/res/xml/file_provider.xml b/contacts/src/main/res/xml/file_provider.xml
new file mode 100644
index 0000000..f045677
--- /dev/null
+++ b/contacts/src/main/res/xml/file_provider.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path
+        name="external_storage_root"
+        path="." />
+    <files-path
+        name="files_path"
+        path="." />
+    <cache-path
+        name="cache_path"
+        path="." />
+    <!--/storage/emulated/0/Android/data/...-->
+    <external-files-path
+        name="external_file_path"
+        path="." />
+    <!--代表app 外部存储区域根目录下的文件 Context.getExternalCacheDir目录下的目录-->
+    <external-cache-path
+        name="external_cache_path"
+        path="." />
+    <!--配置root-path。这样子可以读取到sd卡和一些应用分身的目录，否则微信分身保存的图片，就会导致 java.lang.IllegalArgumentException: Failed to find configured root that contains /storage/emulated/999/tencent/MicroMsg/WeiXin/export1544062754693.jpg，在小米6的手机上微信分身有这个crash，华为没有
+    -->
+    <root-path
+        name="root_path"
+        path="" />
+</paths>
diff --git a/contacts/src/main/res/xml/network_security_config.xml b/contacts/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..9d70815
--- /dev/null
+++ b/contacts/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">winboll.cc</domain>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">10.8.0.12</domain>
+    </domain-config>
+</network-security-config>
diff --git a/contacts/src/stage/AndroidManifest.xml b/contacts/src/stage/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/contacts/src/stage/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/contacts/src/stage/res/values/strings.xml b/contacts/src/stage/res/values/strings.xml
new file mode 100644
index 0000000..ace0c41
--- /dev/null
+++ b/contacts/src/stage/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+
+</resources>
diff --git a/debugtemp/README.md b/debugtemp/README.md
new file mode 100644
index 0000000..070f4b4
--- /dev/null
+++ b/debugtemp/README.md
@@ -0,0 +1,37 @@
+# WinBoLL
+
+#### 介绍
+WinBoLL 应用编译功能临时调试项目
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh debugtemp
+
+#### 使用说明
+3. Termux应用配置：
+- 已安装Termux（包名 com.termux ）；
+- 执行  echo "allow-external-apps = true" > ~/.termux/termux.properties
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档
diff --git a/debugtemp/app_update_description.txt b/debugtemp/app_update_description.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debugtemp/app_update_description.txt
@@ -0,0 +1 @@
+
diff --git a/debugtemp/build.gradle b/debugtemp/build.gradle
new file mode 100644
index 0000000..12e9985
--- /dev/null
+++ b/debugtemp/build.gradle
@@ -0,0 +1,120 @@
+apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+    // 检查编译标志位配置
+    assert (winbollBuildProps['stageCount'] != null)
+    assert (winbollBuildProps['baseVersion'] != null)
+    // 保存基础版本号
+    winbollBuildProps.setProperty("baseVersion", "${versionName}");
+    //保存编译标志配置
+    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+    fos.close();
+    
+    // 返回编译版本号
+    return "${versionName}." + winbollBuildProps['stageCount']
+}
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+	
+    defaultConfig {
+        applicationId "cc.winboll.studio.debugtemp"
+	    minSdkVersion 23
+		// 适配MIUI12
+        targetSdkVersion 30
+        versionCode 1
+        // versionName 更新后需要手动设置 
+        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.0"
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
+}
+
+dependencies {
+	api project(':libdebugtemp')
+    
+    api 'com.google.code.gson:gson:2.10.1'
+	
+	// 下拉控件
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// OkHttp网络请求
+     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+     // FastJSON解析
+     implementation 'com.alibaba:fastjson:1.2.76'
+    
+	// AndroidX 类库
+    /*api 'androidx.appcompat:appcompat:1.1.0'
+    //api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'*/
+	
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+
+	implementation "androidx.annotation:annotation:1.3.0"
+    implementation "androidx.core:core:1.6.0"
+    implementation "androidx.drawerlayout:drawerlayout:1.1.1"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.guava:guava:24.1-jre"
+    /*
+	implementation "io.noties.markwon:core:$markwonVersion"
+    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+    implementation "io.noties.markwon:linkify:$markwonVersion"
+    implementation "io.noties.markwon:recycler:$markwonVersion"
+	*/
+	implementation 'com.termux:terminal-emulator:0.118.0'
+	implementation 'com.termux:terminal-view:0.118.0'
+	implementation 'com.termux:termux-shared:0.118.0'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+	api 'cc.winboll.studio:libaes:15.15.2'
+    api 'cc.winboll.studio:libappbase:15.15.11'
+	
+	// WinBoLL备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
+	
+	api fileTree(dir: 'libs', include: ['*.jar'])
+}
diff --git a/debugtemp/build.properties b/debugtemp/build.properties
new file mode 100644
index 0000000..9805e56
--- /dev/null
+++ b/debugtemp/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Fri May 01 17:09:11 HKT 2026
+stageCount=57
+libraryProject=libdebugtemp
+baseVersion=15.0
+publishVersion=15.0.56
+buildCount=0
+baseBetaVersion=15.0.57
diff --git a/debugtemp/proguard-rules.pro b/debugtemp/proguard-rules.pro
new file mode 100644
index 0000000..a18de74
--- /dev/null
+++ b/debugtemp/proguard-rules.pro
@@ -0,0 +1,137 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# ============================== 基础通用规则 ==============================
+# 保留系统组件
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+# 保留 WinBoLL 核心包及子类（合并简化规则）
+-keep class cc.winboll.studio.** { *; }
+-keepclassmembers class cc.winboll.studio.** { *; }
+
+# 保留所有类中的 public static final String TAG 字段（便于日志定位）
+-keepclassmembers class * {
+    public static final java.lang.String TAG;
+}
+
+# 保留序列化类（避免Parcelable/Gson解析异常）
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留 R 文件（避免资源ID混淆）
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 保留 native 方法（避免JNI调用失败）
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保留注解和泛型（避免反射/序列化异常）
+-keepattributes *Annotation*
+-keepattributes Signature
+
+# 屏蔽 Java 8+ 警告（适配 Java 7 语法）
+-dontwarn java.lang.invoke.*
+-dontwarn android.support.v8.renderscript.*
+-dontwarn java.util.function.**
+
+# ============================== 第三方框架专项规则 ==============================
+# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容）
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class okhttp3.internal.** { *; }
+-keep class okio.** { *; }
+-dontwarn okhttp3.internal.platform.**
+-dontwarn okio.**
+
+# Glide 4.9.0（米盟广告图片加载依赖）
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
+    **[] $VALUES;
+    public *;
+}
+-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule {
+    <init>();
+}
+-dontwarn com.bumptech.glide.**
+
+# Gson 2.8.5（米盟广告数据序列化依赖）
+-keep class com.google.gson.** { *; }
+-keep interface com.google.gson.** { *; }
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 米盟 SDK（核心广告组件，完整保留避免加载失败）
+-keep class com.miui.zeus.** { *; }
+-keep interface com.miui.zeus.** { *; }
+# 保留米盟日志字段（便于广告加载失败排查）
+-keepclassmembers class com.miui.zeus.mimo.sdk.** {
+    public static final java.lang.String TAG;
+}
+
+# RecyclerView 1.0.0（米盟广告布局渲染依赖）
+-keep class androidx.recyclerview.** { *; }
+-keep interface androidx.recyclerview.** { *; }
+-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter {
+    public *;
+}
+
+# 其他第三方框架（按引入依赖保留，无则可删除）
+# XXPermissions 18.63
+-keep class com.hjq.permissions.** { *; }
+-keep interface com.hjq.permissions.** { *; }
+
+# ZXing 二维码（核心解析组件）
+-keep class com.google.zxing.** { *; }
+-keep class com.journeyapps.zxing.** { *; }
+
+# Jsoup HTML解析
+-keep class org.jsoup.** { *; }
+
+# Pinyin4j 拼音搜索
+-keep class net.sourceforge.pinyin4j.** { *; }
+
+# JSch SSH组件
+-keep class com.jcraft.jsch.** { *; }
+
+# AndroidX 基础组件
+-keep class androidx.appcompat.** { *; }
+-keep interface androidx.appcompat.** { *; }
+
+# ============================== 优化与调试配置 ==============================
+# 优化级别（平衡混淆效果与性能）
+-optimizationpasses 5
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+
+# 调试辅助（保留行号便于崩溃定位）
+-verbose
+-dontpreverify
+-dontusemixedcaseclassnames
+-keepattributes SourceFile,LineNumberTable
+
diff --git a/debugtemp/src/beta/AndroidManifest.xml b/debugtemp/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/debugtemp/src/beta/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/debugtemp/src/beta/res/values/strings.xml b/debugtemp/src/beta/res/values/strings.xml
new file mode 100644
index 0000000..c7757f1
--- /dev/null
+++ b/debugtemp/src/beta/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">DebugTemp☆</string>
+
+</resources>
diff --git a/debugtemp/src/main/AndroidManifest.xml b/debugtemp/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..9056a79
--- /dev/null
+++ b/debugtemp/src/main/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.debugtemp">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
+        android:theme="@style/MyAppTheme"
+        android:resizeableActivity="true"
+        android:name=".App">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="4.0"/>
+
+        <activity android:name=".GlobalApplication$CrashActivity"/>
+
+    </application>
+
+</manifest>
diff --git a/debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java
new file mode 100644
index 0000000..a2d9d99
--- /dev/null
+++ b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/App.java
@@ -0,0 +1,340 @@
+package cc.winboll.studio.debugtemp;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+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;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.widget.Toast;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.ToastUtils;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class App extends GlobalApplication {
+
+    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+		
+        //CrashHandler.getInstance().registerGlobal(this);
+        //CrashHandler.getInstance().registerPart(this);
+    }
+
+    public static void write(InputStream input, OutputStream output) throws IOException {
+        byte[] buf = new byte[1024 * 8];
+        int len;
+        while ((len = input.read(buf)) != -1) {
+            output.write(buf, 0, len);
+        }
+    }
+
+    public static void write(File file, byte[] data) throws IOException {
+        File parent = file.getParentFile();
+        if (parent != null && !parent.exists()) parent.mkdirs();
+
+        ByteArrayInputStream input = new ByteArrayInputStream(data);
+        FileOutputStream output = new FileOutputStream(file);
+        try {
+            write(input, output);
+        } finally {
+            closeIO(input, output);
+        }
+    }
+
+    public static String toString(InputStream input) throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        write(input, output);
+        try {
+            return output.toString("UTF-8");
+        } finally {
+            closeIO(input, output);
+        }
+    }
+
+    public static void closeIO(Closeable... closeables) {
+        for (Closeable closeable : closeables) {
+            try {
+                if (closeable != null) closeable.close();
+            } catch (IOException ignored) {}
+        }
+    }
+
+    public static class CrashHandler {
+
+        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
+
+        private static CrashHandler sInstance;
+
+        private PartCrashHandler mPartCrashHandler;
+
+        public static CrashHandler getInstance() {
+            if (sInstance == null) {
+                sInstance = new CrashHandler();
+            }
+            return sInstance;
+        }
+
+        public void registerGlobal(Context context) {
+            registerGlobal(context, null);
+        }
+
+        public void registerGlobal(Context context, String crashDir) {
+            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
+        }
+
+        public void unregister() {
+            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
+        }
+
+        public void registerPart(Context context) {
+            unregisterPart(context);
+            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
+            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
+        }
+
+        public void unregisterPart(Context context) {
+            if (mPartCrashHandler != null) {
+                mPartCrashHandler.isRunning.set(false);
+                mPartCrashHandler = null;
+            }
+        }
+
+        private static class PartCrashHandler implements Runnable {
+
+            private final Context mContext;
+
+            public AtomicBoolean isRunning = new AtomicBoolean(true);
+
+            public PartCrashHandler(Context context) {
+                this.mContext = context;
+            }
+
+            @Override
+            public void run() {
+                while (isRunning.get()) {
+                    try {
+                        Looper.loop();
+                    } catch (final Throwable e) {
+                        e.printStackTrace();
+                        if (isRunning.get()) {
+                            MAIN_HANDLER.post(new Runnable(){
+
+                                    @Override
+                                    public void run() {
+                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
+                                    }
+                                });
+                        } else {
+                            if (e instanceof RuntimeException) {
+                                throw (RuntimeException)e;
+                            } else {
+                                throw new RuntimeException(e);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
+
+            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
+
+            private final Context mContext;
+
+            private final File mCrashDir;
+
+            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
+                this.mContext = context;
+                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
+            }
+
+            @Override
+            public void uncaughtException(Thread thread, Throwable throwable) {
+                try {
+
+                    String log = buildLog(throwable);
+                    writeLog(log);
+
+                    try {
+                        Intent intent = new Intent(mContext, CrashActivity.class);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        intent.putExtra(Intent.EXTRA_TEXT, log);
+                        mContext.startActivity(intent);
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                        writeLog(e.toString());
+                    }
+
+                    throwable.printStackTrace();
+                    android.os.Process.killProcess(android.os.Process.myPid());
+                    System.exit(0);
+
+                } catch (Throwable e) {
+                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
+                }
+            }
+
+            private String buildLog(Throwable throwable) {
+                String time = DATE_FORMAT.format(new Date());
+
+                String versionName = "unknown";
+                long versionCode = 0;
+                try {
+                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
+                    versionName = packageInfo.versionName;
+                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
+                } catch (Throwable ignored) {}
+
+                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
+                head.put("Time Of Crash", time);
+                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
+                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
+                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
+                head.put("Kernel", getKernel());
+                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
+                head.put("Fingerprint", Build.FINGERPRINT);
+
+                StringBuilder builder = new StringBuilder();
+
+                for (String key : head.keySet()) {
+                    if (builder.length() != 0) builder.append("\n");
+                    builder.append(key);
+                    builder.append(" :    ");
+                    builder.append(head.get(key));
+                }
+
+                builder.append("\n\n");
+                builder.append(Log.getStackTraceString(throwable));
+
+                return builder.toString(); 
+            }
+
+            private void writeLog(String log) {
+                String time = DATE_FORMAT.format(new Date());
+                File file = new File(mCrashDir, "crash_" + time + ".txt");
+                try {
+                    write(file, log.getBytes("UTF-8"));
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                } 
+            }
+
+            private static String getKernel() {
+                try {
+                    return App.toString(new FileInputStream("/proc/version")).trim();
+                } catch (Throwable e) {
+                    return e.getMessage();
+                }
+            }
+        }
+    }
+
+    public static final class CrashActivity extends Activity {
+
+        private String mLog;
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            setTheme(android.R.style.Theme_DeviceDefault);
+            setTitle("App Crash");
+
+            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+
+            ScrollView contentView = new ScrollView(this);
+            contentView.setFillViewport(true);
+
+            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
+
+            TextView textView = new TextView(this);
+            int padding = dp2px(16);
+            textView.setPadding(padding, padding, padding, padding);
+            textView.setText(mLog);
+            textView.setTextIsSelectable(true);
+            textView.setTypeface(Typeface.DEFAULT);
+            textView.setLinksClickable(true);
+
+            horizontalScrollView.addView(textView);
+            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+
+            setContentView(contentView);
+        }
+
+        private void restart() {
+            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
+            if (intent != null) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+            finish();
+            android.os.Process.killProcess(android.os.Process.myPid());
+            System.exit(0);
+        }
+
+        private static int dp2px(float dpValue) {
+            final float scale = Resources.getSystem().getDisplayMetrics().density;
+            return (int) (dpValue * scale + 0.5f);
+        }
+
+        @Override
+        public boolean onCreateOptionsMenu(Menu menu) {
+            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            return super.onCreateOptionsMenu(menu);
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            switch (item.getItemId()) {
+                case android.R.id.copy:
+                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
+                    return true;
+            }
+            return super.onOptionsItemSelected(item);
+        }
+
+        @Override
+        public void onBackPressed() {
+            restart();
+        }
+    }
+}
diff --git a/debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java
new file mode 100644
index 0000000..4f5927b
--- /dev/null
+++ b/debugtemp/src/main/java/cc/winboll/studio/debugtemp/MainActivity.java
@@ -0,0 +1,38 @@
+package cc.winboll.studio.debugtemp;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.LibraryActivity;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class MainActivity extends AppCompatActivity {
+
+	LogView mLogView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
+
+        mLogView = findViewById(R.id.logview);
+
+        ToastUtils.show("onCreate");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mLogView.start();
+    }
+
+    public void onLibraryActivity(View view) {
+		startActivity(new Intent(this, LibraryActivity.class));
+    }
+}
diff --git a/debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml b/debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..c7bd21d
--- /dev/null
+++ b/debugtemp/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
diff --git a/debugtemp/src/main/res/drawable/ic_launcher_background.xml b/debugtemp/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..d5fccc5
--- /dev/null
+++ b/debugtemp/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
diff --git a/debugtemp/src/main/res/layout/activity_main.xml b/debugtemp/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..ee193ec
--- /dev/null
+++ b/debugtemp/src/main/res/layout/activity_main.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:gravity="center_vertical|center_horizontal">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="DebugTemp"
+			android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Open LibraryActivity"
+			android:onClick="onLibraryActivity"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
+
+		<cc.winboll.studio.libappbase.LogView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/logview"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+
diff --git a/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/debugtemp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/debugtemp/src/main/res/mipmap-hdpi/ic_launcher.png b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..a2f5908
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/debugtemp/src/main/res/mipmap-hdpi/ic_launcher_round.png b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b52399
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/debugtemp/src/main/res/mipmap-mdpi/ic_launcher.png b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..ff10afd
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/debugtemp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..115a4c7
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher.png b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..dcd3cd8
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..459ca60
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8ca12fe
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8e19b41
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b824ebd
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4c19a13
Binary files /dev/null and b/debugtemp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/debugtemp/src/main/res/values/colors.xml b/debugtemp/src/main/res/values/colors.xml
new file mode 100644
index 0000000..479769a
--- /dev/null
+++ b/debugtemp/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#009688</color>
+    <color name="colorPrimaryDark">#00796B</color>
+    <color name="colorAccent">#FF9800</color>
+</resources>
\ No newline at end of file
diff --git a/debugtemp/src/main/res/values/strings.xml b/debugtemp/src/main/res/values/strings.xml
new file mode 100644
index 0000000..cddc36c
--- /dev/null
+++ b/debugtemp/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">DebugTemp</string>
+    
+</resources>
diff --git a/debugtemp/src/main/res/values/styles.xml b/debugtemp/src/main/res/values/styles.xml
new file mode 100644
index 0000000..a70e242
--- /dev/null
+++ b/debugtemp/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/debugtemp/src/stage/AndroidManifest.xml b/debugtemp/src/stage/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/debugtemp/src/stage/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/debugtemp/src/stage/res/values/strings.xml b/debugtemp/src/stage/res/values/strings.xml
new file mode 100644
index 0000000..ace0c41
--- /dev/null
+++ b/debugtemp/src/stage/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+
+</resources>
diff --git a/gallery/README.md b/gallery/README.md
new file mode 100644
index 0000000..33637b0
--- /dev/null
+++ b/gallery/README.md
@@ -0,0 +1,34 @@
+# Gallery
+
+#### 介绍
+云宝相册应用
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh gallery
+
+#### 使用说明
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档
diff --git a/gallery/app_update_description.txt b/gallery/app_update_description.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/gallery/app_update_description.txt
@@ -0,0 +1 @@
+
diff --git a/gallery/build.gradle b/gallery/build.gradle
new file mode 100644
index 0000000..7d8c427
--- /dev/null
+++ b/gallery/build.gradle
@@ -0,0 +1,119 @@
+apply plugin: 'com.android.application'
+apply from: '../.winboll/winboll_app_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+def genVersionName(def versionName){
+    // 检查编译标志位配置
+    assert (winbollBuildProps['stageCount'] != null)
+    assert (winbollBuildProps['baseVersion'] != null)
+    // 保存基础版本号
+    winbollBuildProps.setProperty("baseVersion", "${versionName}");
+    //保存编译标志配置
+    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
+    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
+    fos.close();
+    
+    // 返回编译版本号
+    return "${versionName}." + winbollBuildProps['stageCount']
+}
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+	
+    defaultConfig {
+        applicationId "cc.winboll.studio.gallery"
+	    minSdkVersion 23
+		// 适配MIUI12
+        targetSdkVersion 30
+        versionCode 1
+        // versionName 更新后需要手动设置 
+        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
+        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
+        versionName "15.0"
+        if(true) {
+            versionName = genVersionName("${versionName}")
+        }
+    }
+
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
+    }
+	
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs'] // 若SO库放在libs目录下
+        }
+    }
+}
+
+dependencies {
+    
+    api 'com.google.code.gson:gson:2.10.1'
+	
+	// 下拉控件
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// OkHttp网络请求
+     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+     // FastJSON解析
+     implementation 'com.alibaba:fastjson:1.2.76'
+    
+	// AndroidX 类库
+    /*api 'androidx.appcompat:appcompat:1.1.0'
+    //api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'*/
+	
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+
+	implementation "androidx.annotation:annotation:1.3.0"
+    implementation "androidx.core:core:1.6.0"
+    implementation "androidx.drawerlayout:drawerlayout:1.1.1"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.guava:guava:24.1-jre"
+    /*
+	implementation "io.noties.markwon:core:$markwonVersion"
+    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+    implementation "io.noties.markwon:linkify:$markwonVersion"
+    implementation "io.noties.markwon:recycler:$markwonVersion"
+	*/
+	/*implementation 'com.termux:terminal-emulator:0.118.0'
+	implementation 'com.termux:terminal-view:0.118.0'
+	implementation 'com.termux:termux-shared:0.118.0'
+	*/
+	// WinBoLL库 nexus.winboll.cc 地址
+	api 'cc.winboll.studio:libaes:15.15.9'
+    api 'cc.winboll.studio:libappbase:15.15.21'
+	
+	// WinBoLL备用库 jitpack.io 地址
+	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
+	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
+	
+	api fileTree(dir: 'libs', include: ['*.jar'])
+}
diff --git a/gallery/build.properties b/gallery/build.properties
new file mode 100644
index 0000000..167b855
--- /dev/null
+++ b/gallery/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Sat May 02 10:32:03 CST 2026
+stageCount=16
+libraryProject=
+baseVersion=15.0
+publishVersion=15.0.15
+buildCount=19
+baseBetaVersion=15.0.16
diff --git a/gallery/proguard-rules.pro b/gallery/proguard-rules.pro
new file mode 100644
index 0000000..a18de74
--- /dev/null
+++ b/gallery/proguard-rules.pro
@@ -0,0 +1,137 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# ============================== 基础通用规则 ==============================
+# 保留系统组件
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+# 保留 WinBoLL 核心包及子类（合并简化规则）
+-keep class cc.winboll.studio.** { *; }
+-keepclassmembers class cc.winboll.studio.** { *; }
+
+# 保留所有类中的 public static final String TAG 字段（便于日志定位）
+-keepclassmembers class * {
+    public static final java.lang.String TAG;
+}
+
+# 保留序列化类（避免Parcelable/Gson解析异常）
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留 R 文件（避免资源ID混淆）
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 保留 native 方法（避免JNI调用失败）
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保留注解和泛型（避免反射/序列化异常）
+-keepattributes *Annotation*
+-keepattributes Signature
+
+# 屏蔽 Java 8+ 警告（适配 Java 7 语法）
+-dontwarn java.lang.invoke.*
+-dontwarn android.support.v8.renderscript.*
+-dontwarn java.util.function.**
+
+# ============================== 第三方框架专项规则 ==============================
+# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容）
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class okhttp3.internal.** { *; }
+-keep class okio.** { *; }
+-dontwarn okhttp3.internal.platform.**
+-dontwarn okio.**
+
+# Glide 4.9.0（米盟广告图片加载依赖）
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
+    **[] $VALUES;
+    public *;
+}
+-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule {
+    <init>();
+}
+-dontwarn com.bumptech.glide.**
+
+# Gson 2.8.5（米盟广告数据序列化依赖）
+-keep class com.google.gson.** { *; }
+-keep interface com.google.gson.** { *; }
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 米盟 SDK（核心广告组件，完整保留避免加载失败）
+-keep class com.miui.zeus.** { *; }
+-keep interface com.miui.zeus.** { *; }
+# 保留米盟日志字段（便于广告加载失败排查）
+-keepclassmembers class com.miui.zeus.mimo.sdk.** {
+    public static final java.lang.String TAG;
+}
+
+# RecyclerView 1.0.0（米盟广告布局渲染依赖）
+-keep class androidx.recyclerview.** { *; }
+-keep interface androidx.recyclerview.** { *; }
+-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter {
+    public *;
+}
+
+# 其他第三方框架（按引入依赖保留，无则可删除）
+# XXPermissions 18.63
+-keep class com.hjq.permissions.** { *; }
+-keep interface com.hjq.permissions.** { *; }
+
+# ZXing 二维码（核心解析组件）
+-keep class com.google.zxing.** { *; }
+-keep class com.journeyapps.zxing.** { *; }
+
+# Jsoup HTML解析
+-keep class org.jsoup.** { *; }
+
+# Pinyin4j 拼音搜索
+-keep class net.sourceforge.pinyin4j.** { *; }
+
+# JSch SSH组件
+-keep class com.jcraft.jsch.** { *; }
+
+# AndroidX 基础组件
+-keep class androidx.appcompat.** { *; }
+-keep interface androidx.appcompat.** { *; }
+
+# ============================== 优化与调试配置 ==============================
+# 优化级别（平衡混淆效果与性能）
+-optimizationpasses 5
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+
+# 调试辅助（保留行号便于崩溃定位）
+-verbose
+-dontpreverify
+-dontusemixedcaseclassnames
+-keepattributes SourceFile,LineNumberTable
+
diff --git a/gallery/src/beta/AndroidManifest.xml b/gallery/src/beta/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/gallery/src/beta/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/gallery/src/beta/res/values/strings.xml b/gallery/src/beta/res/values/strings.xml
new file mode 100644
index 0000000..9a532e7
--- /dev/null
+++ b/gallery/src/beta/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+    <string name="app_name">Gallery+</string>
+</resources>
diff --git a/gallery/src/main/AndroidManifest.xml b/gallery/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..e806f31
--- /dev/null
+++ b/gallery/src/main/AndroidManifest.xml
@@ -0,0 +1,66 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.gallery">
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme"
+        android:resizeableActivity="true"
+        android:name=".GlobalWinBoLLApplication"
+		android:requestLegacyExternalStorage="true">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+        </activity>
+
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/settings_title"/>
+
+        <activity
+            android:name=".AlbumActivity"
+            android:label="@string/app_name"/>
+
+        <activity
+            android:name=".ImageViewerActivity"
+            android:label="@string/app_name"/>
+
+        <activity
+            android:name=".TrashActivity"
+            android:label="@string/trash"/>
+            
+        <activity
+            android:name=".CropActivity"
+            android:label="调整封面"/>
+        
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about"/>
+
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="4.0"/>
+
+        <activity android:name=".GlobalApplication$CrashActivity"/>
+
+    </application>
+
+</manifest>
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/AboutActivity.java b/gallery/src/main/java/cc/winboll/studio/gallery/AboutActivity.java
new file mode 100644
index 0000000..f9afe0e
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/AboutActivity.java
@@ -0,0 +1,51 @@
+package cc.winboll.studio.gallery;
+
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.models.APPInfo;
+import cc.winboll.studio.libappbase.views.AboutView;
+
+public class AboutActivity extends AppCompatActivity {
+
+    public static final String TAG = "AboutActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        AboutView aboutView = findViewById(R.id.aboutview);
+        aboutView.setAPPInfo(genDefaultAppInfo());
+    }
+
+    private APPInfo genDefaultAppInfo() {
+        LogUtils.d(TAG, "genDefaultAppInfo() 调用");
+        String branchName = "gallery";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("Gallery");
+        appInfo.setAppIcon(R.drawable.ic_winboll);
+        appInfo.setAppDescription(getString(R.string.app_description));
+        appInfo.setAppGitName("WinBoLL");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(branchName);
+        appInfo.setAppGitAPPSubProjectFolder(branchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=Gallery");
+        appInfo.setAppAPKName("Gallery");
+        appInfo.setAppAPKFolderName("Gallery");
+        LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成");
+        return appInfo;
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/Album.java b/gallery/src/main/java/cc/winboll/studio/gallery/Album.java
new file mode 100644
index 0000000..42aaa02
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/Album.java
@@ -0,0 +1,25 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class Album {
+    public static final String TAG = "Album";
+    private String name;
+    private String path;
+    private Uri coverUri;
+    private int imageCount;
+
+    public Album(String name, String path, Uri coverUri, int imageCount) {
+        LogUtils.d(TAG, "Album created: " + name);
+        this.name = name;
+        this.path = path;
+        this.coverUri = coverUri;
+        this.imageCount = imageCount;
+    }
+
+    public String getName() { return name; }
+    public String getPath() { return path; }
+    public Uri getCoverUri() { return coverUri; }
+    public int getImageCount() { return imageCount; }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/AlbumActivity.java b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumActivity.java
new file mode 100644
index 0000000..a9ccac2
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumActivity.java
@@ -0,0 +1,251 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+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.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.gallery.ImageAdapter.OnImageClickListener;
+
+public class AlbumActivity extends AppCompatActivity {
+    public static final String TAG = "AlbumActivity";
+    private static final int PERMISSION_REQUEST_CODE = 101;
+    public static final String EXTRA_ALBUM_PATH = "album_path";
+    public static final String EXTRA_ALBUM_NAME = "album_name";
+    private RecyclerView recyclerView;
+    private ImageAdapter adapter;
+    private String albumPath;
+    private String albumName;
+    private FloatingActionButton fabScrollTop;
+    private Preferences prefs;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
+        
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        
+        albumPath = getIntent().getStringExtra(EXTRA_ALBUM_PATH);
+        albumName = getIntent().getStringExtra(EXTRA_ALBUM_NAME);
+        
+        getSupportActionBar().setTitle(albumName);
+        
+        prefs = new Preferences(this);
+        
+        recyclerView = findViewById(R.id.recycler_view);
+        recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+        adapter = new ImageAdapter();
+        adapter.setContext(this);
+        adapter.setAlbumPath(albumPath);
+        recyclerView.setAdapter(adapter);
+        
+        fabScrollTop = findViewById(R.id.fab_scroll_top);
+        fabScrollTop.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                recyclerView.scrollToPosition(0);
+            }
+        });
+        
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                GridLayoutManager layoutManager = (GridLayoutManager) recyclerView.getLayoutManager();
+                if (layoutManager != null) {
+                    int firstVisible = layoutManager.findFirstVisibleItemPosition();
+                    if (firstVisible > 0) {
+                        fabScrollTop.setVisibility(View.VISIBLE);
+                    } else {
+                        fabScrollTop.setVisibility(View.GONE);
+                    }
+                }
+            }
+        });
+        
+        adapter.setOnImageClickListener(new OnImageClickListener() {
+            @Override
+            public void onImageClick(int position, ArrayList<Uri> urls, ArrayList<String> paths) {
+                Intent intent = new Intent(AlbumActivity.this, ImageViewerActivity.class);
+                intent.putParcelableArrayListExtra(ImageViewerActivity.EXTRA_IMAGE_URLS, urls);
+                intent.putStringArrayListExtra(ImageViewerActivity.EXTRA_POSITIONS, paths);
+                intent.putExtra(ImageViewerActivity.EXTRA_POSITION, position);
+                startActivity(intent);
+            }
+        });
+        
+        if (checkPermission()) {
+            loadImages();
+        } else {
+            requestPermission();
+        }
+    }
+
+    private boolean checkPermission() {
+        return ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE) 
+            == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, 
+            new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE}, 
+            PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, 
+            @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                loadImages();
+            } else {
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+private String getSortOrder(int sortMode) {
+        switch (sortMode) {
+            case Preferences.SORT_TIME_ASC:
+                return android.provider.MediaStore.Images.Media.DATE_ADDED + " ASC";
+            case Preferences.SORT_NAME_DESC:
+                return android.provider.MediaStore.Images.Media.DISPLAY_NAME + " DESC";
+            case Preferences.SORT_NAME_ASC:
+                return android.provider.MediaStore.Images.Media.DISPLAY_NAME + " ASC";
+            case Preferences.SORT_TIME_DESC:
+            default:
+                return android.provider.MediaStore.Images.Media.DATE_ADDED + " DESC";
+        }
+    }
+    
+    private void loadImages() {
+        LogUtils.d(TAG, "loadImages");
+        ArrayList<Uri> imageUrls = new ArrayList<>();
+        ArrayList<String> imagePaths = new ArrayList<>();
+        ContentResolver contentResolver = getContentResolver();
+        Uri collection = android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+        
+        String selection = android.provider.MediaStore.Images.Media.DATA + " LIKE ?";
+        String[] selectionArgs = new String[]{albumPath + "%"};
+        int sortMode = prefs.getAlbumSortMode();
+        String sortOrder = getSortOrder(sortMode);
+        
+        try (Cursor cursor = contentResolver.query(collection, null, selection, selectionArgs, sortOrder)) {
+            if (cursor != null) {
+                int dataColumn = cursor.getColumnIndexOrThrow(android.provider.MediaStore.Images.Media.DATA);
+                while (cursor.moveToNext()) {
+                    String path = cursor.getString(dataColumn);
+                    if (path != null && path.startsWith(albumPath + "/")) {
+                        long id = cursor.getLong(cursor.getColumnIndexOrThrow(android.provider.MediaStore.Images.Media._ID));
+                        Uri contentUri = Uri.withAppendedPath(collection, String.valueOf(id));
+                        imageUrls.add(contentUri);
+                        imagePaths.add(path);
+                    }
+                }
+            }
+        }
+        
+        if (imageUrls.isEmpty()) {
+            Toast.makeText(this, R.string.no_images_found, Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "No images found");
+        }
+        adapter.setData(imageUrls, imagePaths);
+        LogUtils.d(TAG, "Loaded " + imageUrls.size() + " images");
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_album, menu);
+        int sortMode = prefs.getAlbumSortMode();
+        int menuId = getSortMenuId(sortMode);
+        MenuItem item = menu.findItem(menuId);
+        if (item != null) {
+            item.setChecked(true);
+        }
+        MenuItem sortItem = menu.findItem(R.id.action_sort);
+        if (sortItem != null && sortItem.getSubMenu() != null) {
+            sortItem.getSubMenu().setGroupCheckable(0, true, true);
+        }
+        return true;
+    }
+    
+    private int getSortMenuId(int sortMode) {
+        switch (sortMode) {
+            case Preferences.SORT_TIME_ASC:
+                return R.id.sort_time_asc;
+            case Preferences.SORT_NAME_DESC:
+                return R.id.sort_name_desc;
+            case Preferences.SORT_NAME_ASC:
+                return R.id.sort_name_asc;
+            case Preferences.SORT_TIME_DESC:
+            default:
+                return R.id.sort_time_desc;
+        }
+    }
+    
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        int itemId = item.getItemId();
+        if (itemId == R.id.sort_time_desc) {
+            prefs.setAlbumSortMode(Preferences.SORT_TIME_DESC);
+            item.setChecked(true);
+            loadImages();
+            return true;
+        } else if (itemId == R.id.sort_time_asc) {
+            prefs.setAlbumSortMode(Preferences.SORT_TIME_ASC);
+            item.setChecked(true);
+            loadImages();
+            return true;
+        } else if (itemId == R.id.sort_name_desc) {
+            prefs.setAlbumSortMode(Preferences.SORT_NAME_DESC);
+            item.setChecked(true);
+            loadImages();
+            return true;
+        } else if (itemId == R.id.sort_name_asc) {
+            prefs.setAlbumSortMode(Preferences.SORT_NAME_ASC);
+            item.setChecked(true);
+            loadImages();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (checkPermission()) {
+            loadImages();
+        }
+        if (adapter != null) {
+            adapter.refreshBg();
+        }
+    }
+    
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 100 && resultCode == RESULT_OK) {
+            loadImages();
+        }
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java
new file mode 100644
index 0000000..fa435bd
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumAdapter.java
@@ -0,0 +1,255 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder> {
+    public static final String TAG = "AlbumAdapter";
+    private ArrayList<Album> albums = new ArrayList<>();
+    private OnAlbumClickListener listener;
+    private Preferences prefs;
+    private int bgType = 0;
+    private PinnedAlbumDbHelper pinnedDbHelper;
+    private OnCoverSizeListener coverSizeListener;
+    private boolean coverSizeReported = false;
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
+    }
+
+    public interface OnAlbumClickListener {
+        void onAlbumClick(Album album);
+    }
+    
+    public interface OnCoverSizeListener {
+        void onCoverSize(int width, int height);
+    }
+    
+    public static final int DEFAULT_COVER_WIDTH = 240;
+    public static final int DEFAULT_COVER_HEIGHT = 120;
+    
+    public void setOnAlbumClickListener(OnAlbumClickListener listener) {
+        this.listener = listener;
+    }
+    
+    public void setOnCoverSizeListener(OnCoverSizeListener listener) {
+        this.coverSizeListener = listener;
+    }
+
+    public void setData(ArrayList<Album> albums) {
+        this.albums = sortAlbums(albums);
+        LogUtils.d(TAG, "setData: " + albums.size() + " albums");
+        notifyDataSetChanged();
+    }
+    
+    private ArrayList<Album> sortAlbums(ArrayList<Album> list) {
+        if (pinnedDbHelper == null || list == null || list.isEmpty()) {
+            return list;
+        }
+        ArrayList<Album> pinned = new ArrayList<>();
+        ArrayList<Album> unpinned = new ArrayList<>();
+        for (Album album : list) {
+            if (pinnedDbHelper.isPinned(album.getPath())) {
+                pinned.add(album);
+            } else {
+                unpinned.add(album);
+            }
+        }
+        pinned.addAll(unpinned);
+        return pinned;
+    }
+    
+    public void setContext(android.content.Context context) {
+        prefs = new Preferences(context);
+        bgType = prefs.getBgType();
+        pinnedDbHelper = PinnedAlbumDbHelper.getInstance(context);
+    }
+    
+    public void refreshBg() {
+        if (prefs != null) {
+            bgType = prefs.getBgType();
+        }
+        notifyDataSetChanged();
+    }
+    
+    public void refreshCover() {
+        notifyDataSetChanged();
+    }
+    
+    public void refreshPinned() {
+        if (pinnedDbHelper != null && albums != null && !albums.isEmpty()) {
+            ArrayList<Album> pinned = new ArrayList<>();
+            ArrayList<Album> unpinned = new ArrayList<>();
+            for (Album album : albums) {
+                if (pinnedDbHelper.isPinned(album.getPath())) {
+                    pinned.add(album);
+                } else {
+                    unpinned.add(album);
+                }
+            }
+            Comparator<Album> nameComparator = new Comparator<Album>() {
+                @Override
+                public int compare(Album a1, Album a2) {
+                    return a1.getName().compareToIgnoreCase(a2.getName());
+                }
+            };
+            Collections.sort(pinned, nameComparator);
+            Collections.sort(unpinned, nameComparator);
+            albums.clear();
+            albums.addAll(pinned);
+            albums.addAll(unpinned);
+            notifyDataSetChanged();
+        }
+    }
+    
+private void showContextMenu(View view, final Album album) {
+        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(view.getContext());
+        builder.setTitle(album.getName());
+        final boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(album.getPath());
+        String[] items = isPinned ? new String[]{"取消置顶"} : new String[]{"置顶"};
+        builder.setItems(items, new android.content.DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(android.content.DialogInterface dialog, int which) {
+                if (pinnedDbHelper != null) {
+                    if (which == 0) {
+                        if (isPinned) {
+                            pinnedDbHelper.unpinAlbum(album.getPath());
+                        } else {
+                            pinnedDbHelper.pinAlbum(album.getPath());
+                        }
+                        refreshPinned();
+                    }
+                }
+            }
+        });
+        builder.show();
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_album, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        final Album album = albums.get(position);
+        LogUtils.d(TAG, "bind: " + album.getName() + ", cover=" + album.getCoverUri());
+        
+        holder.coverImage.setBackgroundResource(getBgRes());
+        
+        boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(album.getPath());
+        holder.pinIcon.setVisibility(isPinned ? View.VISIBLE : View.GONE);
+        
+        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                showContextMenu(holder.itemView, album);
+                return true;
+            }
+        });
+        
+        holder.albumName.setText(album.getName());
+        holder.imageCount.setText(album.getImageCount() + " photos");
+        
+        holder.itemView.post(new Runnable() {
+            @Override
+            public void run() {
+                if (!coverSizeReported && prefs != null) {
+                    int savedWidth = prefs.getCoverWidth();
+                    if (savedWidth == AlbumAdapter.DEFAULT_COVER_WIDTH) {
+                        int width = holder.coverImage.getWidth();
+                        int height = holder.coverImage.getHeight();
+                        if (width > 0 && height > 0) {
+                            prefs.setCoverWidth(width);
+                            prefs.setCoverHeight(height);
+                            float ratio = (float) width / height;
+                            prefs.setCoverRatio(ratio);
+                            coverSizeReported = true;
+                            if (coverSizeListener != null) {
+                                coverSizeListener.onCoverSize(width, height);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        
+        holder.itemView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onAlbumClick(album);
+                }
+            }
+        });
+        
+        Uri coverUri = album.getCoverUri();
+        if (coverUri != null) {
+            String uriString = coverUri.toString();
+            LogUtils.d(TAG, "uri scheme: " + coverUri.getScheme() + ", path: " + uriString);
+            
+            if ("file".equals(coverUri.getScheme())) {
+                File coverFile = new File(coverUri.getPath());
+                if (coverFile.exists()) {
+                    Glide.with(holder.coverImage.getContext())
+                        .load(coverFile)
+                        .fitCenter()
+                        .into(holder.coverImage);
+                    return;
+                }
+            }
+            
+            Glide.with(holder.coverImage.getContext())
+                .load(coverUri)
+                .fitCenter()
+                .into(holder.coverImage);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return albums.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView coverImage;
+        ImageView pinIcon;
+        TextView albumName;
+        TextView imageCount;
+        ViewHolder(View itemView) {
+            super(itemView);
+            coverImage = itemView.findViewById(R.id.album_cover);
+            pinIcon = itemView.findViewById(R.id.pin_icon);
+            albumName = itemView.findViewById(R.id.album_name);
+            imageCount = itemView.findViewById(R.id.image_count);
+        }
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/AlbumCoverDbHelper.java b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumCoverDbHelper.java
new file mode 100644
index 0000000..3a74d25
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/AlbumCoverDbHelper.java
@@ -0,0 +1,131 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class AlbumCoverDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "AlbumCoverDbHelper";
+    private static final String DB_NAME = "album_cover.db";
+    private static final int DB_VERSION = 2;
+    private static final String TABLE_NAME = "album_covers";
+    private static final String COLUMN_ALBUM_PATH = "album_path";
+    private static final String COLUMN_IMAGE_PATH = "image_path";
+    private static final String COLUMN_CROP_PATH = "crop_path";
+    
+    private static final String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " (" 
+        + COLUMN_ALBUM_PATH + " TEXT PRIMARY KEY, "
+        + COLUMN_IMAGE_PATH + " TEXT, "
+        + COLUMN_CROP_PATH + " TEXT)";
+    
+    private static AlbumCoverDbHelper dbHelper;
+    
+    public static AlbumCoverDbHelper getInstance(Context context) {
+        if (dbHelper == null) {
+            dbHelper = new AlbumCoverDbHelper(context.getApplicationContext());
+        }
+        return dbHelper;
+    }
+    
+    public AlbumCoverDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(SQL_CREATE);
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion < 2) {
+            try {
+                db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN " + COLUMN_CROP_PATH + " TEXT");
+            } catch (Exception e) {
+                db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+                onCreate(db);
+            }
+        }
+    }
+    
+    public void setCoverWithCrop(String albumPath, String imagePath, String cropPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_ALBUM_PATH, albumPath);
+        values.put(COLUMN_IMAGE_PATH, imagePath);
+        values.put(COLUMN_CROP_PATH, cropPath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+        LogUtils.d(TAG, "setCoverWithCrop: album=" + albumPath + ", image=" + imagePath + ", crop=" + cropPath);
+    }
+    
+    public void setCover(String albumPath, String imagePath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_ALBUM_PATH, albumPath);
+        values.put(COLUMN_IMAGE_PATH, imagePath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
+        LogUtils.d(TAG, "setCover: album=" + albumPath + ", image=" + imagePath);
+    }
+    
+    public String getCover(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_CROP_PATH, COLUMN_IMAGE_PATH}, 
+            COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath}, null, null, null);
+        String coverPath = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                coverPath = cursor.getString(0);
+                if (coverPath == null) {
+                    coverPath = cursor.getString(1);
+                }
+            }
+            cursor.close();
+        }
+        return coverPath;
+    }
+    
+    public String getCropPath(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_CROP_PATH}, 
+            COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath}, null, null, null);
+        String cropPath = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                cropPath = cursor.getString(0);
+            }
+            cursor.close();
+        }
+        return cropPath;
+    }
+    
+    public String getOriginalImagePath(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_IMAGE_PATH}, 
+            COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath}, null, null, null);
+        String imagePath = null;
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                imagePath = cursor.getString(0);
+            }
+            cursor.close();
+        }
+        return imagePath;
+    }
+    
+    public void clearCover(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.putNull(COLUMN_CROP_PATH);
+        db.update(TABLE_NAME, values, COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath});
+        LogUtils.d(TAG, "clearCover: " + albumPath);
+    }
+    
+    public void deleteCover(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, COLUMN_ALBUM_PATH + " = ?", new String[]{albumPath});
+        LogUtils.d(TAG, "deleteCover: " + albumPath);
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/CropActivity.java b/gallery/src/main/java/cc/winboll/studio/gallery/CropActivity.java
new file mode 100644
index 0000000..7463937
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/CropActivity.java
@@ -0,0 +1,313 @@
+package cc.winboll.studio.gallery;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.RectF;
+import android.net.Uri;
+import android.os.Bundle;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.RectF;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ScrollView;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+public class CropActivity extends AppCompatActivity {
+    public static final String TAG = "CropActivity";
+    public static final String EXTRA_IMAGE_URI = "image_uri";
+    public static final String EXTRA_IMAGE_PATH = "image_path";
+    public static final String EXTRA_ALBUM_PATH = "album_path";
+    public static final String EXTRA_CROP_WIDTH = "crop_width";
+    public static final String EXTRA_CROP_HEIGHT = "crop_height";
+    
+    private CropCanvasView cropCanvasView;
+    private ZoomContainerView zoomContainer;
+    private Bitmap originalBitmap;
+    private String imagePath;
+    private String albumPath;
+    private int cropWidth = 240;
+    private int cropHeight = 120;
+    private float cropRatio = 2.0f;
+    private Preferences prefs;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_crop);
+        
+        imagePath = getIntent().getStringExtra(EXTRA_IMAGE_PATH);
+        albumPath = getIntent().getStringExtra(EXTRA_ALBUM_PATH);
+        cropWidth = getIntent().getIntExtra(EXTRA_CROP_WIDTH, 240);
+        cropHeight = getIntent().getIntExtra(EXTRA_CROP_HEIGHT, 120);
+        
+        prefs = new Preferences(this);
+        int bgType = prefs.getBgType();
+        if (cropWidth > 0 && cropHeight > 0) {
+            cropRatio = (float) cropWidth / cropHeight;
+        } else {
+            cropRatio = prefs.getCoverRatio();
+            cropWidth = (int) (120 * cropRatio);
+            cropHeight = 120;
+        }
+        
+        findViewById(R.id.btn_close).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        
+        findViewById(R.id.btn_done).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                saveCroppedCover();
+            }
+        });
+        
+        findViewById(R.id.btn_info).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showCropInfoDialog();
+            }
+        });
+        
+        findViewById(R.id.btn_change_bg).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(CropActivity.this, "修改剪裁背景颜色", Toast.LENGTH_SHORT).show();
+            }
+        });
+        
+        zoomContainer = findViewById(R.id.zoom_container);
+        
+        SeekBar seekBarZoom = findViewById(R.id.seekbar_zoom);
+        seekBarZoom.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                if (zoomContainer != null && fromUser) {
+                    float scale = 0.1f + (progress / 100f) * 4.9f;
+                    zoomContainer.setScaleFactor(scale);
+                }
+            }
+            
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {}
+            
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {}
+        });
+        
+        cropCanvasView = findViewById(R.id.crop_canvas_view);
+        
+        cropCanvasView.setBackgroundType(bgType);
+        
+        cropCanvasView.setOnBackgroundColorChangedListener(new CropCanvasView.OnBackgroundColorChangedListener() {
+            @Override
+            public void onBackgroundColorChanged(int color) {
+            }
+        });
+        
+        loadImage();
+    }
+    
+    private void loadImage() {
+        try {
+            if (imagePath != null && new File(imagePath).exists()) {
+                originalBitmap = BitmapFactory.decodeFile(imagePath);
+            } else {
+                Uri imageUri = getIntent().getParcelableExtra(EXTRA_IMAGE_URI);
+                if (imageUri != null) {
+                    originalBitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), imageUri);
+                }
+            }
+            
+            if (originalBitmap != null) {
+                cropCanvasView.setImageBitmap(originalBitmap);
+                cropCanvasView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        initCrop();
+                    }
+                });
+            } else {
+                Toast.makeText(this, "Failed to load image", Toast.LENGTH_SHORT).show();
+                finish();
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "loadImage error: " + e.getMessage());
+            Toast.makeText(this, "Failed to load image", Toast.LENGTH_SHORT).show();
+            finish();
+        }
+    }
+    
+    private void initCrop() {
+        cropCanvasView.initCanvas(originalBitmap.getWidth(), originalBitmap.getHeight(), cropRatio);
+        
+        int viewW = cropCanvasView.getWidth();
+        int viewH = cropCanvasView.getHeight();
+        if (viewW > 0 && viewH > 0) {
+            cropCanvasView.scaleToView(viewW, viewH);
+        }
+    }
+    
+    private void saveCroppedCover() {
+        if (originalBitmap == null || originalBitmap.isRecycled()) {
+            Toast.makeText(this, "Failed to get image", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        
+        try {
+            Bitmap canvasBitmap = cropCanvasView.getCanvasBitmap();
+            if (canvasBitmap == null || canvasBitmap.isRecycled()) {
+                Toast.makeText(this, "Failed to get canvas bitmap", Toast.LENGTH_SHORT).show();
+                return;
+            }
+            
+            RectF cropRect = cropCanvasView.getCropRect();
+            
+            int bmpX = (int) cropRect.left;
+            int bmpY = (int) cropRect.top;
+            int bmpW = (int) cropRect.width();
+            int bmpH = (int) cropRect.height();
+            
+            bmpX = Math.max(0, Math.min(bmpX, canvasBitmap.getWidth() - 1));
+            bmpY = Math.max(0, Math.min(bmpY, canvasBitmap.getHeight() - 1));
+            bmpW = Math.max(1, Math.min(bmpW, canvasBitmap.getWidth() - bmpX));
+            bmpH = Math.max(1, Math.min(bmpH, canvasBitmap.getHeight() - bmpY));
+            
+            LogUtils.d(TAG, "saveCroppedCover: cropRect=" + cropRect);
+            LogUtils.d(TAG, "saveCroppedCover: crop=(" + bmpX + "," + bmpY + "," + bmpW + "," + bmpH + ")");
+            LogUtils.d(TAG, "saveCroppedCover: canvas size=" + canvasBitmap.getWidth() + "x" + canvasBitmap.getHeight());
+            
+            Bitmap cropped = Bitmap.createBitmap(canvasBitmap, bmpX, bmpY, bmpW, bmpH);
+            canvasBitmap.recycle();
+            
+            LogUtils.d(TAG, "saveCroppedCover: cropped size=" + cropped.getWidth() + "x" + cropped.getHeight());
+            
+            File coverDir = new File(getFilesDir(), "covers");
+            if (!coverDir.exists()) {
+                coverDir.mkdirs();
+            }
+            File coverFile = new File(coverDir, "cover_" + System.currentTimeMillis() + ".png");
+            LogUtils.d(TAG, "saveCroppedCover: cover file=" + coverFile.getAbsolutePath());
+            
+            FileOutputStream fos = new FileOutputStream(coverFile);
+            cropped.compress(Bitmap.CompressFormat.PNG, 100, fos);
+            fos.close();
+            
+            LogUtils.d(TAG, "saveCroppedCover: file exists=" + coverFile.exists() + ", length=" + coverFile.length());
+            
+            cropped.recycle();
+            
+            AlbumCoverDbHelper coverDbHelper = AlbumCoverDbHelper.getInstance(this);
+            coverDbHelper.setCoverWithCrop(albumPath, imagePath, coverFile.getAbsolutePath());
+            LogUtils.d(TAG, "saveCroppedCover: cover saved to db, albumPath=" + albumPath);
+            
+            Intent broadcastIntent = new Intent(Preferences.ACTION_COVER_UPDATED);
+            sendBroadcast(broadcastIntent);
+            
+            Toast.makeText(this, "封面已保存", Toast.LENGTH_SHORT).show();
+            setResult(RESULT_OK);
+            finish();
+        } catch (Exception e) {
+            LogUtils.e(TAG, "saveCroppedCover error: " + e.getMessage());
+            Toast.makeText(this, "Failed to save cover", Toast.LENGTH_SHORT).show();
+        }
+    }
+    
+    private void showCropInfoDialog() {
+        StringBuilder info = new StringBuilder();
+        info.append("=== 画布信息 ===\n");
+        info.append("画布宽度: ").append(cropCanvasView.getCanvasWidth()).append("px\n");
+        info.append("画布高度: ").append(cropCanvasView.getCanvasHeight()).append("px\n");
+        
+        info.append("\n=== 背景类型 ===\n");
+        String[] bgNames = {"灰白相间", "全白", "全黑"};
+        info.append("背景: ").append(bgNames[cropCanvasView.getBackgroundType()]).append("\n");
+        int bgColor = cropCanvasView.getBackgroundColor();
+        info.append("背景颜色: #").append(String.format("%06X", bgColor & 0xFFFFFF)).append("\n");
+        info.append("拾取坐标: ").append(cropCanvasView.getLastPickImageX()).append(",")
+            .append(cropCanvasView.getLastPickImageY()).append("\n");
+        
+        info.append("\n=== 裁剪结果 ===\n");
+        RectF cropRect = cropCanvasView.getCropRect();
+        if (cropRect != null) {
+            info.append("裁剪区域: ").append((int)cropRect.left).append(",")
+                .append((int)cropRect.top).append(",")
+                .append((int)cropRect.right).append(",")
+                .append((int)cropRect.bottom).append("\n");
+            info.append("裁剪宽度: ").append((int)cropRect.width()).append("px\n");
+            info.append("裁剪高度: ").append((int)cropRect.height()).append("px\n");
+        }
+        
+        Bitmap canvasBitmap = cropCanvasView.getCanvasBitmap();
+        final Bitmap[] previewHolder = new Bitmap[1];
+        if (canvasBitmap != null && !canvasBitmap.isRecycled() && cropRect != null) {
+            int bmpX = Math.max(0, (int) cropRect.left);
+            int bmpY = Math.max(0, (int) cropRect.top);
+            int bmpW = Math.min((int) cropRect.width(), canvasBitmap.getWidth() - bmpX);
+            int bmpH = Math.min((int) cropRect.height(), canvasBitmap.getHeight() - bmpY);
+            if (bmpW > 0 && bmpH > 0) {
+                previewHolder[0] = Bitmap.createBitmap(canvasBitmap, bmpX, bmpY, bmpW, bmpH);
+            }
+        }
+        
+        final Bitmap previewBitmap = previewHolder[0];
+        
+        View dialogView = getLayoutInflater().inflate(R.layout.dialog_crop_info, null);
+        TextView infoText = dialogView.findViewById(R.id.info_text);
+        ImageView previewImage = dialogView.findViewById(R.id.preview_image);
+        final LinearLayout previewImageContainer = dialogView.findViewById(R.id.preview_image_container);
+        infoText.setText(info.toString());
+        if (previewBitmap != null) {
+            previewImage.setImageBitmap(previewBitmap);
+        }
+        previewImage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                int randomColor = 0xFF000000 | new Random().nextInt(0x00FFFFFF);
+                previewImageContainer.setBackgroundColor(randomColor);
+            }
+        });
+        
+        AlertDialog dialog = new AlertDialog.Builder(this)
+            .setTitle("裁剪信息")
+            .setView(dialogView)
+            .setPositiveButton("确定", null)
+            .create();
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                if (previewBitmap != null && !previewBitmap.isRecycled()) {
+                    previewBitmap.recycle();
+                }
+            }
+        });
+        dialog.show();
+    }
+    
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (originalBitmap != null) {
+            originalBitmap.recycle();
+            originalBitmap = null;
+        }
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/CropCanvasView.java b/gallery/src/main/java/cc/winboll/studio/gallery/CropCanvasView.java
new file mode 100644
index 0000000..372e2fe
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/CropCanvasView.java
@@ -0,0 +1,750 @@
+package cc.winboll.studio.gallery;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+public class CropCanvasView extends View {
+    public interface OnBackgroundColorChangedListener {
+        void onBackgroundColorChanged(int color);
+    }
+    
+    public interface OnColorPickedListener {
+        void onColorPicked(int color);
+    }
+    
+    public interface OnColorPickEndListener {
+        void onColorPickEnd();
+    }
+    
+    private OnBackgroundColorChangedListener backgroundColorChangedListener;
+    private OnColorPickedListener colorPickedListener;
+    private OnColorPickEndListener colorPickEndListener;
+    
+    public void setOnBackgroundColorChangedListener(OnBackgroundColorChangedListener listener) {
+        this.backgroundColorChangedListener = listener;
+    }
+    
+    public void setOnColorPickedListener(OnColorPickedListener listener) {
+        this.colorPickedListener = listener;
+    }
+    
+    public void setOnColorPickEndListener(OnColorPickEndListener listener) {
+        this.colorPickEndListener = listener;
+    }
+    private Paint imagePaint;
+    private Paint borderPaint;
+    private Paint cornerPaint;
+    private RectF cropRect;
+    private int touchArea = 50;
+    
+    private float lastX, lastY;
+    private int activeCorner = -1;
+    private static final int CORNER_TOP_LEFT = 0;
+    private static final int CORNER_TOP_RIGHT = 1;
+    private static final int CORNER_BOTTOM_LEFT = 2;
+    private static final int CORNER_BOTTOM_RIGHT = 3;
+    private static final int CORNER_CENTER = 4;
+    
+    private int imageWidth;
+    private int imageHeight;
+    private float coverRatio = 2.0f;
+    
+    private int extendHeight;
+    private int extendWidth;
+    private int canvasWidth;
+    private int canvasHeight;
+    private float minSize = 50;
+    
+    private RectF imageBounds = new RectF();
+    private RectF canvasBounds = new RectF();
+    private Bitmap originalBitmap;
+    private Bitmap canvasBitmap;
+    private float bitmapScale = 1.0f;
+    private Bitmap displayBitmap;
+    private RectF initialSpanRect;
+    private float initialSpan;
+    private int bgType = 2;
+    private Bitmap tileBitmap;
+    private BitmapShader tileShader;
+    private Paint bgPaint;
+    private int backgroundColor = Color.BLUE;
+    private boolean colorPickMode = false;
+    private int previewColor = 0;
+    private float lastPickX = 0;
+    private float lastPickY = 0;
+    private float pickX, pickY;
+    
+    private float displayScale = 1.0f;
+    private float displayOffsetX = 0f;
+    private float displayOffsetY = 0f;
+    private static final int MAX_DISPLAY_SIZE = 2048;
+    private float containerScale = 1.0f;
+    
+    public CropCanvasView(Context context) {
+        super(context);
+        init();
+    }
+    
+    public CropCanvasView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+    
+    public CropCanvasView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+    
+    private void init() {
+        imagePaint = new Paint();
+        imagePaint.setFilterBitmap(true);
+        
+        borderPaint = new Paint();
+        borderPaint.setColor(Color.parseColor("#CCAA00"));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(3);
+        
+        cornerPaint = new Paint();
+        cornerPaint.setColor(Color.WHITE);
+        cornerPaint.setStyle(Paint.Style.FILL);
+        
+        bgType = 2;
+        bgPaint = new Paint();
+        initTileBitmap();
+    }
+    
+    private void initTileBitmap() {
+        if (tileBitmap != null && !tileBitmap.isRecycled()) {
+            tileBitmap.recycle();
+            tileBitmap = null;
+        }
+        tileShader = null;
+        
+        if (bgType == 0) {
+            Drawable drawable = getContext().getDrawable(R.drawable.bg_checkerboard);
+            if (drawable != null) {
+                int w = drawable.getIntrinsicWidth();
+                int h = drawable.getIntrinsicHeight();
+                if (w <= 0) w = 10;
+                if (h <= 0) h = 10;
+                tileBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+                Canvas c = new Canvas(tileBitmap);
+                drawable.setBounds(0, 0, w, h);
+                drawable.draw(c);
+                tileShader = new BitmapShader(tileBitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
+            }
+        }
+    }
+    
+    public void setBackgroundType(int type) {
+        if (bgType != type) {
+            bgType = type;
+            initTileBitmap();
+            invalidate();
+        }
+    }
+    
+    public int getBackgroundType() {
+        return bgType;
+    }
+    
+    private void drawBackground(Canvas canvas) {
+        if (bgType == 0 && tileShader != null) {
+            bgPaint.setShader(tileShader);
+            canvas.drawRect(canvasBounds, bgPaint);
+        } else if (bgType == 1) {
+            bgPaint.setShader(null);
+            bgPaint.setColor(Color.WHITE);
+            canvas.drawRect(canvasBounds, bgPaint);
+        } else {
+            bgPaint.setShader(null);
+            bgPaint.setColor(Color.BLACK);
+            canvas.drawRect(canvasBounds, bgPaint);
+        }
+    }
+    
+    public void setImageBitmap(Bitmap bitmap) {
+        if (displayBitmap != null && displayBitmap != originalBitmap) {
+            displayBitmap.recycle();
+        }
+        this.originalBitmap = bitmap;
+        createDisplayBitmap();
+    }
+    
+    private void createDisplayBitmap() {
+        if (displayBitmap != null && displayBitmap != originalBitmap) {
+            displayBitmap.recycle();
+            displayBitmap = null;
+        }
+        if (originalBitmap == null || originalBitmap.isRecycled()) {
+            return;
+        }
+        int w = originalBitmap.getWidth();
+        int h = originalBitmap.getHeight();
+        float scale = 1.0f;
+        if (w > MAX_DISPLAY_SIZE || h > MAX_DISPLAY_SIZE) {
+            scale = Math.min((float) MAX_DISPLAY_SIZE / w, (float) MAX_DISPLAY_SIZE / h);
+            int newW = (int) (w * scale);
+            int newH = (int) (h * scale);
+            displayBitmap = Bitmap.createScaledBitmap(originalBitmap, newW, newH, true);
+        } else {
+            displayBitmap = originalBitmap;
+        }
+        displayBitmapScale = scale;
+    }
+    
+    private float displayBitmapScale = 1.0f;
+    
+    public Bitmap getOriginalBitmap() {
+        return originalBitmap;
+    }
+    
+    public float getDisplayBitmapScale() {
+        return displayBitmapScale;
+    }
+    
+    public void onContainerScaled() {
+        containerScale = 1.0f;
+        invalidate();
+    }
+    
+    public void setContainerScale(float scale) {
+        if (scale > 0 && scale != containerScale) {
+            containerScale = scale;
+            invalidate();
+        }
+    }
+    
+    public float getContainerScale() {
+        return containerScale;
+    }
+    
+    public Bitmap getCanvasBitmap() {
+        if (canvasWidth <= 0 || canvasHeight <= 0) {
+            return null;
+        }
+        Bitmap canvasBmp = Bitmap.createBitmap(canvasWidth, canvasHeight, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(canvasBmp);
+        drawBackground(canvas);
+        if (displayBitmap != null && !displayBitmap.isRecycled()) {
+            if (displayBitmap == originalBitmap) {
+                canvas.drawBitmap(displayBitmap, imageBounds.left, imageBounds.top, imagePaint);
+            } else {
+                float invScale = 1f / displayBitmapScale;
+                canvas.save();
+                canvas.scale(invScale, invScale);
+                canvas.drawBitmap(displayBitmap, imageBounds.left * displayBitmapScale, 
+                                  imageBounds.top * displayBitmapScale, imagePaint);
+                canvas.restore();
+            }
+        }
+        return canvasBmp;
+    }
+    
+    public void initCanvas(int imgWidth, int imgHeight, float ratio) {
+        this.imageWidth = imgWidth;
+        this.imageHeight = imgHeight;
+        this.coverRatio = ratio;
+        
+        float imgRatio = (float) imgWidth / imgHeight;
+        
+        if (coverRatio >= imgRatio) {
+            extendHeight = imgHeight;
+            extendWidth = (int) (imgHeight * coverRatio);
+        } else {
+            extendWidth = imgWidth;
+            extendHeight = (int) (imgWidth / coverRatio);
+        }
+        
+        canvasHeight = Math.max(imageHeight, extendHeight);
+        canvasWidth = Math.max(imageWidth, extendWidth);
+        
+        float left = (canvasWidth - imageWidth) / 2f;
+        float top = (canvasHeight - imageHeight) / 2f;
+        imageBounds.set(left, top, left + imageWidth, top + imageHeight);
+        canvasBounds.set(0, 0, canvasWidth, canvasHeight);
+        
+        cropRect = new RectF(canvasBounds);
+        
+        requestLayout();
+        invalidate();
+    }
+    
+    public void getDisplayMatrix(Matrix matrix) {
+        if (canvasWidth <= 0 || canvasHeight <= 0 || getWidth() <= 0 || getHeight() <= 0) {
+            return;
+        }
+        matrix.reset();
+        
+        float displayScaleX = (float) getWidth() / canvasWidth;
+        float displayScaleY = (float) getHeight() / canvasHeight;
+        displayScale = Math.min(displayScaleX, displayScaleY);
+        
+        displayOffsetX = (getWidth() - canvasWidth * displayScale) / 2f;
+        displayOffsetY = (getHeight() - canvasHeight * displayScale) / 2f;
+        
+        matrix.postTranslate(displayOffsetX, displayOffsetY);
+        matrix.postScale(displayScale, displayScale);
+    }
+    
+    public float screenToImageX(float screenX) {
+        return (screenX - displayOffsetX) / displayScale;
+    }
+    
+    public float screenToImageY(float screenY) {
+        return (screenY - displayOffsetY) / displayScale;
+    }
+    
+    public float imageToScreenX(float imageX) {
+        return imageX * displayScale + displayOffsetX;
+    }
+    
+    public float imageToScreenY(float imageY) {
+        return imageY * displayScale + displayOffsetY;
+    }
+    
+    public int getImageColorAt(float screenX, float screenY) {
+        Bitmap bmp = (displayBitmap != null) ? displayBitmap : originalBitmap;
+        if (bmp == null || bmp.isRecycled()) {
+            return Color.TRANSPARENT;
+        }
+        float imgX = screenToImageX(screenX);
+        float imgY = screenToImageY(screenY);
+        int bmpX = (int) ((imgX - imageBounds.left) * displayBitmapScale);
+        int bmpY = (int) ((imgY - imageBounds.top) * displayBitmapScale);
+        if (bmpX >= 0 && bmpX < bmp.getWidth() && 
+            bmpY >= 0 && bmpY < bmp.getHeight()) {
+            return bmp.getPixel(bmpX, bmpY);
+        }
+        return Color.TRANSPARENT;
+    }
+    
+    public void setBackgroundColor(int color) {
+        this.backgroundColor = color;
+        if (backgroundColorChangedListener != null) {
+            backgroundColorChangedListener.onBackgroundColorChanged(color);
+        }
+        invalidate();
+    }
+    
+    public int getBackgroundColor() {
+        return backgroundColor;
+    }
+    
+    public int getPreviewColor() {
+        return previewColor;
+    }
+    
+    public float getLastPickX() {
+        return lastPickX;
+    }
+    
+    public float getLastPickY() {
+        return lastPickY;
+    }
+    
+    public int getLastPickImageX() {
+        if (originalBitmap == null || originalBitmap.isRecycled()) {
+            return 0;
+        }
+        float imgX = screenToImageX(lastPickX);
+        float imgY = screenToImageY(lastPickY);
+        int bmpX = (int) ((imgX - imageBounds.left) * displayBitmapScale);
+        int bmpY = (int) ((imgY - imageBounds.top) * displayBitmapScale);
+        return Math.max(0, Math.min(bmpX, originalBitmap.getWidth() - 1));
+    }
+    
+    public int getLastPickImageY() {
+        if (originalBitmap == null || originalBitmap.isRecycled()) {
+            return 0;
+        }
+        float imgX = screenToImageX(lastPickX);
+        float imgY = screenToImageY(lastPickY);
+        int bmpX = (int) ((imgX - imageBounds.left) * displayBitmapScale);
+        int bmpY = (int) ((imgY - imageBounds.top) * displayBitmapScale);
+        return Math.max(0, Math.min(bmpY, originalBitmap.getHeight() - 1));
+    }
+    
+    public void setColorPickMode(boolean enable) {
+        this.colorPickMode = enable;
+        if (enable) {
+            pickX = -1;
+            pickY = -1;
+        }
+        invalidate();
+    }
+    
+    public boolean isColorPickMode() {
+        return colorPickMode;
+    }
+    
+    public void scaleToView(int viewWidth, int viewHeight) {
+        if (viewWidth > 0 && viewHeight > 0 && canvasWidth > 0 && canvasHeight > 0) {
+            float scale = Math.max((float) viewWidth / canvasWidth, (float) viewHeight / canvasHeight);
+            int oldCanvasW = canvasWidth;
+            int oldCanvasH = canvasHeight;
+            canvasWidth = (int) (canvasWidth * scale);
+            canvasHeight = (int) (canvasHeight * scale);
+            
+            float left = (canvasWidth - imageWidth) / 2f;
+            float top = (canvasHeight - imageHeight) / 2f;
+            imageBounds.set(left, top, left + imageWidth, top + imageHeight);
+            canvasBounds.set(0, 0, canvasWidth, canvasHeight);
+            
+            if (cropRect != null) {
+                float scaleX = (float) canvasWidth / oldCanvasW;
+                float scaleY = (float) canvasHeight / oldCanvasH;
+                cropRect.left *= scaleX;
+                cropRect.top *= scaleY;
+                cropRect.right *= scaleX;
+                cropRect.bottom *= scaleY;
+            }
+            
+            requestLayout();
+            invalidate();
+        }
+    }
+    
+    public RectF getCropRect() {
+        return new RectF(cropRect);
+    }
+    
+    public int getCanvasWidth() {
+        return canvasWidth;
+    }
+    
+    public int getCanvasHeight() {
+        return canvasHeight;
+    }
+    
+    public RectF getCanvasBounds() {
+        return new RectF(canvasBounds);
+    }
+    
+    public RectF getImageBounds() {
+        return new RectF(imageBounds);
+    }
+    
+    public float getBitmapScale() {
+        return displayScale;
+    }
+    
+    public float getDisplayScale() {
+        return displayScale;
+    }
+    
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int w = canvasWidth > 0 ? canvasWidth : 0;
+        int h = canvasHeight > 0 ? canvasHeight : 0;
+        setMeasuredDimension(w, h);
+    }
+    
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        getDisplayMatrix(new Matrix());
+    }
+    
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        
+        if (cropRect == null) return;
+        
+        if (displayBitmap != null && !displayBitmap.isRecycled()) {
+            canvas.save();
+            
+            Matrix matrix = new Matrix();
+            getDisplayMatrix(matrix);
+            canvas.concat(matrix);
+            
+            drawBackground(canvas);
+            
+            if (displayBitmap == originalBitmap) {
+                canvas.drawBitmap(displayBitmap, imageBounds.left, imageBounds.top, imagePaint);
+            } else {
+                float invScale = 1f / displayBitmapScale;
+                canvas.save();
+                canvas.scale(invScale, invScale);
+                canvas.drawBitmap(displayBitmap, imageBounds.left * displayBitmapScale, 
+                                  imageBounds.top * displayBitmapScale, imagePaint);
+                canvas.restore();
+            }
+            
+            canvas.restore();
+            
+            if (containerScale != 1.0f) {
+                canvas.save();
+                canvas.scale(containerScale, containerScale);
+                canvas.drawRect(cropRect, borderPaint);
+                float cornerRadius = 12f / containerScale;
+                canvas.drawCircle(cropRect.left, cropRect.top, cornerRadius, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.top, cornerRadius, cornerPaint);
+                canvas.drawCircle(cropRect.left, cropRect.bottom, cornerRadius, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.bottom, cornerRadius, cornerPaint);
+                canvas.restore();
+            } else {
+                canvas.drawRect(cropRect, borderPaint);
+                canvas.drawCircle(cropRect.left, cropRect.top, 12, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.top, 12, cornerPaint);
+                canvas.drawCircle(cropRect.left, cropRect.bottom, 12, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.bottom, 12, cornerPaint);
+            }
+        } else {
+            if (containerScale != 1.0f) {
+                canvas.save();
+                canvas.scale(containerScale, containerScale);
+                canvas.drawRect(cropRect, borderPaint);
+                float cornerRadius = 12f / containerScale;
+                canvas.drawCircle(cropRect.left, cropRect.top, cornerRadius, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.top, cornerRadius, cornerPaint);
+                canvas.drawCircle(cropRect.left, cropRect.bottom, cornerRadius, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.bottom, cornerRadius, cornerPaint);
+                canvas.restore();
+            } else {
+                canvas.drawRect(cropRect, borderPaint);
+                canvas.drawCircle(cropRect.left, cropRect.top, 12, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.top, 12, cornerPaint);
+                canvas.drawCircle(cropRect.left, cropRect.bottom, 12, cornerPaint);
+                canvas.drawCircle(cropRect.right, cropRect.bottom, 12, cornerPaint);
+            }
+        }
+    }
+    
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (cropRect == null || canvasBounds.isEmpty()) return super.onTouchEvent(event);
+        
+        if (event.getPointerCount() == 2) {
+            int action = event.getActionMasked();
+            if (action == MotionEvent.ACTION_POINTER_DOWN) {
+                initialSpan = getSpan(event);
+                return true;
+            } else if (action == MotionEvent.ACTION_MOVE) {
+                float span = getSpan(event);
+                if (initialSpan > 0) {
+                    float scale = span / initialSpan;
+                    float centerX = cropRect.centerX();
+                    float centerY = cropRect.centerY();
+                    float newWidth = cropRect.width() * scale;
+                    float newHeight = newWidth / coverRatio;
+                    
+                    newWidth = Math.max(minSize, Math.min(newWidth, canvasBounds.width()));
+                    newHeight = newWidth / coverRatio;
+                    
+                    float newLeft = centerX - newWidth / 2;
+                    float newTop = centerY - newHeight / 2;
+                    float newRight = centerX + newWidth / 2;
+                    float newBottom = centerY + newHeight / 2;
+                    
+                    if (newLeft >= canvasBounds.left && newRight <= canvasBounds.right &&
+                        newTop >= canvasBounds.top && newBottom <= canvasBounds.bottom) {
+                        cropRect.set(newLeft, newTop, newRight, newBottom);
+                    }
+                    
+                    initialSpan = span;
+                    invalidate();
+                }
+                return true;
+            }
+        }
+        
+        float x = event.getX();
+        float y = event.getY();
+        
+        RectF bounds = canvasBounds;
+        if (containerScale != 1.0f) {
+            x = x / containerScale;
+            y = y / containerScale;
+            bounds = new RectF(
+                canvasBounds.left,
+                canvasBounds.top,
+                canvasBounds.right,
+                canvasBounds.bottom
+            );
+        }
+        
+        if (colorPickMode) {
+            if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) {
+                if (originalBitmap != null && !originalBitmap.isRecycled()) {
+                    float imgX = screenToImageX(x);
+                    float imgY = screenToImageY(y);
+                    if (imageBounds.contains(imgX, imgY)) {
+                        previewColor = getImageColorAt(x, y);
+                    } else if (canvasBounds.contains(x, y)) {
+                        previewColor = (bgType == 1) ? Color.WHITE : Color.BLACK;
+                    } else {
+                        previewColor = Color.TRANSPARENT;
+                    }
+                    lastPickX = x;
+                    lastPickY = y;
+                    if (backgroundColorChangedListener != null) {
+                        backgroundColorChangedListener.onBackgroundColorChanged(previewColor);
+                    }
+                }
+                return true;
+            }
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                if (canvasBounds.contains(x, y)) {
+                    int pickedColor;
+                    float imgX = screenToImageX(x);
+                    float imgY = screenToImageY(y);
+                    if (imageBounds.contains(imgX, imgY)) {
+                        int colorAtPoint = getImageColorAt(x, y);
+                        pickedColor = colorAtPoint;
+                        backgroundColor = colorAtPoint;
+                    } else {
+                        pickedColor = (bgType == 1) ? Color.WHITE : Color.BLACK;
+                    }
+                    if (colorPickedListener != null) {
+                        colorPickedListener.onColorPicked(pickedColor);
+                    }
+                }
+                if (colorPickEndListener != null) {
+                    colorPickEndListener.onColorPickEnd();
+                }
+                previewColor = 0;
+                invalidate();
+                return true;
+            }
+            return true;
+        }
+        
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                lastX = x;
+                lastY = y;
+                activeCorner = getActiveCorner(x, y);
+                return true;
+                
+            case MotionEvent.ACTION_MOVE:
+                float dx = x - lastX;
+                float dy = y - lastY;
+                
+                if (activeCorner == CORNER_CENTER) {
+                    float newLeft = cropRect.left + dx;
+                    float newTop = cropRect.top + dy;
+                    float newRight = cropRect.right + dx;
+                    float newBottom = cropRect.bottom + dy;
+                    
+                    if (newLeft >= bounds.left && newRight <= bounds.right) {
+                        cropRect.left = newLeft;
+                        cropRect.right = newRight;
+                    }
+                    if (newTop >= bounds.top && newBottom <= bounds.bottom) {
+                        cropRect.top = newTop;
+                        cropRect.bottom = newBottom;
+                    }
+                } else if (activeCorner == CORNER_TOP_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.top + dy, true, true);
+                } else if (activeCorner == CORNER_TOP_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.top + dy, false, true);
+                } else if (activeCorner == CORNER_BOTTOM_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.bottom + dy, true, false);
+                } else if (activeCorner == CORNER_BOTTOM_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.bottom + dy, false, false);
+                }
+                
+                lastX = x;
+                lastY = y;
+                invalidate();
+                return true;
+                
+            case MotionEvent.ACTION_UP:
+                activeCorner = -1;
+                return true;
+        }
+        return super.onTouchEvent(event);
+    }
+    
+    private void adjustCorner(float nx, float ny, boolean left, boolean top) {
+        float newWidth;
+        float newLeft = cropRect.left;
+        float newTop = cropRect.top;
+        float newRight = cropRect.right;
+        float newBottom = cropRect.bottom;
+        
+        if (left) {
+            newWidth = cropRect.width() - (nx - cropRect.left);
+            newLeft = Math.max(canvasBounds.left, Math.min(nx, cropRect.right - minSize));
+        } else {
+            newWidth = nx - cropRect.left;
+            newRight = Math.min(canvasBounds.right, Math.max(nx, cropRect.left + minSize));
+            newLeft = cropRect.left;
+        }
+        
+        float newHeight = newWidth / coverRatio;
+        
+        if (top) {
+            newTop = Math.max(canvasBounds.top, Math.min(cropRect.bottom - minSize, cropRect.bottom - newHeight));
+            newBottom = newTop + newHeight;
+        } else {
+            newBottom = Math.min(canvasBounds.bottom, Math.max(cropRect.top + minSize, cropRect.top + newHeight));
+            newTop = newBottom - newHeight;
+        }
+        
+        if (left) {
+            cropRect.left = newLeft;
+            cropRect.right = newLeft + newWidth;
+        } else {
+            cropRect.right = newRight;
+            cropRect.left = newRight - newWidth;
+        }
+        
+        if (top) {
+            cropRect.top = newTop;
+            cropRect.bottom = newTop + newHeight;
+        } else {
+            cropRect.bottom = newBottom;
+            cropRect.top = newBottom - newHeight;
+        }
+    }
+    
+    private int getActiveCorner(float x, float y) {
+        float dx = Math.abs(x - cropRect.left);
+        float dy = Math.abs(y - cropRect.top);
+        float dx2 = Math.abs(x - cropRect.right);
+        float dy2 = Math.abs(y - cropRect.bottom);
+        
+        if (dx <= touchArea && dy <= touchArea) {
+            return CORNER_TOP_LEFT;
+        }
+        if (dx2 <= touchArea && dy <= touchArea) {
+            return CORNER_TOP_RIGHT;
+        }
+        if (dx <= touchArea && dy2 <= touchArea) {
+            return CORNER_BOTTOM_LEFT;
+        }
+        if (dx2 <= touchArea && dy2 <= touchArea) {
+            return CORNER_BOTTOM_RIGHT;
+        }
+        if (x > cropRect.left && x < cropRect.right && y > cropRect.top && y < cropRect.bottom) {
+            return CORNER_CENTER;
+        }
+        return -1;
+    }
+    
+    private float getSpan(MotionEvent event) {
+        float x0 = event.getX(0);
+        float y0 = event.getY(0);
+        float x1 = event.getX(1);
+        float y1 = event.getY(1);
+        return (float) Math.sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0));
+    }
+    
+    public int getColorAt(float x, float y) {
+        return getImageColorAt(x, y);
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/CropOverlayView.java b/gallery/src/main/java/cc/winboll/studio/gallery/CropOverlayView.java
new file mode 100644
index 0000000..9d01dc3
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/CropOverlayView.java
@@ -0,0 +1,224 @@
+package cc.winboll.studio.gallery;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+public class CropOverlayView extends View {
+    public interface OnCanvasSizeChangedListener {
+        void onCanvasSizeChanged(RectF canvasBounds);
+    }
+    
+    private OnCanvasSizeChangedListener canvasSizeChangedListener;
+    
+    private Paint borderPaint;
+    private Paint cornerPaint;
+    private RectF cropRect;
+    private int touchArea = 50;
+    
+    private float lastX, lastY;
+    private int activeCorner = -1;
+    private static final int CORNER_TOP_LEFT = 0;
+    private static final int CORNER_TOP_RIGHT = 1;
+    private static final int CORNER_BOTTOM_LEFT = 2;
+    private static final int CORNER_BOTTOM_RIGHT = 3;
+    private static final int CORNER_CENTER = 4;
+    
+    private float targetRatio = 2.0f;
+    private RectF canvasBounds = new RectF();
+    private float minSize = 50;
+    
+    public CropOverlayView(Context context) {
+        super(context);
+        initPaints();
+    }
+    
+    public CropOverlayView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initPaints();
+    }
+    
+    public CropOverlayView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initPaints();
+    }
+    
+    private void initPaints() {
+        borderPaint = new Paint();
+        borderPaint.setColor(Color.parseColor("#CCAA00"));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(3);
+        
+        cornerPaint = new Paint();
+        cornerPaint.setColor(Color.WHITE);
+        cornerPaint.setStyle(Paint.Style.FILL);
+    }
+    
+    public void setTargetRatio(float ratio) {
+        this.targetRatio = ratio;
+    }
+    
+    public float getTargetRatio() {
+        return targetRatio;
+    }
+    
+    public void setOnCanvasSizeChangedListener(OnCanvasSizeChangedListener listener) {
+        this.canvasSizeChangedListener = listener;
+    }
+    
+    public void initCanvas(int canvasW, int canvasH) {
+        canvasBounds.set(0, 0, canvasW, canvasH);
+        
+        cropRect = new RectF(0, 0, canvasW, canvasH);
+        
+        if (canvasSizeChangedListener != null) {
+            canvasSizeChangedListener.onCanvasSizeChanged(new RectF(canvasBounds));
+        }
+        invalidate();
+    }
+    
+    public RectF getCropRect() {
+        return new RectF(cropRect);
+    }
+    
+    public RectF getCanvasBounds() {
+        return new RectF(canvasBounds);
+    }
+    
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        
+        canvas.drawColor(Color.TRANSPARENT);
+        
+        if (cropRect != null) {
+            canvas.drawRect(cropRect, borderPaint);
+            
+            canvas.drawCircle(cropRect.left, cropRect.top, 12, cornerPaint);
+            canvas.drawCircle(cropRect.right, cropRect.top, 12, cornerPaint);
+            canvas.drawCircle(cropRect.left, cropRect.bottom, 12, cornerPaint);
+            canvas.drawCircle(cropRect.right, cropRect.bottom, 12, cornerPaint);
+        }
+    }
+    
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (cropRect == null || canvasBounds.isEmpty()) return false;
+        
+        float x = event.getX();
+        float y = event.getY();
+        
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                lastX = x;
+                lastY = y;
+                activeCorner = getActiveCorner(x, y);
+                return true;
+                
+            case MotionEvent.ACTION_MOVE:
+                float dx = x - lastX;
+                float dy = y - lastY;
+                
+                if (activeCorner == CORNER_CENTER) {
+                    float newLeft = cropRect.left + dx;
+                    float newTop = cropRect.top + dy;
+                    float newRight = cropRect.right + dx;
+                    float newBottom = cropRect.bottom + dy;
+                    
+                    if (newLeft >= canvasBounds.left && newRight <= canvasBounds.right) {
+                        cropRect.left = newLeft;
+                        cropRect.right = newRight;
+                    }
+                    if (newTop >= canvasBounds.top && newBottom <= canvasBounds.bottom) {
+                        cropRect.top = newTop;
+                        cropRect.bottom = newBottom;
+                    }
+                } else if (activeCorner == CORNER_TOP_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.top + dy, true, true);
+                } else if (activeCorner == CORNER_TOP_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.top + dy, false, true);
+                } else if (activeCorner == CORNER_BOTTOM_LEFT) {
+                    adjustCorner(cropRect.left + dx, cropRect.bottom + dy, true, false);
+                } else if (activeCorner == CORNER_BOTTOM_RIGHT) {
+                    adjustCorner(cropRect.right + dx, cropRect.bottom + dy, false, false);
+                }
+                
+                lastX = x;
+                lastY = y;
+                invalidate();
+                return true;
+                
+            case MotionEvent.ACTION_UP:
+                activeCorner = -1;
+                return true;
+        }
+        return super.onTouchEvent(event);
+    }
+    
+    private void adjustCorner(float nx, float ny, boolean left, boolean top) {
+        float newWidth;
+        float newLeft = cropRect.left;
+        float newTop = cropRect.top;
+        float newRight = cropRect.right;
+        float newBottom = cropRect.bottom;
+        
+        if (left) {
+            newWidth = cropRect.width() - (nx - cropRect.left);
+            newLeft = Math.max(canvasBounds.left, Math.min(nx, cropRect.right - minSize));
+        } else {
+            newWidth = nx - cropRect.left;
+            newRight = Math.min(canvasBounds.right, Math.max(nx, cropRect.left + minSize));
+            newLeft = cropRect.left;
+        }
+        
+        float newHeight = newWidth / targetRatio;
+        
+        if (top) {
+            newTop = Math.max(canvasBounds.top, Math.min(cropRect.bottom - minSize, cropRect.bottom - newHeight));
+            newBottom = newTop + newHeight;
+        } else {
+            newBottom = Math.min(canvasBounds.bottom, Math.max(cropRect.top + minSize, cropRect.top + newHeight));
+            newTop = newBottom - newHeight;
+        }
+        
+        if (left) {
+            cropRect.left = newLeft;
+            cropRect.right = newLeft + newWidth;
+        } else {
+            cropRect.right = newRight;
+            cropRect.left = newRight - newWidth;
+        }
+        
+        if (top) {
+            cropRect.top = newTop;
+            cropRect.bottom = newTop + newHeight;
+        } else {
+            cropRect.bottom = newBottom;
+            cropRect.top = newBottom - newHeight;
+        }
+    }
+    
+    private int getActiveCorner(float x, float y) {
+        if (Math.abs(x - cropRect.left) <= touchArea && Math.abs(y - cropRect.top) <= touchArea) {
+            return CORNER_TOP_LEFT;
+        }
+        if (Math.abs(x - cropRect.right) <= touchArea && Math.abs(y - cropRect.top) <= touchArea) {
+            return CORNER_TOP_RIGHT;
+        }
+        if (Math.abs(x - cropRect.left) <= touchArea && Math.abs(y - cropRect.bottom) <= touchArea) {
+            return CORNER_BOTTOM_LEFT;
+        }
+        if (Math.abs(x - cropRect.right) <= touchArea && Math.abs(y - cropRect.bottom) <= touchArea) {
+            return CORNER_BOTTOM_RIGHT;
+        }
+        if (cropRect.contains(x, y)) {
+            return CORNER_CENTER;
+        }
+        return -1;
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/GlobalWinBoLLApplication.java b/gallery/src/main/java/cc/winboll/studio/gallery/GlobalWinBoLLApplication.java
new file mode 100644
index 0000000..a79f82d
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/GlobalWinBoLLApplication.java
@@ -0,0 +1,47 @@
+package cc.winboll.studio.gallery;
+
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.gallery.utils.BackgroundUtils;
+
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @Date 2026/04/24 15:23
+ */
+public class GlobalWinBoLLApplication extends GlobalApplication {
+    
+    public static final String TAG = "GlobalWinBoLLApplication";
+    
+
+@Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate");
+        setIsDebugging(BuildConfig.DEBUG);
+        //setIsDebugging(false);
+
+        WinBoLLActivityManager.init(this);
+
+        BackgroundUtils.initFromPreferences(this);
+
+        // 初始化 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);
+    }
+
+@Override
+    public void onTerminate() {
+        super.onTerminate();
+        LogUtils.d(TAG, "onTerminate");
+        ToastUtils.release();
+    }
+    
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java b/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java
new file mode 100644
index 0000000..833a307
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/ImageAdapter.java
@@ -0,0 +1,247 @@
+package cc.winboll.studio.gallery;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder> {
+    public static final String TAG = "ImageAdapter";
+    private ArrayList<Uri> imageUrls = new ArrayList<>();
+    private ArrayList<String> imagePaths = new ArrayList<>();
+    private OnImageClickListener listener;
+    private int bgType = 0;
+    private Preferences prefs;
+    private PinnedImageDbHelper pinnedDbHelper;
+    private AlbumCoverDbHelper coverDbHelper;
+    private String albumPath;
+    
+    private int getBgRes() {
+        switch (bgType) {
+            case 0:
+                return R.drawable.bg_checkerboard;
+            case 1:
+                return R.drawable.bg_white;
+            case 2:
+                return R.drawable.bg_black;
+            default:
+                return R.drawable.bg_checkerboard;
+        }
+    }
+
+    public interface OnImageClickListener {
+        void onImageClick(int position, ArrayList<Uri> urls, ArrayList<String> paths);
+    }
+
+    public void setOnImageClickListener(OnImageClickListener listener) {
+        this.listener = listener;
+    }
+
+    public void setData(ArrayList<Uri> urls, ArrayList<String> paths) {
+        this.imageUrls = urls;
+        this.imagePaths = paths;
+        sortPinnedFirst();
+        LogUtils.d(TAG, "setData: " + urls.size() + " images");
+        notifyDataSetChanged();
+    }
+    
+    private void sortPinnedFirst() {
+        if (pinnedDbHelper == null || imagePaths.isEmpty()) {
+            return;
+        }
+        ArrayList<Uri> pinnedUrls = new ArrayList<>();
+        ArrayList<String> pinnedPaths = new ArrayList<>();
+        ArrayList<Uri> unpinnedUrls = new ArrayList<>();
+        ArrayList<String> unpinnedPaths = new ArrayList<>();
+        for (int i = 0; i < imagePaths.size(); i++) {
+            String path = imagePaths.get(i);
+            if (pinnedDbHelper.isPinned(path)) {
+                pinnedUrls.add(imageUrls.get(i));
+                pinnedPaths.add(path);
+            } else {
+                unpinnedUrls.add(imageUrls.get(i));
+                unpinnedPaths.add(path);
+            }
+        }
+        
+        imageUrls.clear();
+        imagePaths.clear();
+        imageUrls.addAll(pinnedUrls);
+        imageUrls.addAll(unpinnedUrls);
+        imagePaths.addAll(pinnedPaths);
+        imagePaths.addAll(unpinnedPaths);
+    }
+    
+    public void setContext(android.content.Context context) {
+        prefs = new Preferences(context);
+        bgType = prefs.getBgType();
+        pinnedDbHelper = PinnedImageDbHelper.getInstance(context);
+        coverDbHelper = AlbumCoverDbHelper.getInstance(context);
+    }
+    
+    public void setAlbumPath(String albumPath) {
+        this.albumPath = albumPath;
+    }
+    
+    public int getCropWidth() {
+        return prefs != null ? prefs.getCoverWidth() : 240;
+    }
+    
+    public int getCropHeight() {
+        return prefs != null ? prefs.getCoverHeight() : 120;
+    }
+    
+    public void refreshBg() {
+        if (prefs != null) {
+            bgType = prefs.getBgType();
+            notifyDataSetChanged();
+        }
+    }
+    
+    public void refreshPinned() {
+        if (pinnedDbHelper == null || imagePaths.isEmpty()) {
+            return;
+        }
+        sortPinnedFirst();
+        notifyDataSetChanged();
+    }
+    
+    private void showContextMenu(final View view, final int position) {
+        final String imagePath = imagePaths.get(position);
+        final Uri imageUri = imageUrls.get(position);
+        final boolean[] isPinned = {pinnedDbHelper != null && pinnedDbHelper.isPinned(imagePath)};
+        final boolean[] isCover = {false};
+        if (coverDbHelper != null && albumPath != null) {
+            String originalPath = coverDbHelper.getOriginalImagePath(albumPath);
+            isCover[0] = originalPath != null && originalPath.equals(imagePath);
+        }
+        
+        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(view.getContext());
+        builder.setTitle("Image");
+        
+        String[] items;
+        if (isPinned[0]) {
+            if (isCover[0]) {
+                items = new String[]{"取消置顶", "调整封面", "取消封面"};
+            } else {
+                items = new String[]{"取消置顶", "设置为封面"};
+            }
+        } else {
+            if (isCover[0]) {
+                items = new String[]{"置顶", "调整封面", "取消封面"};
+            } else {
+                items = new String[]{"置顶", "设置为封面"};
+            }
+        }
+        
+        builder.setItems(items, new android.content.DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(android.content.DialogInterface dialog, int which) {
+                if (which == 0) {
+                    if (pinnedDbHelper != null) {
+                        if (isPinned[0]) {
+                            pinnedDbHelper.unpinImage(imagePath);
+                        } else {
+                            pinnedDbHelper.pinImage(imagePath);
+                        }
+                        refreshPinned();
+                    }
+                } else if (which == 1) {
+                    if (coverDbHelper != null && albumPath != null) {
+                        Intent cropIntent = new Intent(view.getContext(), CropActivity.class);
+                        cropIntent.putExtra(CropActivity.EXTRA_IMAGE_URI, imageUri);
+                        cropIntent.putExtra(CropActivity.EXTRA_IMAGE_PATH, imagePath);
+                        cropIntent.putExtra(CropActivity.EXTRA_ALBUM_PATH, albumPath);
+                        cropIntent.putExtra(CropActivity.EXTRA_CROP_WIDTH, getCropWidth());
+                        cropIntent.putExtra(CropActivity.EXTRA_CROP_HEIGHT, getCropHeight());
+                        ((AlbumActivity) view.getContext()).startActivityForResult(cropIntent, 100);
+                    }
+                } else if (which == 2) {
+                    if (coverDbHelper != null && albumPath != null && isCover[0]) {
+                        coverDbHelper.deleteCover(albumPath);
+                        notifyDataSetChanged();
+                    }
+                }
+            }
+        });
+        builder.show();
+    }
+    
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_gallery, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        holder.imageView.setBackgroundResource(getBgRes());
+        
+        Glide.with(holder.imageView.getContext())
+            .load(imageUrls.get(position))
+            .centerCrop()
+            .into(holder.imageView);
+        
+        final ArrayList<Uri> urls = imageUrls;
+        final ArrayList<String> paths = imagePaths;
+        final String imagePath = imagePaths.get(position);
+        
+        boolean isPinned = pinnedDbHelper != null && pinnedDbHelper.isPinned(imagePath);
+        holder.pinIcon.setVisibility(isPinned ? View.VISIBLE : View.GONE);
+        
+        boolean isCover = false;
+        if (coverDbHelper != null && albumPath != null) {
+            String originalPath = coverDbHelper.getOriginalImagePath(albumPath);
+            isCover = originalPath != null && originalPath.equals(imagePath);
+        }
+        holder.coverIcon.setVisibility(isCover ? View.VISIBLE : View.GONE);
+        
+        holder.itemView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onImageClick(position, urls, paths);
+                }
+            }
+        });
+        
+        holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                showContextMenu(holder.itemView, position);
+                return true;
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return imageUrls.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView imageView;
+        ImageView pinIcon;
+        ImageView coverIcon;
+        ViewHolder(View itemView) {
+            super(itemView);
+            imageView = itemView.findViewById(R.id.image);
+            pinIcon = itemView.findViewById(R.id.pin_icon);
+            coverIcon = itemView.findViewById(R.id.cover_icon);
+        }
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/ImagePagerAdapter.java b/gallery/src/main/java/cc/winboll/studio/gallery/ImagePagerAdapter.java
new file mode 100644
index 0000000..e420f9b
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/ImagePagerAdapter.java
@@ -0,0 +1,57 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class ImagePagerAdapter extends PagerAdapter {
+    public static final String TAG = "ImagePagerAdapter";
+    private ArrayList<Uri> imageUrls;
+
+    public ImagePagerAdapter(ArrayList<Uri> imageUrls) {
+        this.imageUrls = imageUrls;
+        LogUtils.d(TAG, "ImagePagerAdapter created with " + imageUrls.size() + " images");
+    }
+
+    @Override
+    public int getCount() {
+        return imageUrls.size();
+    }
+
+    @NonNull
+    @Override
+    public Object instantiateItem(@NonNull ViewGroup container, int position) {
+        View view = LayoutInflater.from(container.getContext())
+            .inflate(R.layout.item_image_pager, container, false);
+        view.setBackgroundResource(R.color.black);
+        ImageView imageView = view.findViewById(R.id.image);
+        
+        Glide.with(imageView.getContext())
+            .load(imageUrls.get(position))
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .skipMemoryCache(true)
+            .into(imageView);
+        
+        container.addView(view);
+        return view;
+    }
+
+    @Override
+    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+        container.removeView((View) object);
+    }
+
+    @Override
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
+        return view == object;
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/ImageViewerActivity.java b/gallery/src/main/java/cc/winboll/studio/gallery/ImageViewerActivity.java
new file mode 100644
index 0000000..2bb7aac
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/ImageViewerActivity.java
@@ -0,0 +1,397 @@
+package cc.winboll.studio.gallery;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.WindowManager;
+import android.widget.ImageButton;
+import android.widget.Toast;
+import androidx.viewpager.widget.ViewPager;
+import java.io.File;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class ImageViewerActivity extends Activity implements ViewPager.OnPageChangeListener {
+    public static final String TAG = "ImageViewerActivity";
+    public static final String EXTRA_IMAGE_URLS = "image_urls";
+    public static final String EXTRA_POSITIONS = "image_positions";
+    public static final String EXTRA_POSITION = "position";
+    
+    private ArrayList<Uri> imageUrls;
+    private ArrayList<String> imagePaths;
+    private int currentPosition;
+    private ViewPager viewPager;
+    private View toolbar;
+    private ImageButton btnBack;
+    private ImageButton btnDelete;
+    private ImageButton btnShare;
+    private ImageButton btnInfo;
+    private ImageButton btnGallery;
+    private GestureDetector gestureDetector;
+    private TrashManager trashManager;
+    private Preferences prefs;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+            WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        setContentView(R.layout.activity_image_viewer);
+        LogUtils.d(TAG, "onCreate");
+        
+        imageUrls = getIntent().getParcelableArrayListExtra(EXTRA_IMAGE_URLS);
+        imagePaths = getIntent().getStringArrayListExtra(EXTRA_POSITIONS);
+        currentPosition = getIntent().getIntExtra(EXTRA_POSITION, 0);
+        
+        trashManager = new TrashManager(this);
+        prefs = new Preferences(this);
+        
+        viewPager = findViewById(R.id.view_pager);
+        toolbar = findViewById(R.id.toolbar);
+        btnBack = findViewById(R.id.btn_back);
+        btnDelete = findViewById(R.id.btn_delete);
+        btnShare = findViewById(R.id.btn_share);
+        btnInfo = findViewById(R.id.btn_info);
+        
+        btnGallery = findViewById(R.id.btn_gallery);
+        
+        ImagePagerAdapter adapter = new ImagePagerAdapter(imageUrls);
+        viewPager.setAdapter(adapter);
+        viewPager.setCurrentItem(currentPosition);
+        viewPager.addOnPageChangeListener(this);
+        
+        gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapConfirmed(MotionEvent e) {
+                toggleToolbar();
+                return true;
+            }
+        });
+        
+        viewPager.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return gestureDetector.onTouchEvent(event);
+            }
+        });
+        
+        btnBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        
+        btnDelete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showDeleteDialog();
+            }
+        });
+        
+        btnShare.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                shareCurrentImage();
+            }
+        });
+        
+        btnInfo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showImageInfo();
+            }
+        });
+        
+        btnGallery.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(ImageViewerActivity.this, "Gallery", Toast.LENGTH_SHORT).show();
+                if (imageUrls != null && currentPosition >= 0 && currentPosition < imageUrls.size()) {
+                    Uri imageUri = imageUrls.get(currentPosition);
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setDataAndType(imageUri, "image/*");
+                    intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                    startActivity(Intent.createChooser(intent, "打开相册"));
+                }
+            }
+        });
+    }
+    
+    private void toggleToolbar() {
+        if (toolbar.getVisibility() == View.VISIBLE) {
+            toolbar.setVisibility(View.GONE);
+        } else {
+            toolbar.setVisibility(View.VISIBLE);
+        }
+    }
+    
+    private void showDeleteDialog() {
+        new AlertDialog.Builder(this)
+            .setMessage("Delete to trash?")
+            .setPositiveButton("Yes", new android.content.DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(android.content.DialogInterface dialog, int which) {
+                    moveToTrash();
+                }
+            })
+            .setNegativeButton("No", null)
+            .show();
+    }
+    
+    private void moveToTrash() {
+        LogUtils.d(TAG, "moveToTrash");
+        if (currentPosition >= 0 && currentPosition < imageUrls.size()) {
+            String imagePath = "";
+            if (imagePaths != null && currentPosition < imagePaths.size()) {
+                imagePath = imagePaths.get(currentPosition);
+            } else {
+                imagePath = getPathFromUri(imageUrls.get(currentPosition));
+            }
+            
+            Uri imageUri = imageUrls.get(currentPosition);
+            long result = -1;
+            
+            if (!imagePath.isEmpty()) {
+                result = trashManager.addToTrash(imagePath);
+            }
+            
+            if (result > 0) {
+                try {
+                    getContentResolver().delete(imageUri, null, null);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                android.widget.Toast.makeText(this, "Moved to trash", android.widget.Toast.LENGTH_SHORT).show();
+                LogUtils.i(TAG, "Moved to trash");
+                removeCurrentImage();
+            } else {
+                try {
+                    int deleted = getContentResolver().delete(imageUri, null, null);
+                    android.widget.Toast.makeText(this, "Deleted: " + deleted, android.widget.Toast.LENGTH_SHORT).show();
+                    removeCurrentImage();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    removeCurrentImage();
+                }
+            }
+        }
+    }
+    
+    private void removeCurrentImage() {
+        imageUrls.remove(currentPosition);
+        if (imagePaths != null) {
+            imagePaths.remove(currentPosition);
+        }
+        
+        if (imageUrls.isEmpty()) {
+            finish();
+        } else {
+            if (currentPosition >= imageUrls.size()) {
+                currentPosition = imageUrls.size() - 1;
+            }
+            viewPager.setAdapter(new ImagePagerAdapter(imageUrls));
+            viewPager.setCurrentItem(currentPosition);
+        }
+    }
+    
+    private String getPathFromUri(Uri uri) {
+        String[] projection = { MediaStore.Images.Media.DATA };
+        android.database.Cursor cursor = getContentResolver().query(uri, projection, null, null, null);
+        if (cursor != null) {
+            try {
+                if (cursor.moveToFirst()) {
+                    int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                    return cursor.getString(columnIndex);
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+        return uri.getPath();
+    }
+    
+    private void shareCurrentImage() {
+        if (currentPosition >= 0 && currentPosition < imageUrls.size()) {
+            Uri imageUri = imageUrls.get(currentPosition);
+            Intent shareIntent = new Intent(Intent.ACTION_SEND);
+            shareIntent.setType("image/*");
+            shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri);
+            shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            startActivity(Intent.createChooser(shareIntent, "Share Image"));
+        }
+    }
+    
+    private void showImageInfo() {
+        if (currentPosition < 0 || currentPosition >= imageUrls.size()) {
+            return;
+        }
+        
+        String imagePath = "";
+        if (imagePaths != null && currentPosition < imagePaths.size()) {
+            imagePath = imagePaths.get(currentPosition);
+        } else {
+            imagePath = getPathFromUri(imageUrls.get(currentPosition));
+        }
+        
+        File imageFile = new File(imagePath);
+        if (!imageFile.exists()) {
+            imageFile = new File(imagePath);
+        }
+        
+        android.widget.LinearLayout layout = new android.widget.LinearLayout(this);
+        layout.setOrientation(android.widget.LinearLayout.VERTICAL);
+        layout.setPadding(48, 32, 48, 32);
+        
+        android.widget.TextView labelPath = new android.widget.TextView(this);
+        labelPath.setText("Path:");
+        labelPath.setTextColor(getColor(android.R.color.darker_gray));
+        labelPath.setTextSize(14);
+        labelPath.setTypeface(null, android.graphics.Typeface.BOLD);
+        layout.addView(labelPath);
+        
+        android.widget.TextView valuePath = new android.widget.TextView(this);
+        valuePath.setText(imagePath);
+        valuePath.setTextColor(getColor(android.R.color.black));
+        valuePath.setTextSize(14);
+        valuePath.setTextIsSelectable(true);
+        layout.addView(valuePath);
+        
+        if (imageFile.exists()) {
+            long sizeBytes = imageFile.length();
+            String size;
+            if (sizeBytes < 1024) {
+                size = sizeBytes + " B";
+            } else if (sizeBytes < 1024 * 1024) {
+                size = String.format("%.2f KB", sizeBytes / 1024.0);
+            } else {
+                size = String.format("%.2f MB", sizeBytes / (1024.0 * 1024.0));
+            }
+            
+            android.widget.TextView labelSize = new android.widget.TextView(this);
+            labelSize.setText("Size:");
+            labelSize.setTextColor(getColor(android.R.color.darker_gray));
+            labelSize.setTextSize(14);
+            labelSize.setTypeface(null, android.graphics.Typeface.BOLD);
+            layout.addView(labelSize);
+            
+            android.widget.TextView valueSize = new android.widget.TextView(this);
+            valueSize.setText(size);
+            valueSize.setTextColor(getColor(android.R.color.black));
+            valueSize.setTextSize(14);
+            valueSize.setTextIsSelectable(true);
+            layout.addView(valueSize);
+        }
+        
+        try {
+            android.graphics.BitmapFactory.Options options = new android.graphics.BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            android.graphics.BitmapFactory.decodeFile(imagePath, options);
+            if (options.outWidth > 0 && options.outHeight > 0) {
+                android.widget.TextView labelPixels = new android.widget.TextView(this);
+                labelPixels.setText("Pixels:");
+                labelPixels.setTextColor(getColor(android.R.color.darker_gray));
+                labelPixels.setTextSize(14);
+                labelPixels.setTypeface(null, android.graphics.Typeface.BOLD);
+                layout.addView(labelPixels);
+                
+                android.widget.TextView valuePixels = new android.widget.TextView(this);
+                valuePixels.setText(options.outWidth + " x " + options.outHeight);
+                valuePixels.setTextColor(getColor(android.R.color.black));
+                valuePixels.setTextSize(14);
+                valuePixels.setTextIsSelectable(true);
+                layout.addView(valuePixels);
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "get pixels error: " + e.getMessage());
+        }
+        
+        try {
+            String[] projection = {
+                MediaStore.Images.Media.DATE_ADDED,
+                MediaStore.Images.Media.DATE_MODIFIED,
+                MediaStore.Images.Media.DATE_TAKEN
+            };
+            android.database.Cursor cursor = getContentResolver().query(
+                imageUrls.get(currentPosition), projection, null, null, null);
+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    int dateAddedCol = cursor.getColumnIndex(MediaStore.Images.Media.DATE_ADDED);
+                    int dateTakenCol = cursor.getColumnIndex(MediaStore.Images.Media.DATE_TAKEN);
+                    
+                    java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    
+                    if (dateTakenCol >= 0) {
+                        long dateTaken = cursor.getLong(dateTakenCol);
+                        if (dateTaken > 0) {
+                            android.widget.TextView labelTaken = new android.widget.TextView(this);
+                            labelTaken.setText("Date Taken:");
+                            labelTaken.setTextColor(getColor(android.R.color.darker_gray));
+                            labelTaken.setTextSize(14);
+                            labelTaken.setTypeface(null, android.graphics.Typeface.BOLD);
+                            layout.addView(labelTaken);
+                            
+                            android.widget.TextView valueTaken = new android.widget.TextView(this);
+                            valueTaken.setText(sdf.format(new java.util.Date(dateTaken)));
+                            valueTaken.setTextColor(getColor(android.R.color.black));
+                            valueTaken.setTextSize(14);
+                            valueTaken.setTextIsSelectable(true);
+                            layout.addView(valueTaken);
+                        }
+                    }
+                    if (dateAddedCol >= 0) {
+                        long dateAdded = cursor.getLong(dateAddedCol);
+                        if (dateAdded > 0) {
+                            android.widget.TextView labelAdded = new android.widget.TextView(this);
+                            labelAdded.setText("Date Added:");
+                            labelAdded.setTextColor(getColor(android.R.color.darker_gray));
+                            labelAdded.setTextSize(14);
+                            labelAdded.setTypeface(null, android.graphics.Typeface.BOLD);
+                            layout.addView(labelAdded);
+                            
+                            android.widget.TextView valueAdded = new android.widget.TextView(this);
+                            valueAdded.setText(sdf.format(new java.util.Date(dateAdded * 1000)));
+                            valueAdded.setTextColor(getColor(android.R.color.black));
+                            valueAdded.setTextSize(14);
+                            valueAdded.setTextIsSelectable(true);
+                            layout.addView(valueAdded);
+                        }
+                    }
+                }
+                cursor.close();
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "get date error: " + e.getMessage());
+        }
+        
+        new AlertDialog.Builder(this)
+            .setTitle("Image Info")
+            .setView(layout)
+            .setPositiveButton("OK", null)
+            .show();
+    }
+    
+    @Override
+    public void onPageSelected(int position) {
+        currentPosition = position;
+    }
+    
+    @Override
+    public void onPageScrollStateChanged(int state) {}
+    
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
+    
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/MainActivity.java b/gallery/src/main/java/cc/winboll/studio/gallery/MainActivity.java
new file mode 100644
index 0000000..bb1e352
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/MainActivity.java
@@ -0,0 +1,419 @@
+package cc.winboll.studio.gallery;
+
+import android.Manifest;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.provider.Settings;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.gallery.AlbumAdapter.OnAlbumClickListener;
+import cc.winboll.studio.gallery.utils.BackgroundUtils;
+import cc.winboll.studio.libappbase.LogActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+
+public class MainActivity extends AppCompatActivity {
+    public static final String TAG = "MainActivity";
+    private static final int PERMISSION_REQUEST_CODE = 100;
+    private static final int MANAGE_PERMISSION_REQUEST_CODE = 101;
+    private RecyclerView recyclerView;
+    private AlbumAdapter adapter;
+    private Preferences prefs;
+    private FloatingActionButton fabScrollTop;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
+
+        View content = findViewById(android.R.id.content);
+        if (content != null) {
+            content.setBackground(BackgroundUtils.getInstance().getDrawable());
+        }
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        prefs = new Preferences(this);
+
+        recyclerView = findViewById(R.id.recycler_view);
+        recyclerView.setLayoutManager(new GridLayoutManager(this, 2));
+        adapter = new AlbumAdapter();
+        adapter.setContext(this);
+        recyclerView.setAdapter(adapter);
+
+        fabScrollTop = findViewById(R.id.fab_scroll_top);
+        fabScrollTop.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					recyclerView.scrollToPosition(0);
+				}
+			});
+
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+				@Override
+				public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+					super.onScrolled(recyclerView, dx, dy);
+					GridLayoutManager layoutManager = (GridLayoutManager) recyclerView.getLayoutManager();
+					if (layoutManager != null) {
+						int firstVisible = layoutManager.findFirstVisibleItemPosition();
+						if (firstVisible > 0) {
+							fabScrollTop.setVisibility(View.VISIBLE);
+						} else {
+							fabScrollTop.setVisibility(View.GONE);
+						}
+					}
+				}
+			});
+
+        adapter.setOnAlbumClickListener(new OnAlbumClickListener() {
+				@Override
+				public void onAlbumClick(Album album) {
+					Intent intent = new Intent(MainActivity.this, AlbumActivity.class);
+					intent.putExtra(AlbumActivity.EXTRA_ALBUM_PATH, album.getPath());
+					intent.putExtra(AlbumActivity.EXTRA_ALBUM_NAME, album.getName());
+					startActivity(intent);
+				}
+			});
+
+        checkAndRequestPermissions();
+    }
+
+    private void checkAndRequestPermissions() {
+        LogUtils.i(TAG, "checkAndRequestPermissions");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                try {
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                    intent.setData(Uri.parse("package:" + getPackageName()));
+                    startActivityForResult(intent, MANAGE_PERMISSION_REQUEST_CODE);
+                } catch (Exception e) {
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+                    startActivityForResult(intent, MANAGE_PERMISSION_REQUEST_CODE);
+                }
+                return;
+            }
+        }
+
+        if (checkPermission()) {
+            loadAlbums();
+        } else {
+            requestPermission();
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == MANAGE_PERMISSION_REQUEST_CODE) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                if (Environment.isExternalStorageManager()) {
+                    loadAlbums();
+                } else {
+                    Toast.makeText(this, "Permission required", Toast.LENGTH_SHORT).show();
+                }
+            }
+        }
+    }
+
+    private boolean checkPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return Environment.isExternalStorageManager();
+        }
+        return ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) 
+            == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, 
+										  new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 
+										  PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, 
+										   @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                loadAlbums();
+            } else {
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+	private void loadAlbums() {
+        LogUtils.d(TAG, "loadAlbums");
+        String folderPath = prefs.getFolderPath();
+        File baseFolder = new File(folderPath);
+        LogUtils.d(TAG, "baseFolder: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
+
+        if (!baseFolder.exists() || !baseFolder.isDirectory()) {
+            folderPath = Preferences.getDefaultPath();
+            baseFolder = new File(folderPath);
+            LogUtils.d(TAG, "try default: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
+            if (!baseFolder.exists()) {
+                folderPath = Environment.getExternalStorageDirectory() + "/Pictures";
+                baseFolder = new File(folderPath);
+                LogUtils.d(TAG, "try Pictures: " + baseFolder.getAbsolutePath() + ", exists=" + baseFolder.exists());
+            }
+        }
+
+        AlbumCoverDbHelper coverDbHelper = AlbumCoverDbHelper.getInstance(this);
+        ArrayList<Album> albums = new ArrayList<>();
+
+        FileFilter directoryFilter = new FileFilter() {
+            @Override
+            public boolean accept(File file) {
+                return file.isDirectory();
+            }
+        };
+        File[] subfolders = baseFolder.listFiles(directoryFilter);
+        LogUtils.d(TAG, "subfolders: " + (subfolders != null ? subfolders.length : 0));
+        if (subfolders != null) {
+            for (File subfolder : subfolders) {
+                LogUtils.d(TAG, "scanning folder: " + subfolder.getName());
+                String albumPath = subfolder.getAbsolutePath();
+                String coverPath = coverDbHelper.getCover(albumPath);
+                LogUtils.d(TAG, "loadAlbums: album=" + albumPath + ", coverPath=" + coverPath);
+                Uri coverUri = null;
+                if (coverPath != null) {
+                    File coverFile = new File(coverPath);
+                    if (coverFile.exists()) {
+                        coverUri = Uri.fromFile(coverFile);
+                        LogUtils.d(TAG, "loadAlbums: cover from file=" + coverFile.getAbsolutePath());
+                    } else {
+                        coverUri = getUriFromPath(coverPath);
+                        LogUtils.d(TAG, "loadAlbums: cover from media store path=" + coverPath);
+                    }
+                }
+                if (coverUri == null) {
+                    ArrayList<Uri> images = getImagesInFolder(albumPath);
+                    if (!images.isEmpty()) {
+                        coverUri = images.get(0);
+                    }
+                }
+                ArrayList<Uri> allImages = getImagesInFolder(albumPath);
+                if (coverUri != null || !allImages.isEmpty()) {
+                    if (coverUri == null && !allImages.isEmpty()) {
+                        coverUri = allImages.get(0);
+                    }
+                    int imageCount = allImages.size();
+                    albums.add(new Album(subfolder.getName(), albumPath, coverUri, imageCount));
+                    LogUtils.d(TAG, "album added: " + subfolder.getName() + ", " + imageCount + " images");
+                }
+            }
+        }
+
+        if (albums.isEmpty()) {
+            Toast.makeText(this, R.string.no_images_found, Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "No albums found");
+        }
+        adapter.setData(albums);
+        LogUtils.d(TAG, "Loaded " + albums.size() + " albums");
+    }
+
+    private Uri getUriFromPath(String path) {
+        String[] projection = { MediaStore.Images.Media._ID };
+        String selection = MediaStore.Images.Media.DATA + " = ?";
+        String[] selectionArgs = { path };
+        try (Cursor cursor = getContentResolver().query(
+			MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+			projection, selection, selectionArgs, null)) {
+            if (cursor != null) {
+                if (cursor.moveToFirst()) {
+                    long id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID));
+                    return Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, String.valueOf(id));
+                }
+            }
+        }
+        return null;
+    }
+
+    private ArrayList<Uri> getImagesInFolder(String folderPath) {
+        ArrayList<Uri> imageUrls = new ArrayList<>();
+        ContentResolver contentResolver = getContentResolver();
+        Uri collection = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+
+        String selection = MediaStore.Images.Media.DATA + " LIKE ?";
+        String[] selectionArgs = new String[]{folderPath + "/%"};
+        String sortOrder = MediaStore.Images.Media.DATE_ADDED + " DESC";
+
+        LogUtils.d(TAG, "getImagesInFolder: " + folderPath);
+
+        try (Cursor cursor = contentResolver.query(collection, null, selection, selectionArgs, sortOrder)) {
+            if (cursor != null) {
+                LogUtils.d(TAG, "cursor count: " + cursor.getCount());
+                int dataColumn = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                while (cursor.moveToNext()) {
+                    String path = cursor.getString(dataColumn);
+                    if (path != null) {
+                        long id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID));
+                        Uri contentUri = Uri.withAppendedPath(collection, String.valueOf(id));
+                        LogUtils.d(TAG, "image: id=" + id + ", path=" + path);
+                        imageUrls.add(contentUri);
+                    }
+                }
+            }
+        }
+        LogUtils.d(TAG, "found " + imageUrls.size() + " images");
+        return imageUrls;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.action_mi_gallery) {
+            Toast.makeText(this, "Gallery clicked", Toast.LENGTH_SHORT).show();
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_APP_GALLERY);
+            startActivity(intent);
+            return true;
+        } else if (id == R.id.action_change_bg_color) {
+            //Toast.makeText(this, "修改背景颜色", Toast.LENGTH_SHORT).show();
+			if (BackgroundUtils.DrawableType.COLOR == BackgroundUtils.getInstance().getDrawableType()) {
+
+				ColorPickerDialog dlg = new ColorPickerDialog(this, BackgroundUtils.getInstance().getColor());
+				dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
+
+						@Override
+						public void beforeColorChanged() {
+						}
+
+						@Override
+						public void onColorChanged(int color) {
+							BackgroundUtils.getInstance().initFromColor(MainActivity.this, color);
+							View content = findViewById(android.R.id.content);
+							if (content != null) {
+								content.setBackground(BackgroundUtils.getInstance().getDrawable());
+							}
+						}
+
+						@Override
+						public void afterColorChanged() {
+						}
+					});
+				dlg.show();
+			}
+            return true;
+        } else if (id == R.id.action_settings) {
+            startActivity(new Intent(this, SettingsActivity.class));
+            return true;
+        } else if (id == R.id.action_about) {
+            startActivity(new Intent(this, AboutActivity.class));
+            return true;
+        } else if (id == R.id.action_trash) {
+            startActivity(new Intent(this, TrashActivity.class));
+            return true;
+        } else if (id == R.id.action_debug) {
+            LogActivity.startLogActivity(this);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private BroadcastReceiver coverUpdatedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (Preferences.ACTION_COVER_UPDATED.equals(intent.getAction())) {
+                loadAlbums();
+            }
+        }
+    };
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        registerReceiver(coverUpdatedReceiver, new IntentFilter(Preferences.ACTION_COVER_UPDATED));
+        if (checkPermission()) {
+            scanMediaStore();
+            loadAlbums();
+        }
+        if (adapter != null) {
+            adapter.refreshBg();
+            adapter.refreshPinned();
+            adapter.refreshCover();
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        unregisterReceiver(coverUpdatedReceiver);
+    }
+
+    private void scanMediaStore() {
+        String folderPath = prefs.getFolderPath();
+        File baseFolder = new File(folderPath);
+        if (baseFolder.exists() && baseFolder.isDirectory()) {
+            File[] subfolders = baseFolder.listFiles(new FileFilter() {
+					@Override
+					public boolean accept(File file) {
+						return file.isDirectory();
+					}
+				});
+            if (subfolders != null) {
+                ArrayList<String> paths = new ArrayList<>();
+                for (File subfolder : subfolders) {
+                    File[] images = subfolder.listFiles(new FilenameFilter() {
+							@Override
+							public boolean accept(File dir, String name) {
+								String lower = name.toLowerCase();
+								return lower.endsWith(".jpg") || lower.endsWith(".jpeg") 
+									|| lower.endsWith(".png") || lower.endsWith(".gif")
+									|| lower.endsWith(".webp") || lower.endsWith(".bmp");
+							}
+						});
+                    if (images != null) {
+                        for (File img : images) {
+                            paths.add(img.getAbsolutePath());
+                        }
+                    }
+                }
+                if (!paths.isEmpty()) {
+                    LogUtils.d(TAG, "scanning " + paths.size() + " files to MediaStore");
+                    String[] pathArray = paths.toArray(new String[0]);
+                    MediaScannerConnection.scanFile(this, pathArray, null, new MediaScannerConnection.OnScanCompletedListener() {
+							@Override
+							public void onScanCompleted(String path, Uri uri) {
+								LogUtils.d(TAG, "scanCompleted: " + path + " -> " + uri);
+							}
+						});
+                }
+            }
+        }
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/PinnedAlbumDbHelper.java b/gallery/src/main/java/cc/winboll/studio/gallery/PinnedAlbumDbHelper.java
new file mode 100644
index 0000000..6dc35e9
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/PinnedAlbumDbHelper.java
@@ -0,0 +1,78 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class PinnedAlbumDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "PinnedAlbumDbHelper";
+    private static final String DB_NAME = "pinned_album.db";
+    private static final int DB_VERSION = 1;
+    private static final String TABLE_NAME = "pinned_albums";
+    private static final String COLUMN_PATH = "album_path";
+    
+    private static final String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " (" 
+        + COLUMN_PATH + " TEXT PRIMARY KEY)";
+    
+    private static PinnedAlbumDbHelper dbHelper;
+    
+    public static PinnedAlbumDbHelper getInstance(Context context) {
+        if (dbHelper == null) {
+            dbHelper = new PinnedAlbumDbHelper(context.getApplicationContext());
+        }
+        return dbHelper;
+    }
+    
+    public PinnedAlbumDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(SQL_CREATE);
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+    
+    public void pinAlbum(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_PATH, albumPath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE);
+        LogUtils.d(TAG, "pinAlbum: " + albumPath);
+    }
+    
+    public void unpinAlbum(String albumPath) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, COLUMN_PATH + " = ?", new String[]{albumPath});
+        LogUtils.d(TAG, "unpinAlbum: " + albumPath);
+    }
+    
+    public boolean isPinned(String albumPath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, null, COLUMN_PATH + " = ?", 
+            new String[]{albumPath}, null, null, null);
+        boolean pinned = cursor.getCount() > 0;
+        cursor.close();
+        return pinned;
+    }
+    
+    public String[] getPinnedPaths() {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_PATH}, null, null, null, null, null);
+        String[] paths = new String[cursor.getCount()];
+        int i = 0;
+        while (cursor.moveToNext()) {
+            paths[i++] = cursor.getString(0);
+        }
+        cursor.close();
+        return paths;
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/PinnedImageDbHelper.java b/gallery/src/main/java/cc/winboll/studio/gallery/PinnedImageDbHelper.java
new file mode 100644
index 0000000..460d6e9
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/PinnedImageDbHelper.java
@@ -0,0 +1,78 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class PinnedImageDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "PinnedImageDbHelper";
+    private static final String DB_NAME = "pinned_image.db";
+    private static final int DB_VERSION = 1;
+    private static final String TABLE_NAME = "pinned_images";
+    private static final String COLUMN_PATH = "image_path";
+    
+    private static final String SQL_CREATE = "CREATE TABLE " + TABLE_NAME + " (" 
+        + COLUMN_PATH + " TEXT PRIMARY KEY)";
+    
+    private static PinnedImageDbHelper dbHelper;
+    
+    public static PinnedImageDbHelper getInstance(Context context) {
+        if (dbHelper == null) {
+            dbHelper = new PinnedImageDbHelper(context.getApplicationContext());
+        }
+        return dbHelper;
+    }
+    
+    public PinnedImageDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(SQL_CREATE);
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+    
+    public void pinImage(String imagePath) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_PATH, imagePath);
+        db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE);
+        LogUtils.d(TAG, "pinImage: " + imagePath);
+    }
+    
+    public void unpinImage(String imagePath) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, COLUMN_PATH + " = ?", new String[]{imagePath});
+        LogUtils.d(TAG, "unpinImage: " + imagePath);
+    }
+    
+    public boolean isPinned(String imagePath) {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, null, COLUMN_PATH + " = ?", 
+            new String[]{imagePath}, null, null, null);
+        boolean pinned = cursor.getCount() > 0;
+        cursor.close();
+        return pinned;
+    }
+    
+    public String[] getPinnedPaths() {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.query(TABLE_NAME, new String[]{COLUMN_PATH}, null, null, null, null, null);
+        String[] paths = new String[cursor.getCount()];
+        int i = 0;
+        while (cursor.moveToNext()) {
+            paths[i++] = cursor.getString(0);
+        }
+        cursor.close();
+        return paths;
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/Preferences.java b/gallery/src/main/java/cc/winboll/studio/gallery/Preferences.java
new file mode 100644
index 0000000..d005cd9
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/Preferences.java
@@ -0,0 +1,93 @@
+package cc.winboll.studio.gallery;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class Preferences {
+    public static final String TAG = "Preferences";
+    private static final String PREF_NAME = "gallery_prefs";
+    private static final String KEY_FOLDER_PATH = "folder_path";
+    private static final String KEY_BG_TYPE = "bg_type";
+    private static final String KEY_ALBUM_SORT_MODE = "album_sort_mode";
+    private static final String KEY_COVER_WIDTH = "cover_width";
+    private static final String KEY_COVER_HEIGHT = "cover_height";
+    private static final String KEY_COVER_RATIO = "cover_ratio";
+
+    public static final String ACTION_COVER_UPDATED = "cc.winboll.studio.gallery.COVER_UPDATED";
+
+    private static final int DEFAULT_BG_TYPE = 0;
+    private static final int DEFAULT_SORT_MODE = 0;
+    private static final int DEFAULT_COVER_WIDTH = 240;
+    private static final int DEFAULT_COVER_HEIGHT = 120;
+    private static final float DEFAULT_COVER_RATIO = 2.0f;
+    private static final String DEFAULT_PATH = "/storage/emulated/0/Pictures/Gallery/owner";
+    
+    public static final int SORT_TIME_DESC = 0;
+    public static final int SORT_TIME_ASC = 1;
+    public static final int SORT_NAME_DESC = 2;
+    public static final int SORT_NAME_ASC = 3;
+    
+    public static String getDefaultPath() {
+        return DEFAULT_PATH;
+    }
+    
+    private final SharedPreferences prefs;
+    
+    public Preferences(Context context) {
+        prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+    }
+    
+    public String getFolderPath() {
+        String path = prefs.getString(KEY_FOLDER_PATH, DEFAULT_PATH);
+        LogUtils.d(TAG, "getFolderPath: " + path);
+        return path;
+    }
+    
+    public void setFolderPath(String path) {
+        LogUtils.d(TAG, "setFolderPath: " + path);
+        prefs.edit().putString(KEY_FOLDER_PATH, path).apply();
+    }
+    
+    public int getBgType() {
+        return prefs.getInt(KEY_BG_TYPE, DEFAULT_BG_TYPE);
+    }
+    
+    public void setBgType(int type) {
+        LogUtils.d(TAG, "setBgType: " + type);
+        prefs.edit().putInt(KEY_BG_TYPE, type).apply();
+    }
+    
+    public int getAlbumSortMode() {
+        return prefs.getInt(KEY_ALBUM_SORT_MODE, DEFAULT_SORT_MODE);
+    }
+    
+    public void setAlbumSortMode(int mode) {
+        LogUtils.d(TAG, "setAlbumSortMode: " + mode);
+        prefs.edit().putInt(KEY_ALBUM_SORT_MODE, mode).apply();
+    }
+    
+    public int getCoverWidth() {
+        return prefs.getInt(KEY_COVER_WIDTH, DEFAULT_COVER_WIDTH);
+    }
+    
+    public void setCoverWidth(int width) {
+        prefs.edit().putInt(KEY_COVER_WIDTH, width).apply();
+    }
+    
+    public int getCoverHeight() {
+        return prefs.getInt(KEY_COVER_HEIGHT, DEFAULT_COVER_HEIGHT);
+    }
+    
+    public void setCoverHeight(int height) {
+        prefs.edit().putInt(KEY_COVER_HEIGHT, height).apply();
+    }
+    
+    public float getCoverRatio() {
+        return prefs.getFloat(KEY_COVER_RATIO, DEFAULT_COVER_RATIO);
+    }
+    
+    public void setCoverRatio(float ratio) {
+        prefs.edit().putFloat(KEY_COVER_RATIO, ratio).apply();
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/SettingsActivity.java b/gallery/src/main/java/cc/winboll/studio/gallery/SettingsActivity.java
new file mode 100644
index 0000000..c730c73
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/SettingsActivity.java
@@ -0,0 +1,46 @@
+package cc.winboll.studio.gallery;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class SettingsActivity extends AppCompatActivity {
+    public static final String TAG = "SettingsActivity";
+    private Preferences prefs;
+    private EditText editFolderPath;
+    private TextView textCurrentPath;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        LogUtils.d(TAG, "onCreate");
+        
+        prefs = new Preferences(this);
+        
+        editFolderPath = findViewById(R.id.edit_folder_path);
+        textCurrentPath = findViewById(R.id.text_current_path);
+        Button btnSave = findViewById(R.id.btn_save);
+        
+        String currentPath = prefs.getFolderPath();
+        editFolderPath.setText(currentPath);
+        textCurrentPath.setText("Current: " + currentPath);
+        
+        btnSave.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String newPath = editFolderPath.getText().toString().trim();
+                if (!newPath.isEmpty()) {
+                    prefs.setFolderPath(newPath);
+                    textCurrentPath.setText("Current: " + newPath);
+                }
+                finish();
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/TrashActivity.java b/gallery/src/main/java/cc/winboll/studio/gallery/TrashActivity.java
new file mode 100644
index 0000000..ab30395
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/TrashActivity.java
@@ -0,0 +1,193 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import java.io.File;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashActivity extends AppCompatActivity {
+    public static final String TAG = "TrashActivity";
+    private static final int PERMISSION_REQUEST_CODE = 102;
+    private RecyclerView recyclerView;
+    private TrashAdapter adapter;
+    private TrashManager trashManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
+        
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle("Trash");
+        
+        trashManager = new TrashManager(this);
+        
+        recyclerView = findViewById(R.id.recycler_view);
+        recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
+        adapter = new TrashAdapter();
+        recyclerView.setAdapter(adapter);
+        
+        adapter.setOnTrashClickListener(new TrashAdapter.OnTrashClickListener() {
+            @Override
+            public void onRestoreClick(int position) {
+                restoreImage(position);
+            }
+            
+            @Override
+            public void onDeleteClick(int position) {
+                permanentlyDelete(position);
+            }
+        });
+        
+        if (checkPermission()) {
+            loadTrash();
+        } else {
+            requestPermission();
+        }
+    }
+
+    private boolean checkPermission() {
+        return ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE) 
+            == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, 
+            new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE}, 
+            PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, 
+            @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                loadTrash();
+            } else {
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void loadTrash() {
+        LogUtils.d(TAG, "loadTrash");
+        Cursor cursor = trashManager.getTrashList();
+        ArrayList<TrashItem> items = new ArrayList<TrashItem>();
+        ArrayList<Uri> uris = new ArrayList<Uri>();
+        
+        String trashPath = TrashDbHelper.getTrashPath();
+        File trashDir = new File(trashPath);
+        
+        if (cursor != null && cursor.getCount() > 0) {
+            cursor.moveToFirst();
+            do {
+                try {
+                    long id = cursor.getLong(cursor.getColumnIndexOrThrow("_id"));
+                    String fileName = cursor.getString(cursor.getColumnIndexOrThrow("file_name"));
+                    String originalPath = cursor.getString(cursor.getColumnIndexOrThrow("original_path"));
+                    String originalFolder = cursor.getString(cursor.getColumnIndexOrThrow("original_folder"));
+                    
+                    TrashItem item = new TrashItem();
+                    item.id = id;
+                    item.fileName = fileName;
+                    item.originalPath = originalPath;
+                    item.originalFolder = originalFolder;
+                    
+                    File trashFile = new File(trashDir, fileName);
+                    if (trashFile.exists()) {
+                        items.add(item);
+                        uris.add(Uri.fromFile(trashFile));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (cursor.moveToNext());
+            cursor.close();
+        }
+        
+        adapter.setData(items, uris);
+        
+        if (items.isEmpty()) {
+            Toast.makeText(this, "Trash is empty", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void restoreImage(int position) {
+        LogUtils.d(TAG, "restoreImage: " + position);
+        long id = adapter.getItemId(position);
+        String fileName = adapter.getFileName(position);
+        String originalPath = adapter.getOriginalPath(position);
+        
+        if (trashManager.restore(id, fileName, originalPath)) {
+            Toast.makeText(this, "Image restored", Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "Image restored");
+            loadTrash();
+        } else {
+            Toast.makeText(this, "Restore failed", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void permanentlyDelete(int position) {
+        long id = adapter.getItemId(position);
+        String fileName = adapter.getFileName(position);
+        
+        if (trashManager.deletePermanently(id, fileName)) {
+            Toast.makeText(this, "Image deleted", Toast.LENGTH_SHORT).show();
+            loadTrash();
+        } else {
+            Toast.makeText(this, "Delete failed", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_trash, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == R.id.action_clear_trash) {
+            trashManager.clearTrash();
+            Toast.makeText(this, "Trash cleared", Toast.LENGTH_SHORT).show();
+            loadTrash();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (checkPermission()) {
+            loadTrash();
+        }
+    }
+    
+    public static class TrashItem {
+        public long id;
+        public String fileName;
+        public String originalPath;
+        public String originalFolder;
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java b/gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java
new file mode 100644
index 0000000..49a7cae
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/TrashAdapter.java
@@ -0,0 +1,111 @@
+package cc.winboll.studio.gallery;
+
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+import java.util.ArrayList;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashAdapter extends RecyclerView.Adapter<TrashAdapter.ViewHolder> {
+    public static final String TAG = "TrashAdapter";
+    private ArrayList<TrashActivity.TrashItem> trashItems = new ArrayList<TrashActivity.TrashItem>();
+    private ArrayList<Uri> imageUrls = new ArrayList<Uri>();
+    private OnTrashClickListener listener;
+
+    public interface OnTrashClickListener {
+        void onRestoreClick(int position);
+        void onDeleteClick(int position);
+    }
+
+    public void setOnTrashClickListener(OnTrashClickListener listener) {
+        this.listener = listener;
+    }
+
+    public void setData(ArrayList<TrashActivity.TrashItem> items, ArrayList<Uri> uris) {
+        this.trashItems = items;
+        this.imageUrls = uris;
+        LogUtils.d(TAG, "setData: " + items.size() + " items");
+        notifyDataSetChanged();
+    }
+
+    public long getItemId(int position) {
+        if (position >= 0 && position < trashItems.size()) {
+            return trashItems.get(position).id;
+        }
+        return -1;
+    }
+    
+    public String getFileName(int position) {
+        if (position >= 0 && position < trashItems.size()) {
+            return trashItems.get(position).fileName;
+        }
+        return "";
+    }
+    
+    public String getOriginalPath(int position) {
+        if (position >= 0 && position < trashItems.size()) {
+            return trashItems.get(position).originalPath;
+        }
+        return "";
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_trash, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, final int position) {
+        if (position < imageUrls.size()) {
+            Glide.with(holder.imageView.getContext())
+                .load(imageUrls.get(position))
+                .centerCrop()
+                .into(holder.imageView);
+        }
+        
+        holder.btnRestore.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onRestoreClick(position);
+                }
+            }
+        });
+        
+        holder.btnDelete.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) {
+                    listener.onDeleteClick(position);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return trashItems.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView imageView;
+        ImageView btnRestore;
+        ImageView btnDelete;
+        ViewHolder(View itemView) {
+            super(itemView);
+            imageView = itemView.findViewById(R.id.image);
+            btnRestore = itemView.findViewById(R.id.btn_restore);
+            btnDelete = itemView.findViewById(R.id.btn_delete);
+        }
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/TrashDbHelper.java b/gallery/src/main/java/cc/winboll/studio/gallery/TrashDbHelper.java
new file mode 100644
index 0000000..6d5cd11
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/TrashDbHelper.java
@@ -0,0 +1,78 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.os.Environment;
+import java.io.File;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashDbHelper extends SQLiteOpenHelper {
+    public static final String TAG = "TrashDbHelper";
+    private static final String DB_NAME = "trash.db";
+    private static final int DB_VERSION = 1;
+    private static final String TABLE_NAME = "trash_items";
+    private static final String COL_ID = "_id";
+    private static final String COL_FILE_NAME = "file_name";
+    private static final String COL_ORIGINAL_PATH = "original_path";
+    private static final String COL_ORIGINAL_FOLDER = "original_folder";
+    private static final String COL_DELETE_TIME = "delete_time";
+    
+    public TrashDbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+    }
+    
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        LogUtils.d(TAG, "onCreate");
+        db.execSQL("CREATE TABLE " + TABLE_NAME + " (" +
+            COL_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+            COL_FILE_NAME + " TEXT, " +
+            COL_ORIGINAL_PATH + " TEXT, " +
+            COL_ORIGINAL_FOLDER + " TEXT, " +
+            COL_DELETE_TIME + " INTEGER)");
+    }
+    
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        LogUtils.i(TAG, "onUpgrade: " + oldVersion + " -> " + newVersion);
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+    
+    public long insert(String fileName, String originalPath, String originalFolder) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(COL_FILE_NAME, fileName);
+        values.put(COL_ORIGINAL_PATH, originalPath);
+        values.put(COL_ORIGINAL_FOLDER, originalFolder);
+        values.put(COL_DELETE_TIME, System.currentTimeMillis());
+        return db.insert(TABLE_NAME, null, values);
+    }
+    
+    public Cursor getAll() {
+        SQLiteDatabase db = getReadableDatabase();
+        return db.query(TABLE_NAME, null, null, null, null, null, COL_DELETE_TIME + " DESC");
+    }
+    
+    public int delete(long id) {
+        SQLiteDatabase db = getWritableDatabase();
+        return db.delete(TABLE_NAME, COL_ID + "=?", new String[]{String.valueOf(id)});
+    }
+    
+    public void clear() {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(TABLE_NAME, null, null);
+    }
+    
+    public static String getTrashPath() {
+        File trashDir = new File(Environment.getExternalStorageDirectory(), ".Trash");
+        if (!trashDir.exists()) {
+            trashDir.mkdirs();
+        }
+        return trashDir.getAbsolutePath();
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/TrashManager.java b/gallery/src/main/java/cc/winboll/studio/gallery/TrashManager.java
new file mode 100644
index 0000000..92a527b
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/TrashManager.java
@@ -0,0 +1,158 @@
+package cc.winboll.studio.gallery;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.MediaStore;
+import java.io.File;
+import java.util.UUID;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class TrashManager {
+    public static final String TAG = "TrashManager";
+    private final Context context;
+    private final TrashDbHelper dbHelper;
+    
+    public TrashManager(Context context) {
+        LogUtils.d(TAG, "TrashManager created");
+        this.context = context;
+        this.dbHelper = new TrashDbHelper(context);
+    }
+    
+    public long addToTrash(String imagePath) {
+        LogUtils.d(TAG, "addToTrash: " + imagePath);
+        File sourceFile = new File(imagePath);
+        if (!sourceFile.exists()) {
+            return -1;
+        }
+        
+        String uniqueId = UUID.randomUUID().toString();
+        String extension = getExtension(imagePath);
+        String newFileName = uniqueId + extension;
+        String trashPath = TrashDbHelper.getTrashPath();
+        File destFile = new File(trashPath, newFileName);
+        
+        if (sourceFile.renameTo(destFile)) {
+            String originalFolder = sourceFile.getParent();
+            long result = dbHelper.insert(newFileName, imagePath, originalFolder);
+            LogUtils.i(TAG, "Added to trash: " + newFileName);
+            return result;
+        }
+        LogUtils.e(TAG, "Failed to move to trash");
+        return -1;
+    }
+    
+    public Cursor getTrashList() {
+        return dbHelper.getAll();
+    }
+    
+    public boolean restore(long id, String fileName, String originalPath) {
+        LogUtils.i(TAG, "restore: " + fileName + " -> " + originalPath);
+        File trashFile = new File(TrashDbHelper.getTrashPath(), fileName);
+        LogUtils.d(TAG, "trashFile exists: " + trashFile.exists() + ", path: " + trashFile.getAbsolutePath());
+        if (!trashFile.exists()) {
+            LogUtils.e(TAG, "trashFile not exists: " + trashFile.getAbsolutePath());
+            return false;
+        }
+        
+        File originalFolder = new File(originalPath).getParentFile();
+        LogUtils.d(TAG, "originalFolder: " + originalFolder + ", exists: " + (originalFolder != null && originalFolder.exists()));
+        if (originalFolder != null && !originalFolder.exists()) {
+            boolean created = originalFolder.mkdirs();
+            LogUtils.d(TAG, "mkdirs result: " + created + ", path: " + originalFolder.getAbsolutePath());
+        }
+        
+        File originalFile = new File(originalPath);
+        String restoreName = originalFile.getName();
+        File restoreFile = new File(originalFolder, restoreName);
+        LogUtils.d(TAG, "restoreFile: " + restoreFile.getAbsolutePath() + ", exists: " + restoreFile.exists());
+        
+        boolean renameResult = trashFile.renameTo(restoreFile);
+        LogUtils.d(TAG, "renameTo result: " + renameResult);
+        
+        if (renameResult) {
+            dbHelper.delete(id);
+            LogUtils.i(TAG, "Restored: " + fileName);
+            scanMedia(restoreFile.getAbsolutePath());
+            return true;
+        }
+        
+        // Try copy + delete if rename failed
+        LogUtils.i(TAG, "renameTo failed, trying copy + delete");
+        try {
+            java.io.InputStream in = new java.io.FileInputStream(trashFile);
+            java.io.OutputStream out = new java.io.FileOutputStream(restoreFile);
+            byte[] buffer = new byte[4096];
+            int len;
+            while ((len = in.read(buffer)) > 0) {
+                out.write(buffer, 0, len);
+            }
+            in.close();
+            out.close();
+            boolean deleted = trashFile.delete();
+            LogUtils.d(TAG, "copy+delete result: " + deleted);
+            if (deleted) {
+                dbHelper.delete(id);
+                LogUtils.i(TAG, "Restored (copy): " + fileName);
+                scanMedia(restoreFile.getAbsolutePath());
+                return true;
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "copy failed: " + e.getMessage());
+        }
+        
+        LogUtils.e(TAG, "Failed to restore: " + fileName);
+        return false;
+    }
+    
+    public boolean deletePermanently(long id, String fileName) {
+        File trashFile = new File(TrashDbHelper.getTrashPath(), fileName);
+        boolean deleted = trashFile.delete();
+        if (deleted) {
+            dbHelper.delete(id);
+        }
+        return deleted;
+    }
+    
+    public void clearTrash() {
+        Cursor cursor = getTrashList();
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                try {
+                    int colIndex = cursor.getColumnIndexOrThrow("_id");
+                    if (!cursor.isNull(colIndex)) {
+                        String fileName = cursor.getString(cursor.getColumnIndexOrThrow("file_name"));
+                        File trashFile = new File(TrashDbHelper.getTrashPath(), fileName);
+                        trashFile.delete();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            cursor.close();
+        }
+        dbHelper.clear();
+    }
+    
+    private String getExtension(String path) {
+        int lastDot = path.lastIndexOf('.');
+        if (lastDot > 0) {
+            return path.substring(lastDot);
+        }
+        return ".jpg";
+    }
+    
+    private void scanMedia(String filePath) {
+        LogUtils.d(TAG, "scanMedia: " + filePath);
+        MediaScannerConnection.scanFile(context, new String[]{filePath}, null, new android.media.MediaScannerConnection.OnScanCompletedListener() {
+            @Override
+            public void onScanCompleted(String path, Uri uri) {
+                LogUtils.d(TAG, "scanCompleted: " + path + " -> " + uri);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/ZoomContainerView.java b/gallery/src/main/java/cc/winboll/studio/gallery/ZoomContainerView.java
new file mode 100644
index 0000000..7fb4bdb
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/ZoomContainerView.java
@@ -0,0 +1,169 @@
+package cc.winboll.studio.gallery;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.View;
+import android.widget.FrameLayout;
+
+public class ZoomContainerView extends FrameLayout {
+    private float scaleFactor = 1.0f;
+    private float minScale = 0.1f;
+    private float maxScale = 5.0f;
+    private static final float ZOOM_STEP = 0.25f;
+    
+    private ScaleGestureDetector scaleGestureDetector;
+    private GestureDetector gestureDetector;
+    private Paint borderPaint;
+    
+    public ZoomContainerView(Context context) {
+        super(context);
+        init();
+    }
+    
+    public ZoomContainerView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+    
+    public ZoomContainerView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+    
+    private void init() {
+        setWillNotDraw(false);
+        setBackgroundColor(Color.YELLOW);
+        
+        borderPaint = new Paint();
+        borderPaint.setColor(Color.parseColor("#333333"));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(2);
+        
+        scaleGestureDetector = new ScaleGestureDetector(getContext(), new ScaleGestureDetector.SimpleOnScaleGestureListener() {
+            @Override
+            public boolean onScale(ScaleGestureDetector detector) {
+                scaleFactor *= detector.getScaleFactor();
+                scaleFactor = Math.max(minScale, Math.min(scaleFactor, maxScale));
+                invalidate();
+                requestLayout();
+                return true;
+            }
+        });
+        
+        gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onDoubleTap(MotionEvent e) {
+                if (scaleFactor > 1.5f) {
+                    scaleFactor = 1.0f;
+                } else {
+                    scaleFactor = 2.0f;
+                }
+                invalidate();
+                requestLayout();
+                return true;
+            }
+        });
+    }
+    
+    public void zoomIn() {
+        scaleFactor = Math.min(maxScale, scaleFactor + ZOOM_STEP);
+        requestMeasure();
+    }
+    
+    public void zoomOut() {
+        scaleFactor = Math.max(minScale, scaleFactor - ZOOM_STEP);
+        requestMeasure();
+    }
+    
+    private void requestMeasure() {
+        removeCallbacks(measureRunable);
+        post(measureRunable);
+    }
+    
+    private Runnable measureRunable = new Runnable() {
+        @Override
+        public void run() {
+            requestLayout();
+            invalidate();
+        }
+    };
+    
+    public float getScaleFactor() {
+        return scaleFactor;
+    }
+    
+    public void setScaleFactor(float scale) {
+        scaleFactor = Math.max(minScale, Math.min(scale, maxScale));
+        int childCount = getChildCount();
+        if (childCount > 0) {
+            View child = getChildAt(0);
+            if (child instanceof CropCanvasView) {
+                ((CropCanvasView) child).setContainerScale(scaleFactor);
+            }
+        }
+        requestLayout();
+        invalidate();
+    }
+    
+    public void resetZoom() {
+        scaleFactor = 1.0f;
+        invalidate();
+        requestLayout();
+    }
+    
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int childCount = getChildCount();
+        if (childCount > 0) {
+            View child = getChildAt(0);
+            child.measure(widthMeasureSpec, heightMeasureSpec);
+            int childW = child.getMeasuredWidth();
+            int childH = child.getMeasuredHeight();
+            int scaledW = (int) (childW * scaleFactor);
+            int scaledH = (int) (childH * scaleFactor);
+            int widthSpec = MeasureSpec.makeMeasureSpec(scaledW, MeasureSpec.EXACTLY);
+            int heightSpec = MeasureSpec.makeMeasureSpec(scaledH, MeasureSpec.EXACTLY);
+            child.measure(widthSpec, heightSpec);
+            setMeasuredDimension(scaledW, scaledH);
+        } else {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+    
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        int childCount = getChildCount();
+        if (childCount > 0) {
+            View child = getChildAt(0);
+            int childW = child.getMeasuredWidth();
+            int childH = child.getMeasuredHeight();
+            int scaledW = (int) (childW * scaleFactor);
+            int scaledH = (int) (childH * scaleFactor);
+            int parentW = right - left;
+            int parentH = bottom - top;
+            int childLeft = (parentW - scaledW) / 2;
+            int childTop = (parentH - scaledH) / 2;
+            child.layout(childLeft, childTop, childLeft + scaledW, childTop + scaledH);
+        }
+    }
+    
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+    }
+    
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        boolean handled = scaleGestureDetector.onTouchEvent(event);
+        if (!scaleGestureDetector.isInProgress()) {
+            handled = gestureDetector.onTouchEvent(event) || handled;
+        }
+        return handled || super.onTouchEvent(event);
+    }
+}
\ No newline at end of file
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/dialog/ColorPaletteDialog.java b/gallery/src/main/java/cc/winboll/studio/gallery/dialog/ColorPaletteDialog.java
new file mode 100644
index 0000000..ce5e959
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/dialog/ColorPaletteDialog.java
@@ -0,0 +1,44 @@
+package cc.winboll.studio.gallery.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.WindowManager;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import cc.winboll.studio.gallery.R;
+
+/**
+ * 颜色表对话框
+ * 继承于普通对话框类，使用视图文件
+ */
+public class ColorPaletteDialog extends Dialog {
+
+    public ColorPaletteDialog(@NonNull Context context) {
+        super(context, R.style.ColorPaletteDialog);
+    }
+
+    public ColorPaletteDialog(@NonNull Context context, int themeResId) {
+        super(context, themeResId);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // super.onCreate(savedInstanceState);
+        setContentView(R.layout.dialog_color_palette);
+        
+        TextView titleText = findViewById(R.id.title_text);
+        
+        WindowManager.LayoutParams params = getWindow().getAttributes();
+        params.width = WindowManager.LayoutParams.MATCH_PARENT;
+        getWindow().setAttributes(params);
+    }
+
+    public void setTitle(String title) {
+        
+    }
+
+    public interface OnColorItemClick {
+        void onColorClick(int color);
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/utils/BackgroundUtils.java b/gallery/src/main/java/cc/winboll/studio/gallery/utils/BackgroundUtils.java
new file mode 100644
index 0000000..f55cef8
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/utils/BackgroundUtils.java
@@ -0,0 +1,129 @@
+package cc.winboll.studio.gallery.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
+
+public class BackgroundUtils {
+
+    public enum DrawableType {
+        RESOURCE_ID,
+        COLOR
+    }
+
+    private static volatile BackgroundUtils instance;
+
+    private static final String PREF_NAME = "background_prefs";
+    private static final String KEY_TYPE = "bg_type";
+    private static final String KEY_RES_ID = "bg_res_id";
+    private static final String KEY_COLOR = "bg_color";
+
+    private Context context;
+    private Drawable drawable;
+    private DrawableType drawableType;
+    private int resId;
+    private int color;
+
+    private BackgroundUtils() {
+    }
+
+    public static BackgroundUtils getInstance() {
+        if (instance == null) {
+            synchronized (BackgroundUtils.class) {
+                if (instance == null) {
+                    instance = new BackgroundUtils();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public static BackgroundUtils initFromResource(Context context, @DrawableRes int resId) {
+        synchronized (BackgroundUtils.class) {
+            BackgroundUtils utils = getInstance();
+            utils.context = context.getApplicationContext();
+            utils.drawableType = DrawableType.RESOURCE_ID;
+            utils.resId = resId;
+            utils.drawable = ContextCompat.getDrawable(utils.context, resId);
+            utils.saveToPreferences();
+            return utils;
+        }
+    }
+
+    public static BackgroundUtils initFromColor(Context context, @ColorInt int color) {
+        synchronized (BackgroundUtils.class) {
+            BackgroundUtils utils = getInstance();
+            utils.context = context.getApplicationContext();
+            utils.drawableType = DrawableType.COLOR;
+            utils.color = color;
+            utils.drawable = new ColorDrawable(color);
+            utils.saveToPreferences();
+            return utils;
+        }
+    }
+
+    public static BackgroundUtils initFromPreferences(Context context) {
+        synchronized (BackgroundUtils.class) {
+            Context appContext = context.getApplicationContext();
+            SharedPreferences prefs = appContext.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+            int type = prefs.getInt(KEY_TYPE, -1);
+            if (type == 0) {
+                int resId = prefs.getInt(KEY_RES_ID, 0);
+                if (resId != 0) {
+                    return initFromResource(appContext, resId);
+                }
+            } else if (type == 1) {
+                int color = prefs.getInt(KEY_COLOR, Color.BLACK);
+                return initFromColor(appContext, color);
+            }
+            // 默认情况，initFromColor 内部已经调用了 saveToPreferences()
+            return initFromColor(appContext, 0xFF00FF00);
+        }
+    }
+
+    public Drawable getDrawable() {
+        return drawable;
+    }
+
+    public DrawableType getDrawableType() {
+        return drawableType;
+    }
+
+    public DrawableType getAttributeValueType() {
+        return drawableType;
+    }
+
+    public int getResId() {
+        return resId;
+    }
+
+    public int getColor() {
+        return color;
+    }
+
+    public void saveToPreferences() {
+        if (context == null) return;
+        SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefs.edit();
+        if (drawableType == DrawableType.RESOURCE_ID) {
+            editor.putInt(KEY_TYPE, 0);
+            editor.putInt(KEY_RES_ID, resId);
+            editor.remove(KEY_COLOR);
+        } else {
+            editor.putInt(KEY_TYPE, 1);
+            editor.putInt(KEY_COLOR, color);
+            editor.remove(KEY_RES_ID);
+        }
+        editor.apply();
+    }
+
+    public static void clearPreferences(Context context) {
+        SharedPreferences prefs = context.getApplicationContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        prefs.edit().clear().apply();
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/utils/CropBackgroundUtils.java b/gallery/src/main/java/cc/winboll/studio/gallery/utils/CropBackgroundUtils.java
new file mode 100644
index 0000000..fb399f9
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/utils/CropBackgroundUtils.java
@@ -0,0 +1,124 @@
+package cc.winboll.studio.gallery.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
+
+public class CropBackgroundUtils {
+
+    public enum DrawableType {
+        RESOURCE_ID,
+        COLOR
+    }
+
+    private static volatile CropBackgroundUtils instance;
+
+    private static final String PREF_NAME = "crop_background_prefs";
+    private static final String KEY_TYPE = "crop_bg_type";
+    private static final String KEY_RES_ID = "crop_bg_res_id";
+    private static final String KEY_COLOR = "crop_bg_color";
+
+    private Context context;
+    private Drawable drawable;
+    private DrawableType drawableType;
+    private int resId;
+    private int color;
+
+    private CropBackgroundUtils() {
+    }
+
+    public static CropBackgroundUtils getInstance() {
+        if (instance == null) {
+            synchronized (CropBackgroundUtils.class) {
+                if (instance == null) {
+                    instance = new CropBackgroundUtils();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public static CropBackgroundUtils initFromResource(Context context, @DrawableRes int resId) {
+        synchronized (CropBackgroundUtils.class) {
+            CropBackgroundUtils utils = getInstance();
+            utils.context = context.getApplicationContext();
+            utils.drawableType = DrawableType.RESOURCE_ID;
+            utils.resId = resId;
+            utils.drawable = ContextCompat.getDrawable(utils.context, resId);
+            utils.saveToPreferences();
+            return utils;
+        }
+    }
+
+    public static CropBackgroundUtils initFromColor(Context context, @ColorInt int color) {
+        synchronized (CropBackgroundUtils.class) {
+            CropBackgroundUtils utils = getInstance();
+            utils.context = context.getApplicationContext();
+            utils.drawableType = DrawableType.COLOR;
+            utils.color = color;
+            utils.drawable = new ColorDrawable(color);
+            utils.saveToPreferences();
+            return utils;
+        }
+    }
+
+    public static CropBackgroundUtils initFromPreferences(Context context) {
+        synchronized (CropBackgroundUtils.class) {
+            Context appContext = context.getApplicationContext();
+            SharedPreferences prefs = appContext.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+            int type = prefs.getInt(KEY_TYPE, -1);
+            if (type == 0) {
+                int resId = prefs.getInt(KEY_RES_ID, 0);
+                if (resId != 0) {
+                    return initFromResource(appContext, resId);
+                }
+            } else if (type == 1) {
+                int color = prefs.getInt(KEY_COLOR, Color.BLACK);
+                return initFromColor(appContext, color);
+            }
+            return initFromColor(appContext, 0xFF00FF00);
+        }
+    }
+
+    public Drawable getDrawable() {
+        return drawable;
+    }
+
+    public DrawableType getDrawableType() {
+        return drawableType;
+    }
+
+    public int getResId() {
+        return resId;
+    }
+
+    public int getColor() {
+        return color;
+    }
+
+    public void saveToPreferences() {
+        if (context == null) return;
+        SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefs.edit();
+        if (drawableType == DrawableType.RESOURCE_ID) {
+            editor.putInt(KEY_TYPE, 0);
+            editor.putInt(KEY_RES_ID, resId);
+            editor.remove(KEY_COLOR);
+        } else {
+            editor.putInt(KEY_TYPE, 1);
+            editor.putInt(KEY_COLOR, color);
+            editor.remove(KEY_RES_ID);
+        }
+        editor.apply();
+    }
+
+    public static void clearPreferences(Context context) {
+        SharedPreferences prefs = context.getApplicationContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        prefs.edit().clear().apply();
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/views/BackgroundRadioButton.java b/gallery/src/main/java/cc/winboll/studio/gallery/views/BackgroundRadioButton.java
new file mode 100644
index 0000000..8809e00
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/views/BackgroundRadioButton.java
@@ -0,0 +1,34 @@
+package cc.winboll.studio.gallery.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RadioButton;
+
+public class BackgroundRadioButton extends RadioButton {
+
+    CustomApplicationBackground mCustomApplicationBackground;
+
+    public BackgroundRadioButton(Context context) {
+        super(context);
+    }
+
+    public BackgroundRadioButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public BackgroundRadioButton(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void setupCustomApplicationBackground(Context context, int resId) {
+        mCustomApplicationBackground = new CustomApplicationBackground(context, resId);
+    }
+
+    public void setCustomApplicationBackground(CustomApplicationBackground customApplicationBackground) {
+        mCustomApplicationBackground = customApplicationBackground;
+    }
+
+    public CustomApplicationBackground getCustomApplicationBackground() {
+        return mCustomApplicationBackground;
+    }
+}
diff --git a/gallery/src/main/java/cc/winboll/studio/gallery/views/CustomApplicationBackground.java b/gallery/src/main/java/cc/winboll/studio/gallery/views/CustomApplicationBackground.java
new file mode 100644
index 0000000..729521f
--- /dev/null
+++ b/gallery/src/main/java/cc/winboll/studio/gallery/views/CustomApplicationBackground.java
@@ -0,0 +1,29 @@
+package cc.winboll.studio.gallery.views;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+
+public class CustomApplicationBackground {
+    Drawable mDrawable;
+
+    public CustomApplicationBackground(Drawable drawable) {
+        mDrawable = drawable;
+    }
+
+    public CustomApplicationBackground(int color) {
+        mDrawable = new ColorDrawable(color);
+    }
+
+    public CustomApplicationBackground(Context context, int resId) {
+        mDrawable = context.getDrawable(resId);
+    }
+
+    public Drawable getDrawable() {
+        return mDrawable;
+    }
+
+    public void setDrawable(Drawable drawable) {
+        mDrawable = drawable;
+    }
+}
diff --git a/gallery/src/main/res/drawable-v24/ic_launcher_foreground.xml b/gallery/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..c7bd21d
--- /dev/null
+++ b/gallery/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
diff --git a/gallery/src/main/res/drawable/bg_black.xml b/gallery/src/main/res/drawable/bg_black.xml
new file mode 100644
index 0000000..e0fb6f9
--- /dev/null
+++ b/gallery/src/main/res/drawable/bg_black.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#000000"/>
+</shape>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/bg_checkerboard.xml b/gallery/src/main/res/drawable/bg_checkerboard.xml
new file mode 100644
index 0000000..f89e1af
--- /dev/null
+++ b/gallery/src/main/res/drawable/bg_checkerboard.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+    <path
+        android:fillColor="#808080"
+        android:pathData="M0,0h1v1h-1z M2,0h1v1h-1z M4,0h1v1h-1z M6,0h1v1h-1z M8,0h1v1h-1z
+                             M1,1h1v1h-1z M3,1h1v1h-1z M5,1h1v1h-1z M7,1h1v1h-1z M9,1h1v1h-1z
+                             M0,2h1v1h-1z M2,2h1v1h-1z M4,2h1v1h-1z M6,2h1v1h-1z M8,2h1v1h-1z
+                             M1,3h1v1h-1z M3,3h1v1h-1z M5,3h1v1h-1z M7,3h1v1h-1z M9,3h1v1h-1z
+                             M0,4h1v1h-1z M2,4h1v1h-1z M4,4h1v1h-1z M6,4h1v1h-1z M8,4h1v1h-1z
+                             M1,5h1v1h-1z M3,5h1v1h-1z M5,5h1v1h-1z M7,5h1v1h-1z M9,5h1v1h-1z
+                             M0,6h1v1h-1z M2,6h1v1h-1z M4,6h1v1h-1z M6,6h1v1h-1z M8,6h1v1h-1z
+                             M1,7h1v1h-1z M3,7h1v1h-1z M5,7h1v1h-1z M7,7h1v1h-1z M9,7h1v1h-1z
+                             M0,8h1v1h-1z M2,8h1v1h-1z M4,8h1v1h-1z M6,8h1v1h-1z M8,8h1v1h-1z
+                             M1,9h1v1h-1z M3,9h1v1h-1z M5,9h1v1h-1z M7,9h1v1h-1z M9,9h1v1h-1z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M1,0h1v1h-1z M3,0h1v1h-1z M5,0h1v1h-1z M7,0h1v1h-1z M9,0h1v1h-1z
+                             M0,1h1v1h-1z M2,1h1v1h-1z M4,1h1v1h-1z M6,1h1v1h-1z M8,1h1v1h-1z
+                             M1,2h1v1h-1z M3,2h1v1h-1z M5,2h1v1h-1z M7,2h1v1h-1z M9,2h1v1h-1z
+                             M0,3h1v1h-1z M2,3h1v1h-1z M4,3h1v1h-1z M6,3h1v1h-1z M8,3h1v1h-1z
+                             M1,4h1v1h-1z M3,4h1v1h-1z M5,4h1v1h-1z M7,4h1v1h-1z M9,4h1v1h-1z
+                             M0,5h1v1h-1z M2,5h1v1h-1z M4,5h1v1h-1z M6,5h1v1h-1z M8,5h1v1h-1z
+                             M1,6h1v1h-1z M3,6h1v1h-1z M5,6h1v1h-1z M7,6h1v1h-1z M9,6h1v1h-1z
+                             M0,7h1v1h-1z M2,7h1v1h-1z M4,7h1v1h-1z M6,7h1v1h-1z M8,7h1v1h-1z
+                             M1,8h1v1h-1z M3,8h1v1h-1z M5,8h1v1h-1z M7,8h1v1h-1z M9,8h1v1h-1z
+                             M0,9h1v1h-1z M2,9h1v1h-1z M4,9h1v1h-1z M6,9h1v1h-1z M8,9h1v1h-1z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/bg_circle_white.xml b/gallery/src/main/res/drawable/bg_circle_white.xml
new file mode 100644
index 0000000..fb0d808
--- /dev/null
+++ b/gallery/src/main/res/drawable/bg_circle_white.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#CCFFFFFF"/>
+    <stroke
+        android:width="1dp"
+        android:color="#000000"/>
+</shape>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/bg_color_circle.xml b/gallery/src/main/res/drawable/bg_color_circle.xml
new file mode 100644
index 0000000..847f7a9
--- /dev/null
+++ b/gallery/src/main/res/drawable/bg_color_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/transparent"/>
+    <stroke android:width="2dp" android:color="@android:color/white"/>
+    <size android:width="32dp" android:height="32dp"/>
+</shape>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/bg_color_circle_border.xml b/gallery/src/main/res/drawable/bg_color_circle_border.xml
new file mode 100644
index 0000000..cc52daa
--- /dev/null
+++ b/gallery/src/main/res/drawable/bg_color_circle_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <stroke android:width="2dp" android:color="@android:color/white"/>
+    <size android:width="36dp" android:height="36dp"/>
+</shape>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/bg_dialog.xml b/gallery/src/main/res/drawable/bg_dialog.xml
new file mode 100644
index 0000000..5477c09
--- /dev/null
+++ b/gallery/src/main/res/drawable/bg_dialog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/black"/>
+    <stroke android:width="2dp" android:color="@android:color/white"/>
+</shape>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/bg_white.xml b/gallery/src/main/res/drawable/bg_white.xml
new file mode 100644
index 0000000..0c561be
--- /dev/null
+++ b/gallery/src/main/res/drawable/bg_white.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF"/>
+</shape>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_arrow_up.xml b/gallery/src/main/res/drawable/ic_arrow_up.xml
new file mode 100644
index 0000000..aa5b4d5
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_arrow_up.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_back.xml b/gallery/src/main/res/drawable/ic_back.xml
new file mode 100644
index 0000000..0cdf891
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_bg.xml b/gallery/src/main/res/drawable/ic_bg.xml
new file mode 100644
index 0000000..0580837
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_bg.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M4,4h7v7h-7z M13,4h7v7h-7z M4,13h7v7h-7z M13,13h7v7h-7z"/>
+    <path
+        android:fillColor="#808080"
+        android:pathData="M11,4h2v7h-2z M4,11h7v2h-7z M13,11h7v2h-7z M11,13h2v7h-2z M13,4h2v7h-2z M4,13h7v2h-7z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_close.xml b/gallery/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000..2789d9c
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_color_pick.xml b/gallery/src/main/res/drawable/ic_color_pick.xml
new file mode 100644
index 0000000..538fb37
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_color_pick.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3,16.25V21h4.75l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,-0.4 0.4,-1.03 0.01,-1.42zM6.92,19H5v-1.92l8.06,-8.06 1.92,1.92L6.92,19z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_cover.xml b/gallery/src/main/res/drawable/ic_cover.xml
new file mode 100644
index 0000000..05f5d75
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_cover.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M21,3H3C1.9,3 1,3.9 1,5v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V5C23,3.9 22.1,3 21,3zM21,19H3V5h18V19z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,12l2,2l4,-4l1.5,1.5L11,17l-3,-3z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_delete.xml b/gallery/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..aa0f7a0
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,-1H5v2h14V4z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_done.xml b/gallery/src/main/res/drawable/ic_done.xml
new file mode 100644
index 0000000..a7672f7
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_done.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_info.xml b/gallery/src/main/res/drawable/ic_info.xml
new file mode 100644
index 0000000..b49a72b
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_launcher_background.xml b/gallery/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..d5fccc5
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
diff --git a/gallery/src/main/res/drawable/ic_mi_gallery.xml b/gallery/src/main/res/drawable/ic_mi_gallery.xml
new file mode 100644
index 0000000..17bc4bd
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_mi_gallery.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8s-3.59,8 -8,8z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5s-2.24,-5 -5,-5zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3s-1.34,3 -3,3z"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M8,12l1.5,-2l2,2.5l2.5,-3l2,2.5"/>
+</vector>
diff --git a/gallery/src/main/res/drawable/ic_pin.xml b/gallery/src/main/res/drawable/ic_pin.xml
new file mode 100644
index 0000000..9963da0
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_pin.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16,12V4H17V2H7V4H8V12L6,14V16H11.5V22H12.5V16H18V14L16,12Z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_restore.xml b/gallery/src/main/res/drawable/ic_restore.xml
new file mode 100644
index 0000000..f607ca2
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_restore.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,17.9 10.51,19 13,19c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_share.xml b/gallery/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000..ff756ae
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92 -1.31,-2.92 -2.92,-2.92z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_sort.xml b/gallery/src/main/res/drawable/ic_sort.xml
new file mode 100644
index 0000000..7d37ecc
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_sort.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3,18h6v-2H3v2zM3,6v2h18V6H3zM3,13h12v-2H3v2z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_view_gallery_outline.xml b/gallery/src/main/res/drawable/ic_view_gallery_outline.xml
new file mode 100644
index 0000000..c4861fb
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_view_gallery_outline.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M1,3V21H23V3H1M21,5V14H3V5H21M11,16V19H8V16H11M3,16H6V19H3V16M13,19V16H16V19H13M18,19V16H21V19H18Z"/>
+
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_zoom_in.xml b/gallery/src/main/res/drawable/ic_zoom_in.xml
new file mode 100644
index 0000000..45a16f6
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_zoom_in.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/drawable/ic_zoom_out.xml b/gallery/src/main/res/drawable/ic_zoom_out.xml
new file mode 100644
index 0000000..6fdbb4a
--- /dev/null
+++ b/gallery/src/main/res/drawable/ic_zoom_out.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,13H5v-2h14v2z"/>
+</vector>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/activity_about.xml b/gallery/src/main/res/layout/activity_about.xml
new file mode 100644
index 0000000..790b67d
--- /dev/null
+++ b/gallery/src/main/res/layout/activity_about.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <cc.winboll.studio.libappbase.views.AboutView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/aboutview"/>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/activity_crop.xml b/gallery/src/main/res/layout/activity_crop.xml
new file mode 100644
index 0000000..39e528e
--- /dev/null
+++ b/gallery/src/main/res/layout/activity_crop.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:background="@color/colorPrimary"
+        android:paddingHorizontal="16dp">
+
+        <ImageView
+            android:id="@+id/btn_close"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:padding="5dp"
+            android:src="@drawable/ic_close"
+            android:background="?attr/selectableItemBackgroundBorderless"/>
+
+        <TextView
+            android:id="@+id/textview_window_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="封面剪裁"
+            android:textColor="@android:color/white"
+            android:textSize="18sp"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:layout_marginEnd="8dp"/>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <ImageView
+            android:id="@+id/btn_info"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:padding="5dp"
+            android:src="@drawable/ic_info"
+            android:background="?attr/selectableItemBackgroundBorderless"/>
+
+        <ImageView
+            android:id="@+id/btn_change_bg"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:padding="5dp"
+            android:src="@drawable/ic_color_pick"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="修改剪裁背景颜色"/>
+
+        <ImageView
+            android:id="@+id/btn_done"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:padding="5dp"
+            android:src="@drawable/ic_done"
+            android:background="?attr/selectableItemBackgroundBorderless"/>
+
+    </LinearLayout>
+
+    <ScrollView
+        android:id="@+id/scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="56dp"
+        android:layout_marginBottom="56dp"
+        android:fillViewport="true">
+
+        <cc.winboll.studio.gallery.ZoomContainerView
+            android:id="@+id/zoom_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center">
+
+            <cc.winboll.studio.gallery.CropCanvasView
+                android:id="@+id/crop_canvas_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"/>
+
+        </cc.winboll.studio.gallery.ZoomContainerView>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_gravity="bottom"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:background="@color/colorPrimary"
+        android:paddingHorizontal="16dp"
+        android:layout_marginBottom="0dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="缩小"
+            android:textColor="@android:color/white"
+            android:textSize="12sp"/>
+
+        <SeekBar
+            android:id="@+id/seekbar_zoom"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:min="0"
+            android:max="100"
+            android:progress="50"
+            android:layout_marginHorizontal="8dp"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="放大"
+            android:textColor="@android:color/white"
+            android:textSize="12sp"/>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/activity_image_viewer.xml b/gallery/src/main/res/layout/activity_image_viewer.xml
new file mode 100644
index 0000000..daaf21e
--- /dev/null
+++ b/gallery/src/main/res/layout/activity_image_viewer.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:clickable="true"
+    android:focusable="true">
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="false"/>
+
+    <LinearLayout
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top"
+        android:background="#CC000000"
+        android:orientation="horizontal"
+        android:padding="4dp">
+
+        <ImageButton
+            android:id="@+id/btn_back"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_back"
+            android:contentDescription="Back"/>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+        <ImageButton
+            android:id="@+id/btn_gallery"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_view_gallery_outline"
+            android:contentDescription="Gallery"/>
+
+        <ImageButton
+            android:id="@+id/btn_share"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_share"
+            android:contentDescription="Share"/>
+
+        <ImageButton
+            android:id="@+id/btn_info"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_info"
+            android:contentDescription="Info"/>
+
+        <ImageButton
+            android:id="@+id/btn_delete"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:src="@drawable/ic_delete"
+            android:contentDescription="Delete"/>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/activity_main.xml b/gallery/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..3a1bd64
--- /dev/null
+++ b/gallery/src/main/res/layout/activity_main.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/transparent"/>
+
+    </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_scroll_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_arrow_up"
+        android:visibility="gone"
+        app:backgroundTint="@color/colorAccent"
+        app:tint="@color/white"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/activity_settings.xml b/gallery/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..24d2676
--- /dev/null
+++ b/gallery/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/folder_path"
+        android:textSize="16sp"
+        android:textStyle="bold"/>
+
+    <EditText
+        android:id="@+id/edit_folder_path"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:hint="@string/enter_folder_path"
+        android:inputType="text"/>
+
+    <TextView
+        android:id="@+id/text_current_path"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textSize="12sp"
+        android:textColor="#888888"/>
+
+    <Button
+        android:id="@+id/btn_save"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/save"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/dialog_color_palette.xml b/gallery/src/main/res/layout/dialog_color_palette.xml
new file mode 100644
index 0000000..14ec990
--- /dev/null
+++ b/gallery/src/main/res/layout/dialog_color_palette.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_dialog"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/title_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textColor="@android:color/white"
+        android:textStyle="bold"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/dialog_crop_info.xml b/gallery/src/main/res/layout/dialog_crop_info.xml
new file mode 100644
index 0000000..16b547d
--- /dev/null
+++ b/gallery/src/main/res/layout/dialog_crop_info.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="16dp"
+	android:background="@drawable/bg_dialog"
+	android:gravity="center_horizontal">
+
+	<TextView
+		android:id="@+id/info_text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:textSize="14sp"
+		android:fontFamily="monospace"
+		android:textColor="@android:color/white"/>
+
+	<LinearLayout
+		android:id="@+id/preview_image_container"
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="2dp"
+		android:background="#FFBBD505">
+
+		<ImageView
+			android:id="@+id/preview_image"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:scaleType="fitCenter"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+
diff --git a/gallery/src/main/res/layout/item_album.xml b/gallery/src/main/res/layout/item_album.xml
new file mode 100644
index 0000000..4947a7e
--- /dev/null
+++ b/gallery/src/main/res/layout/item_album.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="2dp">
+
+    <ImageView
+        android:id="@+id/album_cover"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:layout_margin="2dp"
+        android:scaleType="centerCrop"/>
+
+    <TextView
+        android:id="@+id/album_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="#80000000"
+        android:padding="4dp"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+
+    <ImageView
+        android:id="@+id/pin_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="6dp"
+        android:background="@android:color/transparent"
+        android:padding="3dp"
+        android:src="@drawable/ic_pin"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/image_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|end"
+        android:background="#80000000"
+        android:padding="4dp"
+        android:textColor="@color/white"
+        android:textSize="10sp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/item_color_icon.xml b/gallery/src/main/res/layout/item_color_icon.xml
new file mode 100644
index 0000000..1595181
--- /dev/null
+++ b/gallery/src/main/res/layout/item_color_icon.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="40dp"
+    android:layout_height="40dp">
+
+    <View
+        android:id="@+id/color_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_color_circle"/>
+
+    <View
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_color_circle_border"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/item_gallery.xml b/gallery/src/main/res/layout/item_gallery.xml
new file mode 100644
index 0000000..2449ff1
--- /dev/null
+++ b/gallery/src/main/res/layout/item_gallery.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="2dp">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:scaleType="centerCrop"
+        android:background="@color/black"/>
+
+<ImageView
+        android:id="@+id/pin_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="4dp"
+        android:background="@drawable/bg_circle_white"
+        android:padding="4dp"
+        android:src="@drawable/ic_pin"
+        android:visibility="gone"
+        app:tint="@color/black"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
+
+    <ImageView
+        android:id="@+id/cover_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="4dp"
+        android:background="@drawable/bg_circle_white"
+        android:padding="4dp"
+        android:src="@drawable/ic_cover"
+        android:visibility="gone"
+        app:tint="@color/black"
+        xmlns:app="http://schemas.android.com/apk/res-auto"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/item_image_pager.xml b/gallery/src/main/res/layout/item_image_pager.xml
new file mode 100644
index 0000000..6ca5615
--- /dev/null
+++ b/gallery/src/main/res/layout/item_image_pager.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/layout/item_trash.xml b/gallery/src/main/res/layout/item_trash.xml
new file mode 100644
index 0000000..1a5a89a
--- /dev/null
+++ b/gallery/src/main/res/layout/item_trash.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="2dp">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:scaleType="centerCrop"
+        android:background="@color/black"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="#80000000"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/btn_restore"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_weight="1"
+            android:padding="8dp"
+            android:src="@drawable/ic_restore"
+            android:contentDescription="Restore"/>
+
+        <ImageView
+            android:id="@+id/btn_delete"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_weight="1"
+            android:padding="8dp"
+            android:src="@drawable/ic_delete"
+            android:contentDescription="Delete"/>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gallery/src/main/res/menu/menu_album.xml b/gallery/src/main/res/menu/menu_album.xml
new file mode 100644
index 0000000..9fbf668
--- /dev/null
+++ b/gallery/src/main/res/menu/menu_album.xml
@@ -0,0 +1,26 @@
+<?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/action_sort"
+        android:icon="@drawable/ic_sort"
+        android:title="排序"
+        app:showAsAction="ifRoom">
+        <menu>
+            <group android:checkableBehavior="single">
+                <item
+                    android:id="@+id/sort_time_desc"
+                    android:title="时间倒序"/>
+                <item
+                    android:id="@+id/sort_time_asc"
+                    android:title="时间正序"/>
+                <item
+                    android:id="@+id/sort_name_desc"
+                    android:title="名称倒序"/>
+                <item
+                    android:id="@+id/sort_name_asc"
+                    android:title="名称正序"/>
+            </group>
+        </menu>
+    </item>
+</menu>
\ No newline at end of file
diff --git a/gallery/src/main/res/menu/menu_crop.xml b/gallery/src/main/res/menu/menu_crop.xml
new file mode 100644
index 0000000..674a000
--- /dev/null
+++ b/gallery/src/main/res/menu/menu_crop.xml
@@ -0,0 +1,8 @@
+<?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/action_done"
+        android:title="完成"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/gallery/src/main/res/menu/menu_main.xml b/gallery/src/main/res/menu/menu_main.xml
new file mode 100644
index 0000000..3c96f85
--- /dev/null
+++ b/gallery/src/main/res/menu/menu_main.xml
@@ -0,0 +1,36 @@
+<?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/action_mi_gallery"
+        android:title="@string/mi_gallery"
+        android:icon="@drawable/ic_mi_gallery"
+        app:showAsAction="ifRoom"/>
+    
+    <item
+        android:id="@+id/action_change_bg_color"
+        android:title="修改背景颜色"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_trash"
+        android:title="@string/trash"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_settings"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_about"
+        android:title="@string/about"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_debug"
+        android:title="@string/debug_log"
+        app:showAsAction="never"/>
+    
+</menu>
\ No newline at end of file
diff --git a/gallery/src/main/res/menu/menu_trash.xml b/gallery/src/main/res/menu/menu_trash.xml
new file mode 100644
index 0000000..39a2ad3
--- /dev/null
+++ b/gallery/src/main/res/menu/menu_trash.xml
@@ -0,0 +1,15 @@
+<?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/action_trash"
+        android:title="@string/trash"
+        app:showAsAction="never"/>
+    
+    <item
+        android:id="@+id/action_clear_trash"
+        android:title="@string/clear_trash"
+        app:showAsAction="never"/>
+    
+</menu>
\ No newline at end of file
diff --git a/gallery/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/gallery/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/gallery/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/gallery/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/gallery/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/gallery/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/gallery/src/main/res/mipmap-hdpi/ic_launcher.png b/gallery/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..a2f5908
Binary files /dev/null and b/gallery/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/gallery/src/main/res/mipmap-hdpi/ic_launcher_round.png b/gallery/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1b52399
Binary files /dev/null and b/gallery/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/gallery/src/main/res/mipmap-mdpi/ic_launcher.png b/gallery/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..ff10afd
Binary files /dev/null and b/gallery/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/gallery/src/main/res/mipmap-mdpi/ic_launcher_round.png b/gallery/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..115a4c7
Binary files /dev/null and b/gallery/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/gallery/src/main/res/mipmap-xhdpi/ic_launcher.png b/gallery/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..dcd3cd8
Binary files /dev/null and b/gallery/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/gallery/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/gallery/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..459ca60
Binary files /dev/null and b/gallery/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png b/gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..8ca12fe
Binary files /dev/null and b/gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/gallery/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/gallery/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8e19b41
Binary files /dev/null and b/gallery/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..b824ebd
Binary files /dev/null and b/gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/gallery/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/gallery/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4c19a13
Binary files /dev/null and b/gallery/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/gallery/src/main/res/values/colors.xml b/gallery/src/main/res/values/colors.xml
new file mode 100644
index 0000000..f91a689
--- /dev/null
+++ b/gallery/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#009688</color>
+    <color name="colorPrimaryDark">#00796B</color>
+    <color name="colorAccent">#FF9800</color>
+    <color name="black">#000000</color>
+    <color name="white">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/gallery/src/main/res/values/strings.xml b/gallery/src/main/res/values/strings.xml
new file mode 100644
index 0000000..9b7cc5e
--- /dev/null
+++ b/gallery/src/main/res/values/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Gallery</string>
+    <string name="app_description">WinBoLL Album App</string>
+    <string name="refresh">Refresh</string>
+    <string name="settings">Settings</string>
+    <string name="settings_title">Settings</string>
+    <string name="about">About</string>
+    <string name="folder_path">Folder Path</string>
+    <string name="enter_folder_path">Enter folder path</string>
+    <string name="save">Save</string>
+    <string name="cancel">Cancel</string>
+    <string name="no_images_found">No images found</string>
+    <string name="trash">Trash</string>
+    <string name="clear_trash">Clear Trash</string>
+    <string name="delete_confirm">Delete to trash?</string>
+    <string name="restore_confirm">Restore to original folder?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="debug_log">Debug Log</string>
+    <string name="debug_message">Debug log message</string>
+    <string name="system_gallery">系统相册</string>
+    <string name="mi_gallery">小米相册</string>
+    <string name="reset_gallery">重置</string>
+</resources>
diff --git a/gallery/src/main/res/values/styles.xml b/gallery/src/main/res/values/styles.xml
new file mode 100644
index 0000000..0049172
--- /dev/null
+++ b/gallery/src/main/res/values/styles.xml
@@ -0,0 +1,16 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="ColorPaletteDialog" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsFloating">false</item>
+    </style>
+
+</resources>
diff --git a/gallery/src/stage/AndroidManifest.xml b/gallery/src/stage/AndroidManifest.xml
new file mode 100644
index 0000000..ee78d9f
--- /dev/null
+++ b/gallery/src/stage/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
+
+    <application>
+
+        <!-- Put flavor specific code here -->
+
+    </application>
+
+</manifest>
+
diff --git a/gallery/src/stage/res/values/strings.xml b/gallery/src/stage/res/values/strings.xml
new file mode 100644
index 0000000..ace0c41
--- /dev/null
+++ b/gallery/src/stage/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Put flavor specific strings here -->
+
+</resources>
diff --git a/libaes/build.gradle b/libaes/build.gradle
index 127f22e..d6c3ad4 100644
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -9,7 +9,7 @@ android {
     buildToolsVersion "30.0.3"
 	
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
     }
 	
@@ -27,8 +27,6 @@ android {
 }
 
 dependencies {
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    api 'com.github.getActivity:XXPermissions:18.63'
     // 下拉控件
     api 'com.baoyz.pullrefreshlayout:library:1.2.0'
     // 拼音搜索
@@ -63,7 +61,7 @@ dependencies {
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
 	// WinBoLL库 nexus.winboll.cc 地址
-    api 'cc.winboll.studio:libappbase:15.15.19'
+    api 'cc.winboll.studio:libappbase:15.20.9'
 	// 备用库 jitpack.io 地址
 	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'
 	
diff --git a/libaes/build.properties b/libaes/build.properties
index 04d6f46..8f4366b 100644
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Apr 25 04:16:30 HKT 2026
-stageCount=10
+#Tue May 12 13:11:09 HKT 2026
+stageCount=4
 libraryProject=libaes
-baseVersion=15.15
-publishVersion=15.15.9
+baseVersion=15.20
+publishVersion=15.20.3
 buildCount=0
-baseBetaVersion=15.15.10
+baseBetaVersion=15.20.4
diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java
index 6fa37b6..d014654 100644
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestASupportToolbarActivity.java
@@ -12,6 +12,8 @@ import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.views.ASupportToolbar;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class TestASupportToolbarActivity extends AppCompatActivity implements IWinBoLLActivity  {
 
@@ -29,14 +31,17 @@ public class TestASupportToolbarActivity extends AppCompatActivity implements IW
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreate() start");
         AESThemeUtil.applyAppTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_testasupporttoolbar);
+        LogUtils.d(TAG, "setContentView() done");
         Toolbar toolbar = findViewById(R.id.activitytestasupporttoolbarASupportToolbar1);
+        LogUtils.d(TAG, "findViewById() done, toolbar=" + toolbar.getClass().getSimpleName());
         setSupportActionBar(toolbar);
+        LogUtils.d(TAG, "setSupportActionBar() done");
         getSupportActionBar().setTitle(TAG);
-
+        LogUtils.d(TAG, "setTitle() done");
+        LogUtils.d(TAG, "onCreate() end");
     }
-
-    
 }
diff --git a/libaes/src/main/res/values-night/colors.xml b/libaes/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..3935b96
--- /dev/null
+++ b/libaes/src/main/res/values-night/colors.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="colorTextColor">#FFFFFFFF</color>
+    <color name="colorPrimary">#FF03AB4E</color>
+    <color name="colorPrimaryDark">#FF027C39</color>
+    <color name="colorAccent">#FF3DDC84</color>
+    <color name="colorText">#FFFFFB8D</color>
+    <color name="colorToastFrame">#FFA9A9A9</color>
+    <color name="colorToastShadow">#FF000000</color>
+    <color name="colorToastBackgroung">#FFFFFFFF</color>
+    <color name="colorAToolbarStartColor">#FF7D3F12</color>
+    <color name="colorAToolbarCenterColor">#FFCC6E2B</color>
+    <color name="colorAToolbarEndColor">#FFF4B98F</color>
+
+    <color name="colorACardShadow">@color/colorPrimaryDark</color>
+    <color name="colorACardFrame">@color/colorPrimary</color>
+    <color name="colorACardBackgroung">@color/colorAccent</color>
+
+    <color name="colorATickProgressBarBackgroung">@color/colorAccent</color>
+    <color name="colorATickProgressBarProgress">@color/colorPrimary</color>
+
+    <color name="colorOHPCTSBackground">@color/colorAccent</color>
+    <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
+    <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
+
+    <color name="toolbarBackgroundColor">#FF03AB4E</color>
+    <color name="toolbarTextColor">#FFFFFFFF</color>
+    <color name="mainWindowBackgroundColor">#FF2C2C2C</color>
+    <color name="mainWindowTextColor">#FFFFFFFF</color>
+    <color name="debugTextColor">#FFFF0000</color>
+
+</resources>
\ No newline at end of file
diff --git a/libaes/src/main/res/values-night/styles.xml b/libaes/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..020baff
--- /dev/null
+++ b/libaes/src/main/res/values-night/styles.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AESTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="themeDebug">@style/DebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">@color/mainWindowTextColor</item>
+        <item name="dialogBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">@color/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">@color/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">@color/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+
+        <item name="aToolbar">@style/AESAToolbar</item>
+        <item name="aSupportToolbar">@style/AESASupportToolbar</item>
+    </style>
+
+    <style name="DebugActivityTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+
+    <style name="AESAToolbar">
+        <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarEndColor">@color/colorAccent</item>
+    </style>
+
+    <style name="AESASupportToolbar">
+        <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
+    </style>
+
+    <style name="DepthAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FF0065EC</item>
+        <item name="colorPrimaryDark">#FF004DB4</item>
+        <item name="colorAccent">#FF4A97FF</item>
+    </style>
+
+    <style name="SkyAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FF00A6FF</item>
+        <item name="colorPrimaryDark">#FF007ABB</item>
+        <item name="colorAccent">#FF84D4FF</item>
+    </style>
+
+    <style name="GoldenAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FFF0CA11</item>
+        <item name="colorPrimaryDark">#FFD3AF00</item>
+        <item name="colorAccent">#FFFFE35C</item>
+    </style>
+
+    <style name="BearingAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FF840FFF</item>
+        <item name="colorPrimaryDark">#FF6900D7</item>
+        <item name="colorAccent">#FFBA78FF</item>
+    </style>
+
+    <style name="MemorAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FFFF00F5</item>
+        <item name="colorPrimaryDark">#FFE500DC</item>
+        <item name="colorAccent">#FFFF76FA</item>
+    </style>
+
+    <style name="TaoAESTheme" parent="AESTheme">
+        <item name="colorPrimary">#FFACACAC</item>
+        <item name="colorPrimaryDark">#FF898989</item>
+        <item name="colorAccent">#FFD8D8D8</item>
+    </style>
+
+    <style name="NormalDialogStyle" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@style/cornerDialogAnim</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
+    <style name="centerDialogAnim" parent="android:Animation">
+        <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_center</item>
+        <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_center</item>
+    </style>
+
+    <style name="cornerDialogAnim" parent="android:Animation">
+        <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_corner</item>
+        <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/libaes/src/main/res/values/attrs.xml b/libaes/src/main/res/values/attrs.xml
index e423414..b83c54a 100644
--- a/libaes/src/main/res/values/attrs.xml
+++ b/libaes/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
         <attr name="attrASupportToolbarStartColor"/>
         <attr name="attrASupportToolbarCenterColor"/>
         <attr name="attrASupportToolbarEndColor"/>
+        <attr name="android:background"/>
     </declare-styleable>
     
     <declare-styleable name="AButton">
diff --git a/libaes/src/main/res/values/colors.xml b/libaes/src/main/res/values/colors.xml
index 58d507b..5c0a9cc 100644
--- a/libaes/src/main/res/values/colors.xml
+++ b/libaes/src/main/res/values/colors.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
-    <!-- 默认方案 -->
+
+    <color name="colorTextColor">#FF000000</color>
     <color name="colorPrimary">#FF03AB4E</color>
     <color name="colorPrimaryDark">#FF027C39</color>
     <color name="colorAccent">#FF3DDC84</color>
-	<color name="colorText">#FFFFFB8D</color>
+    <color name="colorText">#FFFFFB8D</color>
     <color name="colorToastFrame">#FFA9A9A9</color>
     <color name="colorToastShadow">#FF000000</color>
     <color name="colorToastBackgroung">#FFFFFFFF</color>
@@ -24,22 +24,10 @@
     <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
     <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
 
-    <!-- -->
+    <color name="toolbarBackgroundColor">#FF03AB4E</color>
+    <color name="toolbarTextColor">#FFFFFFFF</color>
+    <color name="mainWindowBackgroundColor">#FFFFFFFF</color>
+    <color name="mainWindowTextColor">#FF000000</color>
+    <color name="debugTextColor">#FFFF0000</color>
 
-    <!-- 调试方案 
-    <color name="colorPrimary">#FF727272</color>
-    <color name="colorPrimaryDark">#FF444444</color>
-    <color name="colorAccent">#FF9EA19F</color>
-
-    <color name="colorAToolbarStartColor">#FF4776EB</color>
-    <color name="colorAToolbarCenterColor">#FF0D4BE7</color>
-    <color name="colorAToolbarEndColor">#FF8FA7E3</color>
-
-    <color name="colorACardShadow">#FF22A200</color>
-    <color name="colorACardFrame">#FF3FCC19</color>
-    <color name="colorACardBackgroung">#FF88F16B</color>
-
-    <color name="colorATickProgressBarBackgroung">#FF6DC4E2</color>
-    <color name="colorATickProgressBarProgress">#FF22B0E1</color>
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/libaes/src/main/res/values/styles.xml b/libaes/src/main/res/values/styles.xml
index 93e9469..8354a03 100644
--- a/libaes/src/main/res/values/styles.xml
+++ b/libaes/src/main/res/values/styles.xml
@@ -1,255 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorTextColor">#FF000000</item>
-        <item name="colorPrimary">#FF18B05C</item>
-        <item name="colorPrimaryDark">#FF008C3F</item>
-        <item name="colorAccent">#FF24DC77</item>
-        <item name="android:textColor">#FF000000</item>
+        <item name="themeDebug">@style/DebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">@color/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">@color/mainWindowTextColor</item>
+        <item name="dialogBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">@color/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">@color/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">@color/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+
         <item name="aToolbar">@style/AESAToolbar</item>
         <item name="aSupportToolbar">@style/AESASupportToolbar</item>
     </style>
 
+    <style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+    </style>
+
     <style name="AESAToolbar">
-        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrAToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrAToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrAToolbarEndColor">@color/colorAccent</item>
     </style>
 
     <style name="AESASupportToolbar">
-        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrASupportToolbarTitleTextColor">@color/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">@color/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">@color/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">@color/colorAccent</item>
     </style>
 
     <style name="DepthAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FF0065EC</item>
         <item name="colorPrimaryDark">#FF004DB4</item>
         <item name="colorAccent">#FF4A97FF</item>
-        <item name="android:textColor">#FF000000</item>
     </style>
 
     <style name="SkyAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FF00A6FF</item>
         <item name="colorPrimaryDark">#FF007ABB</item>
         <item name="colorAccent">#FF84D4FF</item>
-        <item name="android:textColor">#FF000000</item>
     </style>
 
     <style name="GoldenAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FFF0CA11</item>
         <item name="colorPrimaryDark">#FFD3AF00</item>
         <item name="colorAccent">#FFFFE35C</item>
-        <item name="android:textColor">#FF000000</item>
     </style>
-	
+
     <style name="BearingAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FF840FFF</item>
         <item name="colorPrimaryDark">#FF6900D7</item>
         <item name="colorAccent">#FFBA78FF</item>
-        <item name="android:textColor">#FF000000</item>
     </style>
 
     <style name="MemorAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FFFF00F5</item>
         <item name="colorPrimaryDark">#FFE500DC</item>
         <item name="colorAccent">#FFFF76FA</item>
-        <item name="android:textColor">#FF000000</item>
     </style>
 
     <style name="TaoAESTheme" parent="AESTheme">
-        <item name="colorTextColor">#FF000000</item>
         <item name="colorPrimary">#FFACACAC</item>
         <item name="colorPrimaryDark">#FF898989</item>
         <item name="colorAccent">#FFD8D8D8</item>
-        <item name="android:textColor">#FF000000</item>
     </style>
 
-    <!--<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/AESAToolbar</item>
-    <item name="aSupportToolbar">@style/AESASupportToolbar</item>
-    </style>
-
-    <style name="AESAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="AESASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>-->
-
-    <!--<style name="DepthAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF2566FE</item>
-    <item name="colorPrimaryDark">#FF1359FF</item>
-    <item name="colorAccent">#FF8BAEFF</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/DepthAToolbar</item>
-    <item name="aSupportToolbar">@style/DepthASupportToolbar</item>
-    </style>
-
-    <style name="DepthAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="DepthASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="SkyAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF1E98D4</item>
-    <item name="colorPrimaryDark">#FF046A9C</item>
-    <item name="colorAccent">#FF8CD9FF</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/SkyAToolbar</item>
-    <item name="aSupportToolbar">@style/SkyASupportToolbar</item>
-    </style>
-
-    <style name="SkyAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="SkyASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="GoldenAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FFFFE22A</item>
-    <item name="colorPrimaryDark">#FFAE9600</item>
-    <item name="colorAccent">#FFFFED78</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/GoldenAToolbar</item>
-    <item name="aSupportToolbar">@style/GoldenASupportToolbar</item>
-    </style>
-
-    <style name="GoldenAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="GoldenASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="MemorAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FFCE1ED4</item>
-    <item name="colorPrimaryDark">#FFB500BC</item>
-    <item name="colorAccent">#FFE653EB</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/MemorAToolbar</item>
-    <item name="aSupportToolbar">@style/MemorASupportToolbar</item>
-    </style>
-
-    <style name="MemorAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="MemorASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="TaoAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF9F9F9F</item>
-    <item name="colorPrimaryDark">#FF5E5E5E</item>
-    <item name="colorAccent">#FFD9D9D9</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/TaoAToolbar</item>
-    <item name="aSupportToolbar">@style/TaoASupportToolbar</item>
-    </style>
-
-    <style name="TaoAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="TaoASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>-->
-
-    <!--<style name="AToolbar">
-    <item name="attrAToolbarTitleTextColor">#FF2DDA27</item>
-    <item name="attrAToolbarStartColor">#FF2DDA27</item>
-    <item name="attrAToolbarCenterColor">#FF2DDA27</item>
-    <item name="attrAToolbarEndColor">#FF2DDA27</item>
-    </style>-->
-
-    <!--对话框的样式-->
-    <style name="NormalDialogStyle">
-        <!--对话框背景 -->
+    <style name="NormalDialogStyle" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:windowBackground">@android:color/transparent</item>
-        <!--边框 -->
         <item name="android:windowFrame">@null</item>
-        <!--没有标题 -->
         <item name="android:windowNoTitle">true</item>
-        <!-- 是否浮现在Activity之上 -->
         <item name="android:windowIsFloating">true</item>
-        <!--背景透明 -->
         <item name="android:windowIsTranslucent">false</item>
-        <!-- 是否有覆盖 -->
         <item name="android:windowContentOverlay">@null</item>
-        <!--进出的显示动画 -->
         <item name="android:windowAnimationStyle">@style/cornerDialogAnim</item>
-        <!--背景变暗-->
         <item name="android:backgroundDimEnabled">true</item>
     </style>
-    <!--对话框动画，中间弹出-->
+
     <style name="centerDialogAnim" parent="android:Animation">
         <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_center</item>
         <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_center</item>
     </style>
-    <!--对话框动画，角落弹出-->
+
     <style name="cornerDialogAnim" parent="android:Animation">
         <item name="@android:windowEnterAnimation">@anim/normal_dialog_enter_corner</item>
         <item name="@android:windowExitAnimation">@anim/normal_dialog_exit_corner</item>
     </style>
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index cd52a4e..2e7654e 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -9,7 +9,7 @@ android {
     buildToolsVersion "30.0.3"
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
     }
     buildTypes {
@@ -18,6 +18,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
 }
 
 dependencies {
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 9232f78..8d3d61f 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 28 17:08:04 HKT 2026
-stageCount=22
+#Tue May 12 09:16:45 HKT 2026
+stageCount=10
 libraryProject=libappbase
-baseVersion=15.15
-publishVersion=15.15.21
+baseVersion=15.20
+publishVersion=15.20.9
 buildCount=0
-baseBetaVersion=15.15.22
+baseBetaVersion=15.20.10
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index f2838e6..bbfd3f3 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -47,6 +47,13 @@
 
         <activity android:name="cc.winboll.studio.libappbase.activities.FTPBackupsActivity"/>
 
+        <activity
+            android:name=".utils.ShareLogActivity"
+            android:label="ShareLogActivity"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.NoDisplay"/>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/AppCrashSafetyWire.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/AppCrashSafetyWire.java
new file mode 100644
index 0000000..9391189
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/AppCrashSafetyWire.java
@@ -0,0 +1,194 @@
+package cc.winboll.studio.libappbase;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+/**
+ * 应用崩溃保险丝内部类（单例）
+ * 核心作用：限制短时间内重复崩溃，通过「熔断等级」控制崩溃页面启动策略
+ * 等级范围：MINI（1）~ MAX（2），每次崩溃等级-1，熔断后启动基础版崩溃页面
+ */
+public final class AppCrashSafetyWire {
+	
+	public static final String TAG = "AppCrashSafetyWire";
+	
+	/** 单例实例（volatile 保证多线程可见性） */
+	private static volatile AppCrashSafetyWire _AppCrashSafetyWire;
+
+	/** 当前熔断等级（1：最低防护；2：最高防护；≤0：熔断） */
+	private volatile Integer currentSafetyLevel;
+	/** 最低熔断等级（1，再崩溃则熔断） */
+	private static final int _MINI = 1;
+	/** 最高熔断等级（2，初始状态） */
+	private static final int _MAX = 2;
+
+	/**
+	 * 私有构造方法（单例模式，禁止外部实例化）
+	 * 初始化时加载本地存储的熔断等级
+	 */
+	private AppCrashSafetyWire() {
+		LogUtils.d(TAG, "AppCrashSafetyWire()");
+		currentSafetyLevel = loadCurrentSafetyLevel();
+	}
+
+	/**
+	 * 获取单例实例（双重检查锁定，线程安全）
+	 * @return AppCrashSafetyWire 单例
+	 */
+	public static synchronized AppCrashSafetyWire getInstance() {
+		if (_AppCrashSafetyWire == null) {
+			_AppCrashSafetyWire = new AppCrashSafetyWire();
+		}
+		return _AppCrashSafetyWire;
+	}
+
+	/**
+	 * 设置当前熔断等级（内存中）
+	 * @param currentSafetyLevel 目标等级（1~2）
+	 */
+	public void setCurrentSafetyLevel(int currentSafetyLevel) {
+		this.currentSafetyLevel = currentSafetyLevel;
+	}
+
+	/**
+	 * 获取当前熔断等级（内存中）
+	 * @return 当前等级（1~2 或 null）
+	 */
+	public int getCurrentSafetyLevel() {
+		return currentSafetyLevel;
+	}
+
+	/**
+	 * 保存熔断等级到本地文件（持久化，重启应用生效）
+	 * @param currentSafetyLevel 待保存的等级
+	 */
+	public void saveCurrentSafetyLevel(int currentSafetyLevel) {
+		LogUtils.d(TAG, "saveCurrentSafetyLevel()");
+		this.currentSafetyLevel = currentSafetyLevel;
+		try {
+			// 序列化等级到文件（ObjectOutputStream 写入 int）
+			ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(CrashHandler._CrashCountFilePath));
+			oos.writeInt(currentSafetyLevel);
+			oos.flush();
+			oos.close();
+			LogUtils.d(TAG, String.format("saveCurrentSafetyLevel writeInt currentSafetyLevel %d", currentSafetyLevel));
+		} catch (IOException e) {
+			LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+		}
+	}
+
+	/**
+	 * 从本地文件加载熔断等级（应用启动时初始化）
+	 * @return 加载的等级（文件不存在则初始化为 MAX（2））
+	 */
+	public int loadCurrentSafetyLevel() {
+		LogUtils.d(TAG, "loadCurrentSafetyLevel()");
+		try {
+			File f = new File(CrashHandler._CrashCountFilePath);
+			if (f.exists()) {
+				// 反序列化从文件读取等级
+				ObjectInputStream ois = new ObjectInputStream(new FileInputStream(CrashHandler._CrashCountFilePath));
+				currentSafetyLevel = ois.readInt();
+				LogUtils.d(TAG, String.format("loadCurrentSafetyLevel() readInt currentSafetyLevel %d", currentSafetyLevel));
+			} else {
+				// 文件不存在，初始化等级为最高（2）并保存
+				currentSafetyLevel = _MAX;
+				LogUtils.d(TAG, String.format("loadCurrentSafetyLevel() currentSafetyLevel init to _MAX->%d", _MAX));
+				saveCurrentSafetyLevel(currentSafetyLevel);
+			}
+		} catch (IOException e) {
+			LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+		}
+		return currentSafetyLevel;
+	}
+
+	/**
+	 * 熔断保险丝（每次崩溃调用，降低防护等级）
+	 * @return 熔断后是否仍在防护范围内（true：是；false：已熔断）
+	 */
+	boolean burnSafetyWire() {
+		LogUtils.d(TAG, "burnSafetyWire()");
+		// 加载当前等级
+		int safeLevel = loadCurrentSafetyLevel();
+		// 若在防护范围内（1~2），等级-1 并保存
+		if (isSafetyWireWorking(safeLevel)) {
+			LogUtils.d(TAG, "burnSafetyWire() use");
+			saveCurrentSafetyLevel(safeLevel - 1);
+			// 返回熔断后的状态
+			return isSafetyWireWorking(safeLevel - 1);
+		}
+		return false;
+	}
+
+	/**
+	 * 检查熔断等级是否在有效范围内（1~2）
+	 * @param safetyLevel 待检查的等级
+	 * @return true：在范围内（防护有效）；false：超出范围（已熔断）
+	 */
+	boolean isSafetyWireWorking(int safetyLevel) {
+		LogUtils.d(TAG, "isSafetyWireOK()");
+		LogUtils.d(TAG, String.format("SafetyLevel %d", safetyLevel));
+
+		if (safetyLevel >= _MINI && safetyLevel <= _MAX) {
+			LogUtils.d(TAG, String.format("In Safety Level"));
+			return true;
+		}
+		LogUtils.d(TAG, String.format("Out of Safety Level"));
+		return false;
+	}
+
+	/**
+	 * 立即恢复熔断等级到最高（2）
+	 * 用于重启应用后重置防护状态
+	 */
+	void resumeToMaximumImmediately() {
+		LogUtils.d(TAG, "resumeToMaximumImmediately() call saveCurrentSafetyLevel(_MAX)");
+		AppCrashSafetyWire.getInstance().saveCurrentSafetyLevel(_MAX);
+	}
+
+	/**
+	 * 关闭防护（设置等级为最低（1））
+	 * 下次崩溃直接熔断
+	 */
+	void off() {
+		LogUtils.d(TAG, "off()");
+		saveCurrentSafetyLevel(_MINI);
+	}
+
+	/**
+	 * 检查当前保险丝是否有效（防护未熔断）
+	 * @return true：有效（等级 1~2）；false：已熔断
+	 */
+	public boolean isAppCrashSafetyWireOK() {
+		LogUtils.d(TAG, "isAppCrashSafetyWireOK()");
+		currentSafetyLevel = loadCurrentSafetyLevel();
+		return isSafetyWireWorking(currentSafetyLevel);
+	}
+
+	/**
+	 * 延迟恢复保险丝到最高等级（500ms 后）
+	 * 核心作用：崩溃页面启动后，若下次即将熔断，提前恢复防护等级，避免持续崩溃
+	 * @param context 上下文（用于获取主线程 Handler）
+	 */
+	void postResumeCrashSafetyWireHandler(final Context context) {
+		// 主线程延迟 500ms 执行（避免页面启动时阻塞）
+		new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					LogUtils.d(TAG, "Handler run()");
+					// 检查：若当前等级-1 后超出防护范围（即将熔断），则恢复到最高等级
+					if (!AppCrashSafetyWire.getInstance().isSafetyWireWorking(currentSafetyLevel - 1)) {
+						AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
+						LogUtils.d(TAG, "postResumeCrashSafetyWireHandler: 恢复保险丝到最高等级");
+					}
+				}
+			}, 500);
+	}
+}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
index a839e2b..bfdcf5f 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java
@@ -10,7 +10,6 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -23,7 +22,9 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -38,521 +39,292 @@ import java.util.Date;
 import java.util.Locale;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/11 20:14
- * @Describe  * 应用全局崩溃处理类（单例逻辑）
+ * 应用全局崩溃处理类（单例逻辑）
  * 核心功能：捕获应用未捕获异常，记录崩溃日志到文件，启动崩溃报告页面，
  * 并通过「崩溃保险丝」机制防止重复崩溃，保障基础功能可用
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2025/11/11 20:14:00
+ * @EditTime 2026/05/11 15:36:45
  */
 public final class CrashHandler {
 
-	/** 日志标签，用于当前类的日志输出标识 */
-	public static final String TAG = "CrashHandler";
+    // ====================== 常量定义 ======================
+    /** 日志标签 */
+    public static final String TAG = "CrashHandler";
+    /** 崩溃报告页面标题 */
+    public static final String TITTLE = "CrashReport";
+    /** Intent 传递崩溃信息键 */
+    public static final String EXTRA_CRASH_LOG = "crashInfo";
+    /** SharedPreferences 存储键 */
+    static final String PREFS = CrashHandler.class.getName() + "PREFS";
+    /** 标记是否发生崩溃键 */
+    static final String PREFS_CRASHHANDLER_ISCRASHHAPPEN = "PREFS_CRASHHANDLER_ISCRASHHAPPEN";
 
-	/** 崩溃报告页面标题 */
-	public static final String TITTLE = "CrashReport";
+    // ====================== 成员变量 ======================
+    /** 崩溃保险丝状态文件路径 */
+    public static String _CrashCountFilePath;
+    /** 系统默认异常处理器兜底 */
+    public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER
+	= Thread.getDefaultUncaughtExceptionHandler();
 
-	/** Intent 传递崩溃信息的键（用于向崩溃页面传递日志） */
-	public static final String EXTRA_CRASH_LOG = "crashInfo";
+    // ====================== 对外初始化方法 ======================
+    /**
+     * 初始化崩溃处理器（默认存储路径）
+     * @param app 全局Application实例
+     */
+    public static void init(final Application app) {
+        _CrashCountFilePath = app.getExternalFilesDir("CrashHandler") + "/IsCrashHandlerCrashHappen.dat";
+        LogUtils.d(TAG, "init _CrashCountFilePath = " + _CrashCountFilePath);
+        init(app, null);
+    }
 
-	/** SharedPreferences 存储键（用于记录崩溃状态） */
-	final static String PREFS = CrashHandler.class.getName() + "PREFS";
-	/** SharedPreferences 中存储「是否发生崩溃」的键 */
-	final static String PREFS_CRASHHANDLER_ISCRASHHAPPEN = "PREFS_CRASHHANDLER_ISCRASHHAPPEN";
-
-	/** 崩溃保险丝状态文件路径（存储当前熔断等级） */
-	public static String _CrashCountFilePath;
-
-	/** 系统默认的未捕获异常处理器（用于降级处理，避免 CrashHandler 自身崩溃） */
-	public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-	/**
-	 * 初始化崩溃处理器（默认存储路径）
-	 * 调用重载方法，崩溃日志默认存储在应用外部私有目录的 crash 文件夹下
-	 * @param app 全局 Application 实例（用于获取存储目录、包信息等）
-	 */
-	public static void init(Application app) {
-		// 初始化崩溃保险丝状态文件路径（外部存储/CrashHandler/IsCrashHandlerCrashHappen.dat）
-		_CrashCountFilePath = app.getExternalFilesDir("CrashHandler") + "/IsCrashHandlerCrashHappen.dat";
-		LogUtils.d(TAG, String.format("_CrashCountFilePath %s", _CrashCountFilePath));
-		// 调用带目录参数的初始化方法，传入 null 使用默认路径
-		init(app, null);
-	}
-
-	/**
-	 * 初始化崩溃处理器（指定日志存储目录）
-	 * 替换系统默认的未捕获异常处理器，自定义崩溃处理逻辑
-	 * @param app 全局 Application 实例
-	 * @param crashDir 崩溃日志存储目录（null 则使用默认路径）
-	 */
-	public static void init(final Application app, final String crashDir) {
-		// 设置自定义未捕获异常处理器
-		Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+    /**
+     * 初始化崩溃处理器（自定义日志目录）
+     * @param app 全局Application实例
+     * @param crashDir 自定义崩溃日志目录，传null使用默认
+     */
+    public static void init(final Application app, final String crashDir) {
+        Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
 				@Override
-				public void uncaughtException(Thread thread, Throwable throwable) {
+				public void uncaughtException(final Thread thread, final Throwable throwable) {
 					try {
-						// 尝试处理崩溃（捕获内部异常，避免 CrashHandler 自身崩溃）
-						tryUncaughtException(thread, throwable);
+						tryUncaughtException(thread, throwable, crashDir, app);
 					} catch (Throwable e) {
-						e.printStackTrace();
-						// 处理失败时，交给系统默认处理器兜底
+						LogUtils.e(TAG, "uncaughtException error", e);
 						if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
 							DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
 						}
 					}
 				}
-
-				/**
-				 * 实际处理崩溃的核心方法
-				 * 1. 熔断保险丝（记录崩溃次数）；2. 收集崩溃信息；3. 写入日志文件；4. 启动崩溃报告页面
-				 * @param thread 发生崩溃的线程
-				 * @param throwable 崩溃异常对象（包含堆栈信息）
-				 */
-				private void tryUncaughtException(Thread thread, Throwable throwable) {
-					// 触发崩溃保险丝（每次崩溃熔断一次，降低防护等级）
-					AppCrashSafetyWire.getInstance().burnSafetyWire();
-
-					// 格式化崩溃发生时间（用于日志文件名和内容）
-					final String time = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss", Locale.getDefault()).format(new Date());
-					// 创建崩溃日志文件（默认路径：外部存储/crash/[时间].txt）
-					File crashFile = new File(
-						TextUtils.isEmpty(crashDir) ? new File(app.getExternalFilesDir(null), "crash") : new File(crashDir),
-						"crash_" + time + ".txt"
-					);
-
-					// 获取应用版本信息（版本名、版本号）
-					String versionName = "unknown";
-					long versionCode = 0;
-					try {
-						PackageInfo packageInfo = app.getPackageManager().getPackageInfo(app.getPackageName(), 0);
-						versionName = packageInfo.versionName;
-						// 适配 Android 9.0+（API 28）的版本号获取方式
-						versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
-					} catch (PackageManager.NameNotFoundException ignored) {}
-
-					// 将异常堆栈信息转换为字符串
-					String fullStackTrace;
-					{
-						StringWriter sw = new StringWriter();
-						PrintWriter pw = new PrintWriter(sw);
-						throwable.printStackTrace(pw); // 将异常堆栈写入 PrintWriter
-						fullStackTrace = sw.toString();
-						pw.close();
-					}
-
-					// 拼接崩溃信息（设备信息 + 应用信息 + 堆栈信息）
-					StringBuilder sb = new StringBuilder();
-					sb.append("************* Crash Head ****************\n");
-					sb.append("Time Of Crash                        : ").append(time).append("\n");
-					sb.append("Device Manufacturer                  : ").append(Build.MANUFACTURER).append("\n"); // 设备厂商
-					sb.append("Device Model                         : ").append(Build.MODEL).append("\n"); // 设备型号
-					sb.append("Android Version                      : ").append(Build.VERSION.RELEASE).append("\n"); // Android 版本
-					sb.append("Android SDK                          : ").append(Build.VERSION.SDK_INT).append("\n"); // SDK 版本
-					sb.append("App VersionName                      : ").append(versionName).append("\n"); // 应用版本名
-					sb.append("App VersionCode                      : ").append(versionCode).append("\n"); // 应用版本号
-					sb.append("************* Crash Head ****************\n");
-					sb.append("\n").append(fullStackTrace); // 拼接异常堆栈
-
-					final String errorLog = sb.toString();
-
-					// 将崩溃日志写入文件（忽略写入失败）
-					try {
-						writeFile(crashFile, errorLog);
-					} catch (IOException ignored) {}
-
-					// 启动崩溃报告页面（标签用于代码块折叠）
-					gotoCrashActiviy: {
-						Intent intent = new Intent();
-						LogUtils.d(TAG, "gotoCrashActiviy: ");
-
-						// 根据保险丝状态选择启动的崩溃页面
-						if (AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
-							LogUtils.d(TAG, "gotoCrashActiviy: isAppCrashSafetyWireOK");
-							// 保险丝正常：启动自定义样式的崩溃报告页面（GlobalCrashActivity）
-							intent.setClass(app, GlobalCrashActivity.class);
-							intent.putExtra(EXTRA_CRASH_LOG, errorLog); // 传递崩溃日志
-						} else {
-							LogUtils.d(TAG, "gotoCrashActiviy: else");
-							// 保险丝熔断：启动基础版崩溃页面（CrashActivity，避免复杂页面再次崩溃）
-							intent.setClass(app, CrashActivity.class);
-							intent.putExtra(EXTRA_CRASH_LOG, errorLog);
-						}
-
-						// 设置意图标志：清除原有任务栈，创建新任务（避免回到崩溃前页面）
-						intent.addFlags(
-							Intent.FLAG_ACTIVITY_NEW_TASK
-							| Intent.FLAG_ACTIVITY_CLEAR_TOP
-							| Intent.FLAG_ACTIVITY_CLEAR_TASK
-						);
-
-						try {
-							if (GlobalApplication.isDebugging()&&AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
-								// 如果是 debug 版，启动崩溃页面窗口
-								app.startActivity(intent);
-							} else {
-								// 如果是 release 版，就只发送一个通知
-								CrashHandleNotifyUtils.handleUncaughtException(app, intent);
-							}
-							// 终止当前进程（确保完全重启）
-							android.os.Process.killProcess(android.os.Process.myPid());
-							System.exit(0);
-
-						} catch (ActivityNotFoundException e) {
-							// 未找到崩溃页面（如未在 Manifest 注册），交给系统默认处理器
-							e.printStackTrace();
-							if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
-								DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-							}
-						} catch (Exception e) {
-							// 其他异常，兜底处理
-							e.printStackTrace();
-							if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
-								DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-							}
-						}
-					}
-				}
-
-				/**
-				 * 将字符串内容写入文件（创建父目录、覆盖写入）
-				 * @param file 目标文件（包含路径）
-				 * @param content 待写入的内容（崩溃日志）
-				 * @throws IOException 文件创建或写入失败时抛出
-				 */
-				private void writeFile(File file, String content) throws IOException {
-					File parentFile = file.getParentFile();
-					// 父目录不存在则创建
-					if (parentFile != null && !parentFile.exists()) {
-						parentFile.mkdirs();
-					}
-					file.createNewFile(); // 创建文件
-					FileOutputStream fos = new FileOutputStream(file);
-					fos.write(content.getBytes()); // 写入内容（默认 UTF-8 编码）
-					try {
-						fos.close(); // 关闭流
-					} catch (IOException e) {}
-				}
 			});
-	}
+    }
 
-	/**
-	 * 应用崩溃保险丝内部类（单例）
-	 * 核心作用：限制短时间内重复崩溃，通过「熔断等级」控制崩溃页面启动策略
-	 * 等级范围：MINI（1）~ MAX（2），每次崩溃等级-1，熔断后启动基础版崩溃页面
-	 */
-	public static final class AppCrashSafetyWire {
+    // ====================== 内部崩溃处理核心 ======================
+    /**
+     * 执行崩溃信息收集、日志写入、跳转崩溃页面
+     */
+    private static void tryUncaughtException(final Thread thread,
+											 final Throwable throwable,
+											 final String crashDir,
+											 final Application app) {
+        // 触发崩溃保险丝
+        AppCrashSafetyWire.getInstance().burnSafetyWire();
 
-		/** 单例实例（volatile 保证多线程可见性） */
-		private static volatile AppCrashSafetyWire _AppCrashSafetyWire;
+        // 格式化时间
+        final String time = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss",
+												 Locale.getDefault()).format(new Date());
 
-		/** 当前熔断等级（1：最低防护；2：最高防护；≤0：熔断） */
-		private volatile Integer currentSafetyLevel;
-		/** 最低熔断等级（1，再崩溃则熔断） */
-		private static final int _MINI = 1;
-		/** 最高熔断等级（2，初始状态） */
-		private static final int _MAX = 2;
+        // 创建日志文件
+        File logParent = TextUtils.isEmpty(crashDir)
+			? new File(app.getExternalFilesDir(null), "crash")
+			: new File(crashDir);
+        final File crashFile = new File(logParent, "crash_" + time + ".txt");
 
-		/**
-		 * 私有构造方法（单例模式，禁止外部实例化）
-		 * 初始化时加载本地存储的熔断等级
-		 */
-		private AppCrashSafetyWire() {
-			LogUtils.d(TAG, "AppCrashSafetyWire()");
-			currentSafetyLevel = loadCurrentSafetyLevel();
-		}
+        // 获取应用版本信息
+        String versionName = "unknown";
+        long versionCode = 0;
+        try {
+            final PackageInfo packageInfo = app.getPackageManager()
+				.getPackageInfo(app.getPackageName(), 0);
+            versionName = packageInfo.versionName;
+            if (Build.VERSION.SDK_INT >= 28) {
+                versionCode = packageInfo.getLongVersionCode();
+            } else {
+                versionCode = packageInfo.versionCode;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            LogUtils.e(TAG, "get package info fail");
+        }
 
-		/**
-		 * 获取单例实例（双重检查锁定，线程安全）
-		 * @return AppCrashSafetyWire 单例
-		 */
-		public static synchronized AppCrashSafetyWire getInstance() {
-			if (_AppCrashSafetyWire == null) {
-				_AppCrashSafetyWire = new AppCrashSafetyWire();
-			}
-			return _AppCrashSafetyWire;
-		}
+        // 抓取异常堆栈
+        String fullStackTrace;
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        throwable.printStackTrace(pw);
+        fullStackTrace = sw.toString();
+        pw.close();
 
-		/**
-		 * 设置当前熔断等级（内存中）
-		 * @param currentSafetyLevel 目标等级（1~2）
-		 */
-		public void setCurrentSafetyLevel(int currentSafetyLevel) {
-			this.currentSafetyLevel = currentSafetyLevel;
-		}
+        // 拼接崩溃头部信息
+        StringBuilder sb = new StringBuilder();
+        sb.append("************* Crash Head ****************\n");
+        sb.append("Time Of Crash                        : ").append(time).append("\n");
+        sb.append("Device Manufacturer                  : ").append(Build.MANUFACTURER).append("\n");
+        sb.append("Device Model                         : ").append(Build.MODEL).append("\n");
+        sb.append("Android Version                      : ").append(Build.VERSION.RELEASE).append("\n");
+        sb.append("Android SDK                          : ").append(Build.VERSION.SDK_INT).append("\n");
+        sb.append("App VersionName                      : ").append(versionName).append("\n");
+        sb.append("App VersionCode                      : ").append(versionCode).append("\n");
+        sb.append("************* Crash Head ****************\n");
+        sb.append("\n").append(fullStackTrace);
 
-		/**
-		 * 获取当前熔断等级（内存中）
-		 * @return 当前等级（1~2 或 null）
-		 */
-		public int getCurrentSafetyLevel() {
-			return currentSafetyLevel;
-		}
+        final String errorLog = sb.toString();
 
-		/**
-		 * 保存熔断等级到本地文件（持久化，重启应用生效）
-		 * @param currentSafetyLevel 待保存的等级
-		 */
-		public void saveCurrentSafetyLevel(int currentSafetyLevel) {
-			LogUtils.d(TAG, "saveCurrentSafetyLevel()");
-			this.currentSafetyLevel = currentSafetyLevel;
-			try {
-				// 序列化等级到文件（ObjectOutputStream 写入 int）
-				ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(_CrashCountFilePath));
-				oos.writeInt(currentSafetyLevel);
-				oos.flush();
-				oos.close();
-				LogUtils.d(TAG, String.format("saveCurrentSafetyLevel writeInt currentSafetyLevel %d", currentSafetyLevel));
-			} catch (IOException e) {
-				LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-			}
-		}
+        // 写入日志文件
+        try {
+            writeFile(crashFile, errorLog);
+        } catch (IOException e) {
+            LogUtils.e(TAG, "write crash log file fail");
+        }
 
-		/**
-		 * 从本地文件加载熔断等级（应用启动时初始化）
-		 * @return 加载的等级（文件不存在则初始化为 MAX（2））
-		 */
-		public int loadCurrentSafetyLevel() {
-			LogUtils.d(TAG, "loadCurrentSafetyLevel()");
-			try {
-				File f = new File(_CrashCountFilePath);
-				if (f.exists()) {
-					// 反序列化从文件读取等级
-					ObjectInputStream ois = new ObjectInputStream(new FileInputStream(_CrashCountFilePath));
-					currentSafetyLevel = ois.readInt();
-					LogUtils.d(TAG, String.format("loadCurrentSafetyLevel() readInt currentSafetyLevel %d", currentSafetyLevel));
-				} else {
-					// 文件不存在，初始化等级为最高（2）并保存
-					currentSafetyLevel = _MAX;
-					LogUtils.d(TAG, String.format("loadCurrentSafetyLevel() currentSafetyLevel init to _MAX->%d", _MAX));
-					saveCurrentSafetyLevel(currentSafetyLevel);
-				}
-			} catch (IOException e) {
-				LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-			}
-			return currentSafetyLevel;
-		}
+        // 跳转崩溃页面
+        gotoCrashActivity(errorLog, app);
+    }
 
-		/**
-		 * 熔断保险丝（每次崩溃调用，降低防护等级）
-		 * @return 熔断后是否仍在防护范围内（true：是；false：已熔断）
-		 */
-		boolean burnSafetyWire() {
-			LogUtils.d(TAG, "burnSafetyWire()");
-			// 加载当前等级
-			int safeLevel = loadCurrentSafetyLevel();
-			// 若在防护范围内（1~2），等级-1 并保存
-			if (isSafetyWireWorking(safeLevel)) {
-				LogUtils.d(TAG, "burnSafetyWire() use");
-				saveCurrentSafetyLevel(safeLevel - 1);
-				// 返回熔断后的状态
-				return isSafetyWireWorking(safeLevel - 1);
-			}
-			return false;
-		}
+    /**
+     * 写入文本到文件
+     */
+    private static void writeFile(final File file, final String content) throws IOException {
+        final File parentFile = file.getParentFile();
+        if (parentFile != null && !parentFile.exists()) {
+            parentFile.mkdirs();
+        }
+        file.createNewFile();
+        FileOutputStream fos = new FileOutputStream(file);
+        fos.write(content.getBytes());
+        fos.close();
+    }
 
-		/**
-		 * 检查熔断等级是否在有效范围内（1~2）
-		 * @param safetyLevel 待检查的等级
-		 * @return true：在范围内（防护有效）；false：超出范围（已熔断）
-		 */
-		boolean isSafetyWireWorking(int safetyLevel) {
-			LogUtils.d(TAG, "isSafetyWireOK()");
-			LogUtils.d(TAG, String.format("SafetyLevel %d", safetyLevel));
+    /**
+     * 根据保险丝状态跳转对应崩溃页面
+     */
+    private static void gotoCrashActivity(final String errorLog, final Application app) {
+        final Intent intent = new Intent();
+        if (AppCrashSafetyWire.getInstance().isAppCrashSafetyWireOK()) {
+            intent.setClass(app, GlobalCrashActivity.class);
+        } else {
+            intent.setClass(app, CrashActivity.class);
+        }
+        intent.putExtra(EXTRA_CRASH_LOG, errorLog);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+						| Intent.FLAG_ACTIVITY_CLEAR_TOP
+						| Intent.FLAG_ACTIVITY_CLEAR_TASK);
 
-			if (safetyLevel >= _MINI && safetyLevel <= _MAX) {
-				LogUtils.d(TAG, String.format("In Safety Level"));
-				return true;
-			}
-			LogUtils.d(TAG, String.format("Out of Safety Level"));
-			return false;
-		}
+        try {
+            if (GlobalApplication.isDebugging()) {
+                app.startActivity(intent);
+            } else {
+                CrashHandleNotifyUtils.handleUncaughtException(app, intent, GlobalCrashActivity.class);
+            }
+            android.os.Process.killProcess(android.os.Process.myPid());
+            System.exit(0);
+        } catch (ActivityNotFoundException e) {
+            LogUtils.e(TAG, "CrashActivity not found");
+            if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
+                DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(Thread.currentThread(), e);
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "start CrashActivity error");
+            if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
+                DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(Thread.currentThread(), e);
+            }
+        }
+    }
 
-		/**
-		 * 立即恢复熔断等级到最高（2）
-		 * 用于重启应用后重置防护状态
-		 */
-		void resumeToMaximumImmediately() {
-			LogUtils.d(TAG, "resumeToMaximumImmediately() call saveCurrentSafetyLevel(_MAX)");
-			AppCrashSafetyWire.getInstance().saveCurrentSafetyLevel(_MAX);
-		}
+    // ====================== 内部Activity页面 ======================
+    /**
+     * 基础极简崩溃页面
+     * 保险丝熔断时启动，避免复杂布局二次崩溃
+     */
+    public static final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
+        private static final int MENUITEM_COPY = 0;
+        private static final int MENUITEM_RESTART = 1;
 
-		/**
-		 * 关闭防护（设置等级为最低（1））
-		 * 下次崩溃直接熔断
-		 */
-		void off() {
-			LogUtils.d(TAG, "off()");
-			saveCurrentSafetyLevel(_MINI);
-		}
+        private String mLog;
 
-		/**
-		 * 检查当前保险丝是否有效（防护未熔断）
-		 * @return true：有效（等级 1~2）；false：已熔断
-		 */
-		boolean isAppCrashSafetyWireOK() {
-			LogUtils.d(TAG, "isAppCrashSafetyWireOK()");
-			currentSafetyLevel = loadCurrentSafetyLevel();
-			return isSafetyWireWorking(currentSafetyLevel);
-		}
+        @Override
+        protected void onCreate(final Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
+            mLog = getIntent().getStringExtra(EXTRA_CRASH_LOG);
+            setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+            initLayout();
+        }
 
-		/**
-		 * 延迟恢复保险丝到最高等级（500ms 后）
-		 * 核心作用：崩溃页面启动后，若下次即将熔断，提前恢复防护等级，避免持续崩溃
-		 * @param context 上下文（用于获取主线程 Handler）
-		 */
-		void postResumeCrashSafetyWireHandler(final Context context) {
-			// 主线程延迟 500ms 执行（避免页面启动时阻塞）
-			new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						LogUtils.d(TAG, "Handler run()");
-						// 检查：若当前等级-1 后超出防护范围（即将熔断），则恢复到最高等级
-						if (!AppCrashSafetyWire.getInstance().isSafetyWireWorking(currentSafetyLevel - 1)) {
-							AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
-							LogUtils.d(TAG, "postResumeCrashSafetyWireHandler: 恢复保险丝到最高等级");
-						}
-					}
-				}, 500);
-		}
-	}
+        /**
+         * 动态初始化布局
+         */
+        private void initLayout() {
+            ScrollView contentView = new ScrollView(this);
+            contentView.setFillViewport(true);
 
-	/**
-	 * 基础版崩溃报告页面（保险丝熔断时启动）
-	 * 极简实现：仅展示崩溃日志，提供复制、重启功能，避免复杂布局导致二次崩溃
-	 */
-	public static final class CrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
-		/** 菜单标识：复制崩溃日志 */
-		private static final int MENUITEM_COPY = 0;
-		/** 菜单标识：重启应用 */
-		private static final int MENUITEM_RESTART = 1;
+            HorizontalScrollView hw = new HorizontalScrollView(this);
+            hw.setBackgroundColor(0xFFF5F5F5);
 
-		/** 崩溃日志文本（从 CrashHandler 传递过来） */
-		private String mLog;
+            TextView message = new TextView(this);
+            final int padding = dp2px(16);
+            message.setPadding(padding, padding, padding, padding);
+            message.setText(mLog);
+            message.setTextColor(0xFF000000);
+            message.setTextIsSelectable(true);
 
-		@Override
-		protected void onCreate(Bundle savedInstanceState) {
-			super.onCreate(savedInstanceState);
-			// 初始化崩溃保险丝延迟恢复机制
-			AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(getApplicationContext());
+            hw.addView(message);
+            contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT,
+								ViewGroup.LayoutParams.MATCH_PARENT);
+            setContentView(contentView);
 
-			// 获取传递的崩溃日志
-			mLog = getIntent().getStringExtra(EXTRA_CRASH_LOG);
-			// 设置系统默认主题（避免自定义主题冲突）
-			setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+            getActionBar().setTitle(TITTLE);
+            getActionBar().setSubtitle(GlobalApplication.class.getSimpleName() + " Error");
+        }
 
-			// 动态创建布局（避免 XML 布局加载异常）
-			setContentView: {
-				// 垂直滚动视图（处理日志过长）
-				ScrollView contentView = new ScrollView(this);
-				contentView.setFillViewport(true);
+        @Override
+        public void onBackPressed() {
+            restartApp();
+        }
 
-				// 水平滚动视图（处理日志行过长）
-				HorizontalScrollView hw = new HorizontalScrollView(this);
-				hw.setBackgroundColor(Color.GRAY); // 背景色设为灰色
+        /**
+         * 重启应用
+         */
+        private void restartApp() {
+            final Intent intent = getPackageManager()
+				.getLaunchIntentForPackage(getPackageName());
+            if (intent != null) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+								| Intent.FLAG_ACTIVITY_CLEAR_TOP
+								| Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                startActivity(intent);
+            }
+            finish();
+            android.os.Process.killProcess(android.os.Process.myPid());
+            System.exit(0);
+        }
 
-				// 日志显示文本框
-				TextView message = new TextView(this);
-				{
-					int padding = dp2px(16); // 内边距 16dp（适配不同屏幕）
-					message.setPadding(padding, padding, padding, padding);
-					message.setText(mLog); // 设置崩溃日志
-					message.setTextColor(Color.BLACK); // 文字黑色
-					message.setTextIsSelectable(true); // 支持文本选择（便于手动复制）
-				}
+        /**
+         * dp转px
+         */
+        private int dp2px(final float dpValue) {
+            final float scale = Resources.getSystem().getDisplayMetrics().density;
+            return (int) (dpValue * scale + 0.5f);
+        }
 
-				// 组装布局：TextView -> HorizontalScrollView -> ScrollView
-				hw.addView(message);
-				contentView.addView(hw, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-				// 设置当前 Activity 布局
-				setContentView(contentView);
-
-				// 配置 ActionBar 标题和副标题
-				getActionBar().setTitle(TITTLE);
-				getActionBar().setSubtitle(GlobalApplication.class.getSimpleName() + " Error");
-			}
-		}
-
-		/**
-		 * 重写返回键逻辑：点击返回键直接重启应用
-		 */
-		@Override
-		public void onBackPressed() {
-			restart();
-		}
-
-		/**
-		 * 重启当前应用（与 GlobalCrashActivity 逻辑一致）
-		 * 清除任务栈，启动主 Activity，终止当前进程
-		 */
-		private void restart() {
-			PackageManager pm = getPackageManager();
-			// 获取应用启动意图（默认启动主 Activity）
-			Intent intent = pm.getLaunchIntentForPackage(getPackageName());
-			if (intent != null) {
-				// 设置意图标志：清除原有任务栈，创建新任务
-				intent.addFlags(
-					Intent.FLAG_ACTIVITY_NEW_TASK
-					| Intent.FLAG_ACTIVITY_CLEAR_TOP
-					| Intent.FLAG_ACTIVITY_CLEAR_TASK
-				);
-				startActivity(intent);
-			}
-			// 关闭当前页面，终止进程，确保完全重启
-			finish();
-			android.os.Process.killProcess(android.os.Process.myPid());
-			System.exit(0);
-		}
-
-		/**
-		 * dp 转 px（适配不同屏幕密度）
-		 * @param dpValue dp 值
-		 * @return 转换后的 px 值
-		 */
-		private int dp2px(final float dpValue) {
-			final float scale = Resources.getSystem().getDisplayMetrics().density;
-			return (int) (dpValue * scale + 0.5f); // 四舍五入确保精度
-		}
-
-		/**
-		 * 菜单点击事件回调（处理复制、重启）
-		 * @param item 被点击的菜单项
-		 * @return false：不消费事件（保持默认行为）
-		 */
-		@Override
-		public boolean onMenuItemClick(MenuItem item) {
-			switch (item.getItemId()) {
-				case MENUITEM_COPY:
-					// 复制日志到剪贴板
-					ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-					cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-					Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
-					break;
-				case MENUITEM_RESTART:
-					// 恢复保险丝到最高等级，然后重启应用
-					AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
-					restart();
-					break;
-			}
-			return false;
-		}
-
-		/**
-		 * 创建 ActionBar 菜单（添加复制、重启项）
-		 * @param menu 菜单容器
-		 * @return true：显示菜单
-		 */
-		@Override
-		public boolean onCreateOptionsMenu(Menu menu) {
-			// 添加「复制」菜单：有空间时显示在 ActionBar，否则放入溢出菜单
-			menu.add(0, MENUITEM_COPY, 0, "Copy")
+        @Override
+        public boolean onCreateOptionsMenu(final Menu menu) {
+            menu.add(0, MENUITEM_COPY, 0, "Copy")
 				.setOnMenuItemClickListener(this)
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-			// 添加「重启」菜单：同上
-			menu.add(0, MENUITEM_RESTART, 0, "Restart")
+
+            menu.add(0, MENUITEM_RESTART, 0, "Restart")
 				.setOnMenuItemClickListener(this)
 				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-			return true;
-		}
-	}
+            return true;
+        }
+
+        @Override
+        public boolean onMenuItemClick(final MenuItem item) {
+            switch (item.getItemId()) {
+                case MENUITEM_COPY:
+                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
+                    Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
+                    break;
+                case MENUITEM_RESTART:
+                    AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
+                    restartApp();
+                    break;
+                default:
+                    break;
+            }
+            return false;
+        }
+    }
 }
 
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
index bc81741..378ac59 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java
@@ -82,7 +82,7 @@ public class GlobalApplication extends Application {
     public static boolean isDebugging() {
         return isDebugging;
     }
-	
+
 	// 新增：设置 WinBoLL 服务器主机地址（同时保存到 SP 持久化）
 	public static void setWinbollHost(String host) {
 		if (sInstance == null) {
@@ -100,7 +100,7 @@ public class GlobalApplication extends Application {
 		sp.edit().putString(SP_KEY_WINBOLL_HOST, host).apply();
 		LogUtils.d(TAG, "setWinbollHost: 服务器地址已设置并持久化，host=" + host);
 	}
-	
+
 
     // 新增：获取 WinBoLL 服务器主机地址（优先内存，内存为空则从 SP 读取）
     public static String getWinbollHost() {
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
index 2d3f934..1b185fd 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java
@@ -10,176 +10,141 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
-import cc.winboll.studio.libappbase.R;
+
+import cc.winboll.studio.libappbase.utils.CrashHandleNotifyUtils;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/11 19:58
- * @Describe 应用异常报告观察活动窗口类
+ * 应用异常报告观察活动窗口类
  * 核心功能：应用发生未捕获崩溃时，由 CrashHandler 启动此页面，展示崩溃日志详情，
  * 并提供「复制日志」「重启应用」操作入口，便于开发者定位问题和用户恢复应用
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2025/11/11 19:58:00
+ * @EditTime 2026/05/11 15:40:12
  */
 public final class GlobalCrashActivity extends Activity implements MenuItem.OnMenuItemClickListener {
 
-    /** 日志标签（用于调试日志输出，唯一标识当前 Activity） */
+    // ====================== 常量定义 ======================
     public static final String TAG = "GlobalCrashActivity";
-
-    /** 菜单标识：复制崩溃日志（用于区分菜单项点击事件） */
+    /** 菜单标识：复制崩溃日志 */
     private static final int MENU_ITEM_COPY = 0;
-    /** 菜单标识：重启应用（用于区分菜单项点击事件） */
+    /** 菜单标识：重启应用 */
     private static final int MENU_ITEM_RESTART = 1;
 
+    // ====================== 成员变量 ======================
     /** 崩溃报告展示自定义视图 */
-    // 负责渲染崩溃日志文本、提供 Toolbar 容器，封装了日志展示和菜单样式控制逻辑
     private GlobalCrashReportView mCrashReportView;
-
     /** 崩溃日志文本内容 */
-    // 从 CrashHandler 通过 Intent 传递过来，包含异常堆栈、设备信息等完整崩溃数据
     private String mCrashLog;
 
-    /**
-     * Activity 创建时初始化（生命周期核心方法，仅执行一次）
-     * @param savedInstanceState 保存的实例状态（崩溃页面无需恢复状态，此处仅作兼容）
-     */
+    // ====================== 生命周期方法 ======================
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    protected void onCreate(final Bundle savedInstanceState) {
+        LogUtils.d(TAG, "onCreate 方法进入");
+        try {
+            super.onCreate(savedInstanceState);
+            final Context appContext = getApplicationContext();
+            // 初始化崩溃安全防护机制
+            AppCrashSafetyWire.getInstance().postResumeCrashSafetyWireHandler(appContext);
 
-        // 初始化崩溃安全防护机制
-        // 作用：防止应用重启后短时间内再次崩溃，由 CrashHandler 内部实现防护逻辑
-        CrashHandler.AppCrashSafetyWire.getInstance()
-			.postResumeCrashSafetyWireHandler(getApplicationContext());
+            // 获取传递的崩溃日志
+            mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
+            LogUtils.d(TAG, "获取到崩溃日志，长度：" + (mCrashLog != null ? mCrashLog.length() : 0));
 
-        // 从 Intent 中获取崩溃日志数据（EXTRA_CRASH_INFO 为 CrashHandler 定义的常量键）
-        mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
+            setContentView(R.layout.activity_globalcrash);
+            mCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
+            mCrashReportView.setReport(mCrashLog);
 
-        // 设置当前 Activity 的布局文件（展示崩溃报告的 UI 结构）
-        setContentView(R.layout.activity_globalcrash);
+            setActionBar(mCrashReportView.getToolbar());
+            if (getActionBar() != null) {
+                getActionBar().setTitle(CrashHandler.TITTLE);
+                getActionBar().setSubtitle(GlobalApplication.getAppName(appContext));
+            }
+        } catch (final Exception e) {
+            LogUtils.e(TAG, "GlobalCrashActivity onCreate 发生异常", e);
+            AppCrashSafetyWire.getInstance().burnSafetyWire();
 
-        // 初始化崩溃报告展示视图（通过布局 ID 找到自定义 View 实例）
-        mCrashReportView = findViewById(R.id.activityglobalcrashGlobalCrashReportView1);
-        // 将崩溃日志设置到视图中，由自定义 View 负责排版和显示
-        mCrashReportView.setReport(mCrashLog);
+            mCrashLog = getIntent().getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
+            final Intent intent = new Intent();
+            intent.putExtra(CrashHandler.EXTRA_CRASH_LOG, mCrashLog);
+            CrashHandleNotifyUtils.handleUncaughtException(GlobalApplication.getInstance(), intent, CrashHandler.CrashActivity.class);
 
-        // 设置页面的 ActionBar（复用自定义 View 中的 Toolbar 作为系统 ActionBar）
-        setActionBar(mCrashReportView.getToolbar());
-
-        // 配置 ActionBar 标题和副标题（非空判断避免空指针异常）
-        if (getActionBar() != null) {
-            // 设置标题：使用 CrashHandler 中定义的统一标题（如 "应用崩溃报告"）
-            getActionBar().setTitle(CrashHandler.TITTLE);
-            // 设置副标题：显示当前应用名称（从全局 Application 工具方法获取）
-            getActionBar().setSubtitle(GlobalApplication.getAppName(getApplicationContext()));
+            StackTraceElement[] stackElements = Thread.currentThread().getStackTrace();
+            StringBuilder sb = new StringBuilder("GlobalCrashActivity onCreate StackTrace");
+            for (StackTraceElement item : stackElements) {
+                sb.append("\n").append(item.toString());
+            }
+            LogUtils.d(TAG, sb.toString());
+            finish();
         }
     }
 
-    /**
-     * 重写返回键点击事件
-     * 逻辑：点击手机返回键时，直接重启应用（而非返回上一页，因崩溃后上一页状态可能异常）
-     */
     @Override
     public void onBackPressed() {
+        LogUtils.d(TAG, "onBackPressed 触发重启应用");
         restartApp();
     }
 
-    /**
-     * 重启当前应用（核心工具方法）
-     * 实现逻辑：
-     * 1. 获取应用的启动意图（默认启动 AndroidManifest 中配置的主 Activity）
-     * 2. 设置意图标志，清除原有任务栈，避免残留异常页面
-     * 3. 启动主 Activity 并终止当前进程，确保应用完全重启
-     */
-    private void restartApp() {
-        // 获取 PackageManager 实例（用于获取应用相关信息和意图）
-        PackageManager packageManager = getPackageManager();
-        // 获取应用的启动意图（参数为当前应用包名，返回主 Activity 的意图）
-        Intent launchIntent = packageManager.getLaunchIntentForPackage(getPackageName());
+    // ====================== 菜单相关回调 ======================
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        LogUtils.d(TAG, "onCreateOptionsView 初始化菜单");
+        menu.add(0, MENU_ITEM_COPY, 0, "Copy")
+			.setOnMenuItemClickListener(this)
+			.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
-        if (launchIntent != null) {
-            // 设置意图标志：
-            // FLAG_ACTIVITY_NEW_TASK：创建新的任务栈启动 Activity
-            // FLAG_ACTIVITY_CLEAR_TOP：清除目标 Activity 之上的所有 Activity
-            // FLAG_ACTIVITY_CLEAR_TASK：清除当前任务栈中的所有 Activity
-            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-								  | Intent.FLAG_ACTIVITY_CLEAR_TOP
-								  | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            // 启动应用主 Activity
-            startActivity(launchIntent);
-        }
+        menu.add(0, MENU_ITEM_RESTART, 0, "Restart")
+			.setOnMenuItemClickListener(this)
+			.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
-        // 关闭当前崩溃报告页面
-        finish();
-        // 终止当前应用进程（确保释放所有资源，避免内存泄漏）
-        android.os.Process.killProcess(android.os.Process.myPid());
-        // 强制退出虚拟机（彻底终止应用，防止残留线程继续运行）
-        System.exit(0);
+        mCrashReportView.updateMenuStyle();
+        return true;
     }
 
-    /**
-     * 菜单项点击事件回调（实现 MenuItem.OnMenuItemClickListener 接口）
-     * @param item 被点击的菜单项实例
-     * @return boolean：true 表示事件已消费，不再向下传递；false 表示未消费
-     */
     @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        // 根据菜单项 ID 判断点击的是哪个功能
+    public boolean onMenuItemClick(final MenuItem item) {
+        LogUtils.d(TAG, "菜单项被点击，ID：" + item.getItemId());
         switch (item.getItemId()) {
             case MENU_ITEM_COPY:
-                // 点击「复制」菜单，执行复制崩溃日志到剪贴板
                 copyCrashLogToClipboard();
                 break;
             case MENU_ITEM_RESTART:
-                // 点击「重启」菜单：先恢复崩溃防护机制到最大等级，再重启应用
-                CrashHandler.AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
+                AppCrashSafetyWire.getInstance().resumeToMaximumImmediately();
                 restartApp();
                 break;
+            default:
+                break;
         }
         return false;
     }
 
+    // ====================== 内部私有工具方法 ======================
     /**
-     * 创建页面顶部菜单（ActionBar 菜单）
-     * @param menu 菜单容器，用于添加菜单项
-     * @return boolean：true 表示显示菜单；false 表示不显示
+     * 重启当前应用
      */
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // 添加「复制」菜单项：
-        // 参数说明：菜单组 ID（0 表示默认组）、菜单项 ID（MENU_ITEM_COPY）、排序号（0）、菜单文本（"Copy"）
-        // setOnMenuItemClickListener(this)：绑定点击事件到当前 Activity
-        // setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)：有空间时显示在 ActionBar 上，否则放入溢出菜单
-        menu.add(0, MENU_ITEM_COPY, 0, "Copy")
-			.setOnMenuItemClickListener(this)
-			.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+    private void restartApp() {
+        LogUtils.d(TAG, "开始执行应用重启逻辑");
+        final PackageManager packageManager = getPackageManager();
+        final Intent launchIntent = packageManager.getLaunchIntentForPackage(getPackageName());
 
-        // 添加「重启」菜单项（参数含义同上）
-        menu.add(0, MENU_ITEM_RESTART, 0, "Restart")
-			.setOnMenuItemClickListener(this)
-			.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        // 调用自定义视图的方法，更新菜单文字样式（如颜色、字体大小等，由自定义 View 内部实现）
-        mCrashReportView.updateMenuStyle();
-
-        return true;
+        if (launchIntent != null) {
+            launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+								  | Intent.FLAG_ACTIVITY_CLEAR_TOP
+								  | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            startActivity(launchIntent);
+        }
+        finish();
+        android.os.Process.killProcess(android.os.Process.myPid());
+        System.exit(0);
     }
 
     /**
-     * 将崩溃日志复制到系统剪贴板（工具方法）
-     * 功能：用户点击复制菜单后，将完整崩溃日志存入剪贴板，方便粘贴到聊天工具或文档中
+     * 将崩溃日志复制到系统剪贴板
      */
     private void copyCrashLogToClipboard() {
-        // 获取系统剪贴板服务（需通过 getSystemService 方法获取）
-        ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-
-        // 创建剪贴板数据：
-        // 参数 1：标签（用于标识剪贴板内容来源，此处用应用包名）
-        // 参数 2：实际复制的文本内容（崩溃日志）
-        ClipData clipData = ClipData.newPlainText(getPackageName(), mCrashLog);
-
-        // 将数据设置到剪贴板（完成复制操作）
+        LogUtils.d(TAG, "执行复制崩溃日志到剪贴板");
+        final ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+        final ClipData clipData = ClipData.newPlainText(getPackageName(), mCrashLog);
         clipboardManager.setPrimaryClip(clipData);
-
-        // 显示复制成功的 Toast 提示（告知用户操作结果）
         Toast.makeText(getApplication(), "The text is copied.", Toast.LENGTH_SHORT).show();
     }
 }
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
index 9151822..7ecedcc 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java
@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toolbar;
 import cc.winboll.studio.libappbase.R;
+import android.content.res.Resources;
 
 /**
  * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
@@ -175,10 +176,11 @@ public class GlobalCrashReportView extends LinearLayout {
 	 * 初始化默认配置（无自定义属性时使用）
 	 */
 	private void initDefaultConfig() {
-		// 设置默认配色
-		mTitleColor = Color.WHITE;
-		mTitleBackgroundColor = Color.BLACK;
-		mTextColor = Color.BLACK;
+		// 设置默认配色（使用 debugTextColor 属性）
+		Resources.Theme theme = mContext.getTheme();
+		mTitleColor = theme.getResources().getColor(android.R.color.holo_green_dark);
+		mTitleBackgroundColor = Color.GRAY;
+		mTextColor = obtainDebugTextColor(theme);
 		mTextBackgroundColor = Color.WHITE;
 		// 加载布局
 		inflateView();
@@ -186,6 +188,21 @@ public class GlobalCrashReportView extends LinearLayout {
 		initWidgetStyle();
 	}
 
+	private int obtainDebugTextColor(Resources.Theme theme) {
+		int[] attrs = new int[] { cc.winboll.studio.libappbase.R.attr.themeDebug };
+		TypedArray themeTypedArray = theme.obtainStyledAttributes(attrs);
+		int themeResId = themeTypedArray.getResourceId(0, 0);
+		themeTypedArray.recycle();
+		if (themeResId != 0) {
+			int[] debugAttrs = new int[] { cc.winboll.studio.libappbase.R.attr.debugTextColor };
+			TypedArray debugTypedArray = theme.obtainStyledAttributes(themeResId, debugAttrs);
+			int color = debugTypedArray.getColor(0, Color.GRAY);
+			debugTypedArray.recycle();
+			return color;
+		}
+		return Color.GRAY;
+	}
+
 	/**
 	 * 初始化视图（解析自定义属性 + 加载布局 + 设置样式）
 	 * @param attrs 自定义属性集合
@@ -195,23 +212,20 @@ public class GlobalCrashReportView extends LinearLayout {
 		TypedArray typedArray = mContext.obtainStyledAttributes(
 			attrs,
 			R.styleable.GlobalCrashActivity,
-			R.attr.themeGlobalCrashActivity,
+			R.attr.themeDebug,
 			0
 		);
 
 		// 读取自定义属性值（无设置时使用默认值）
 		mTitleColor = typedArray.getColor(
 			R.styleable.GlobalCrashActivity_colorTittle,
-			Color.WHITE
+			Color.BLACK
 		);
 		mTitleBackgroundColor = typedArray.getColor(
 			R.styleable.GlobalCrashActivity_colorTittleBackgound, // 注：原拼写错误（Backgound→Background），保持与 attrs.xml 一致
 			Color.BLACK
 		);
-		mTextColor = typedArray.getColor(
-			R.styleable.GlobalCrashActivity_colorText,
-			Color.BLACK
-		);
+		mTextColor = obtainDebugTextColor(mContext.getTheme());
 		mTextBackgroundColor = typedArray.getColor(
 			R.styleable.GlobalCrashActivity_colorTextBackgound, // 注：原拼写错误，保持与 attrs.xml 一致
 			Color.WHITE
@@ -241,12 +255,8 @@ public class GlobalCrashReportView extends LinearLayout {
 	 * 初始化控件样式（设置配色和基础属性）
 	 */
 	private void initWidgetStyle() {
-		// 设置主布局背景颜色
-		setBackgroundColor(mTextBackgroundColor);
-
 		// 配置工具栏样式
 		if (mToolbar != null) {
-			mToolbar.setBackgroundColor(mTitleBackgroundColor);
 			mToolbar.setTitleTextColor(mTitleColor);
 			mToolbar.setSubtitleTextColor(mTitleColor);
 		}
@@ -254,8 +264,6 @@ public class GlobalCrashReportView extends LinearLayout {
 		// 配置日志文本控件样式
 		if (mTvReport != null) {
 			mTvReport.setTextColor(mTextColor);
-			mTvReport.setBackgroundColor(mTextBackgroundColor);
-			// 可选：设置日志文本换行方式（默认已换行，此处增强可读性）
 			mTvReport.setSingleLine(false);
 			mTvReport.setHorizontallyScrolling(false);
 		}
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
index 4c3c75a..8ac2fe9 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java
@@ -1,15 +1,12 @@
 package cc.winboll.studio.libappbase;
 
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/08/12 13:44:06
- * @Describe LogUtils
- * @Describe 应用日志类（补全所有日志重载方法，适配不同调试场景）
- */
 import android.content.Context;
+import android.util.Log;
 import android.widget.Toast;
+
 import cc.winboll.studio.libappbase.GlobalApplication;
 import dalvik.system.DexFile;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -29,82 +26,110 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-
+/**
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2026-05-09 15:46:28
+ * @EditTime 2026-05-11 15:36:12
+ * @Describe 应用日志工具类
+ * 补全多级别日志重载、自动日志文件裁剪、应用内TAG自动扫描管理；
+ * 支持日志本地持久化、异常堆栈格式化、TAG开关配置、线程与集合打印工具；
+ * 完全兼容Java7语法，严格遵循变量final编码规范；
+ * 重要说明：本类内部调试打印必须使用 android.util.Log，禁止使用LogUtils自身方法，
+ * 避免递归嵌套调用、逻辑漩涡与无限循环调用问题。
+ */
 public class LogUtils {
 
+    // ====================== 常量与枚举 ======================
     public static final String TAG = "LogUtils";
 
-    public static enum LOG_LEVEL { Off, Error, Warn, Info, Debug, Verbose }
+    /**
+     * 日志级别枚举
+     */
+    public static enum LOG_LEVEL {
+        Off,
+        Error,
+        Warn,
+        Info,
+        Debug,
+        Verbose
+		}
 
-    static volatile boolean _IsInited = false;
-    static Context _mContext;
-    // 日志显示时间格式
-    static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmss_SSS]", Locale.getDefault());
-    // 应用日志文件夹
-    static File _mfLogCacheDir;
-    static File _mfLogDataDir;
-    // 应用日志文件
-    static File _mfLogCatchFile;
-    static File _mfLogUtilsBeanFile;
-    static LogUtilsBean _mLogUtilsBean;
-    public static Map<String, Boolean> mapTAGList = new HashMap<String, Boolean>();
+    // ====================== 全局静态成员 ======================
+    private static volatile boolean _IsInited = false;
+    private static Context _mContext;
+    private static final SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmss_SSS]", Locale.getDefault());
+    private static File _mfLogCacheDir;
+    private static File _mfLogDataDir;
+    private static File _mfLogCatchFile;
+    private static File _mfLogUtilsBeanFile;
+    private static LogUtilsBean _mLogUtilsBean;
+    public static final Map<String, Boolean> mapTAGList = new HashMap<String, Boolean>();
 
-    //
-    // 初始化函数
-    //
-    public static void init(Context context) {
-        _mContext = context;
+    // ====================== 初始化入口 ======================
+    public static void init(final Context context) {
         init(context, LOG_LEVEL.Off);
     }
 
-    //
-    // 初始化函数
-    //
-    public static void init(Context context, LOG_LEVEL logLevel) {
+    public static void init(final Context context, final LOG_LEVEL logLevel) {
+        Log.d(TAG, "init 执行日志工具初始化");
+        _mContext = context;
+
         if (GlobalApplication.isDebugging()) {
-            // 初始化日志缓存文件路径（debug模式：外部存储）
-            _mfLogCacheDir = new File(context.getApplicationContext().getExternalCacheDir(), TAG);
-            if (!_mfLogCacheDir.exists()) {
-                _mfLogCacheDir.mkdirs();
-            }
-            _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
-
-            // 初始化日志配置文件路径
-            _mfLogDataDir = context.getApplicationContext().getExternalFilesDir(TAG);
-            if (!_mfLogDataDir.exists()) {
-                _mfLogDataDir.mkdirs();
-            }
-            _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
+            initDebugDir();
         } else {
-            // 初始化日志缓存文件路径（release模式：内部存储）
-            _mfLogCacheDir = new File(context.getApplicationContext().getCacheDir(), TAG);
-            if (!_mfLogCacheDir.exists()) {
-                _mfLogCacheDir.mkdirs();
-            }
-            _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
-
-            // 初始化日志配置文件路径
-            _mfLogDataDir = new File(context.getApplicationContext().getFilesDir(), TAG);
-            if (!_mfLogDataDir.exists()) {
-                _mfLogDataDir.mkdirs();
-            }
-            _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
+            initReleaseDir();
         }
 
+        initLogConfigBean();
+        addClassTAGList();
+        loadTAGBeanSettings();
+        checkAndTrimLogFileSize();
+
+        _IsInited = true;
+        Log.d(TAG, "init 日志工具初始化完成");
+    }
+
+    // ====================== 目录初始化 ======================
+    private static void initDebugDir() {
+        final Context appContext = _mContext.getApplicationContext();
+        _mfLogCacheDir = new File(appContext.getExternalCacheDir(), TAG);
+        if (!_mfLogCacheDir.exists()) {
+            _mfLogCacheDir.mkdirs();
+        }
+        _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
+
+        _mfLogDataDir = appContext.getExternalFilesDir(TAG);
+        if (!_mfLogDataDir.exists()) {
+            _mfLogDataDir.mkdirs();
+        }
+        _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
+    }
+
+    private static void initReleaseDir() {
+        final Context appContext = _mContext.getApplicationContext();
+        _mfLogCacheDir = new File(appContext.getCacheDir(), TAG);
+        if (!_mfLogCacheDir.exists()) {
+            _mfLogCacheDir.mkdirs();
+        }
+        _mfLogCatchFile = new File(_mfLogCacheDir, "log.txt");
+
+        _mfLogDataDir = new File(appContext.getFilesDir(), TAG);
+        if (!_mfLogDataDir.exists()) {
+            _mfLogDataDir.mkdirs();
+        }
+        _mfLogUtilsBeanFile = new File(_mfLogDataDir, TAG + ".json");
+    }
+
+    private static void initLogConfigBean() {
         _mLogUtilsBean = LogUtilsBean.loadBeanFromFile(_mfLogUtilsBeanFile.getPath(), LogUtilsBean.class);
         if (_mLogUtilsBean == null) {
             _mLogUtilsBean = new LogUtilsBean();
             _mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
+            Log.d(TAG, "initLogConfigBean 自动创建默认日志配置文件");
         }
-
-        // 加载当前应用下的所有类的 TAG
-        addClassTAGList();
-        loadTAGBeanSettings();
-        checkAndTrimLogFileSize();
-        _IsInited = true;
-        LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
     }
 
+    // ====================== 日志文件裁剪 ======================
     private static void checkAndTrimLogFileSize() {
         if (_mfLogCatchFile == null || !_mfLogCatchFile.exists()) {
             return;
@@ -112,484 +137,392 @@ public class LogUtils {
 
         final long MAX_FILE_SIZE = 6291456L;
         final long KEEP_FILE_SIZE = 3145728L;
+        final long fileSize = _mfLogCatchFile.length();
 
-        long fileSize = _mfLogCatchFile.length();
         if (fileSize <= MAX_FILE_SIZE) {
             return;
         }
 
-        long needSkip = fileSize - KEEP_FILE_SIZE;
+        final long needSkip = fileSize - KEEP_FILE_SIZE;
+        final String lineBreak = System.lineSeparator();
 
-        try (FileInputStream fis = new FileInputStream(_mfLogCatchFile);
-             BufferedReader reader = new BufferedReader(new InputStreamReader(fis));
-             FileOutputStream fos = new FileOutputStream(_mfLogCatchFile);
-             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos))) {
+        FileInputStream fis = null;
+        BufferedReader reader = null;
+        FileOutputStream fos = null;
+        BufferedWriter writer = null;
 
-            StringBuilder sb = new StringBuilder();
+        try {
+            fis = new FileInputStream(_mfLogCatchFile);
+            reader = new BufferedReader(new InputStreamReader(fis));
+            fos = new FileOutputStream(_mfLogCatchFile);
+            writer = new BufferedWriter(new OutputStreamWriter(fos));
+
+            final StringBuilder sb = new StringBuilder();
             String line;
             long skippedTotal = 0;
-            final String lineBreak = System.lineSeparator();
 
             while ((line = reader.readLine()) != null) {
-                byte[] lineBytes = line.getBytes();
+                final byte[] lineBytes = line.getBytes();
                 skippedTotal += lineBytes.length + lineBreak.getBytes().length;
-
                 if (skippedTotal > needSkip) {
                     sb.append(line).append(lineBreak);
                 }
             }
-
             writer.write(sb.toString());
-
+            Log.d(TAG, "checkAndTrimLogFileSize 日志文件裁剪完成");
         } catch (IOException e) {
-            e.printStackTrace();
+            Log.e(TAG, "checkAndTrimLogFileSize 日志文件裁剪失败", e);
+        } finally {
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+            } catch (IOException e) {}
+            try {
+                if (fis != null) {
+                    fis.close();
+                }
+            } catch (IOException e) {}
+            try {
+                if (writer != null) {
+                    writer.close();
+                }
+            } catch (IOException e) {}
+            try {
+                if (fos != null) {
+                    fos.close();
+                }
+            } catch (IOException e) {}
         }
     }
 
+    // ====================== TAG 配置管理 ======================
     public static Map<String, Boolean> getMapTAGList() {
         return mapTAGList;
     }
 
-    static void loadTAGBeanSettings() {
-        ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
+    private static void loadTAGBeanSettings() {
+        final ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
         LogUtilsClassTAGBean.loadBeanList(_mContext, list, LogUtilsClassTAGBean.class);
-        for (int i = 0; i < list.size(); i++) {
-            LogUtilsClassTAGBean beanSetting = list.get(i);
-            for (Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
-                if (entry.getKey().equals(beanSetting.getTag())) {
-                    entry.setValue(beanSetting.getEnable());
-                }
+
+        for (final LogUtilsClassTAGBean beanSetting : list) {
+            final String tag = beanSetting.getTag();
+            if (mapTAGList.containsKey(tag)) {
+                mapTAGList.put(tag, beanSetting.getEnable());
             }
         }
     }
 
-    static void saveTAGBeanSettings() {
-        ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
-        for (Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
+    private static void saveTAGBeanSettings() {
+        final ArrayList<LogUtilsClassTAGBean> list = new ArrayList<LogUtilsClassTAGBean>();
+        for (final Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
             list.add(new LogUtilsClassTAGBean(entry.getKey(), entry.getValue()));
         }
         LogUtilsClassTAGBean.saveBeanList(_mContext, list, LogUtilsClassTAGBean.class);
     }
 
-    static void addClassTAGList() {
+    private static void addClassTAGList() {
         try {
-            // 包名前缀（过滤当前应用的类）
-            String packageNamePrefix = "cc.winboll.studio";
-            List<String> classNames = new ArrayList<>();
-            String apkPath = _mContext.getPackageCodePath();
-            LogUtils.d(TAG, String.format("apkPath : %s", apkPath));
+            final String packageNamePrefix = "cc.winboll.studio";
+            final List<String> classNames = new ArrayList<String>();
+            final String apkPath = _mContext.getPackageCodePath();
 
-            DexFile dexfile = new DexFile(apkPath);
-            int countTemp = 0;
+            final DexFile dexfile = new DexFile(apkPath);
             Enumeration<String> entries = dexfile.entries();
+
             while (entries.hasMoreElements()) {
-                countTemp++;
-                String className = entries.nextElement();
+                final String className = entries.nextElement();
                 if (className.startsWith(packageNamePrefix)) {
                     classNames.add(className);
                 }
             }
 
-            LogUtils.d(TAG, String.format("countTemp : %d\nClassNames size : %d", countTemp, classNames.size()));
-
-            for (String className : classNames) {
+            for (final String className : classNames) {
                 try {
-                    Class<?> clazz = Class.forName(className);
-                    Field[] fields = clazz.getDeclaredFields();
-                    for (Field field : fields) {
-                        // 过滤静态、公共、String类型的 TAG 字段
-                        if (Modifier.isStatic(field.getModifiers()) 
-							&& Modifier.isPublic(field.getModifiers()) 
-							&& field.getType() == String.class 
+                    final Class<?> clazz = Class.forName(className);
+                    final Field[] fields = clazz.getDeclaredFields();
+
+                    for (final Field field : fields) {
+                        if (Modifier.isStatic(field.getModifiers())
+							&& Modifier.isPublic(field.getModifiers())
+							&& field.getType() == String.class
 							&& "TAG".equals(field.getName())) {
-                            String tagValue = (String) field.get(null);
-                            mapTAGList.put(tagValue, false); // 默认禁用，可通过设置开启
+
+                            final String tagValue = (String) field.get(null);
+                            mapTAGList.put(tagValue, false);
                         }
                     }
-                } catch (NoClassDefFoundError | ClassNotFoundException | IllegalAccessException e) {
-                    LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
+                } catch (NoClassDefFoundError e) {
+                    Log.w(TAG, "addClassTAGList 解析类TAG失败 NoClassDefFoundError");
+                } catch (ClassNotFoundException e) {
+                    Log.w(TAG, "addClassTAGList 解析类TAG失败 ClassNotFoundException");
+                } catch (IllegalAccessException e) {
+                    Log.w(TAG, "addClassTAGList 解析类TAG失败 IllegalAccessException");
                 }
             }
         } catch (IOException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            Log.e(TAG, "addClassTAGList 扫描Dex异常", e);
         }
     }
 
-    public static void setTAGListEnable(String tag, boolean isEnable) {
-        Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
+    public static void setTAGListEnable(final String tag, final boolean isEnable) {
+        final Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
         while (iterator.hasNext()) {
-            Map.Entry<String, Boolean> entry = iterator.next();
+            final Map.Entry<String, Boolean> entry = iterator.next();
             if (tag.equals(entry.getKey())) {
                 entry.setValue(isEnable);
                 break;
             }
         }
         saveTAGBeanSettings();
-        LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
+        Log.d(TAG, "setTAGListEnable 更新TAG开关配置");
     }
 
-    public static void setALlTAGListEnable(boolean isEnable) {
-        Iterator<Map.Entry<String, Boolean>> iterator = mapTAGList.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<String, Boolean> entry = iterator.next();
+    public static void setALlTAGListEnable(final boolean isEnable) {
+        for (final Map.Entry<String, Boolean> entry : mapTAGList.entrySet()) {
             entry.setValue(isEnable);
         }
         saveTAGBeanSettings();
-        LogUtils.d(TAG, String.format("mapTAGList : %s", mapTAGList.toString()));
+        Log.d(TAG, "setALlTAGListEnable 全量设置TAG开关");
     }
 
-    public static void setLogLevel(LOG_LEVEL logLevel) {
-        LogUtils._mLogUtilsBean.setLogLevel(logLevel);
+    // ====================== 日志级别控制 ======================
+    public static void setLogLevel(final LOG_LEVEL logLevel) {
+        _mLogUtilsBean.setLogLevel(logLevel);
         _mLogUtilsBean.saveBeanToFile(_mfLogUtilsBeanFile.getPath(), _mLogUtilsBean);
     }
 
     public static LOG_LEVEL getLogLevel() {
-        return LogUtils._mLogUtilsBean.getLogLevel();
+        return _mLogUtilsBean.getLogLevel();
     }
 
-    static boolean isLoggable(String tag, LOG_LEVEL logLevel) {
+    private static boolean isLoggable(final String tag, final LOG_LEVEL logLevel) {
         if (!_IsInited) {
             return false;
-        } 
-        // TAG 未配置或禁用时，不打印日志
+        }
         if (mapTAGList.get(tag) == null || !mapTAGList.get(tag)) {
             return false;
-        } 
-        // 日志级别不符合时，不打印日志
-        if (!isInTheLevel(logLevel)) {
-            return false;
         }
-        return true;
+        return isInTheLevel(logLevel);
     }
 
-    static boolean isInTheLevel(LOG_LEVEL logLevel) {
-        // 当前日志级别 >= 目标级别时，允许打印（级别顺序：Off < Error < Warn < Info < Debug < Verbose）
-        return LogUtils._mLogUtilsBean.getLogLevel().ordinal() >= logLevel.ordinal();
+    private static boolean isInTheLevel(final LOG_LEVEL logLevel) {
+        return _mLogUtilsBean.getLogLevel().ordinal() >= logLevel.ordinal();
     }
 
-    //
-    // 获取应用日志文件夹
-    //
+    // ====================== 基础对外方法 ======================
     public static File getLogCacheDir() {
         return _mfLogCacheDir;
     }
 
-    // ================================= 补全所有日志重载方法（Error 级别） =================================
-    /**
-     * Error 级别日志（仅消息）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     */
-    public static void e(String szTAG, String szMessage) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Error)) {
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Error, szMessage);
+    public static boolean isInited() {
+        return _IsInited;
+    }
+
+    // ====================== Error 日志重载（补齐缺失方法） ======================
+    public static void e(final String szTAG, final String szMessage) {
+        if (isLoggable(szTAG, LOG_LEVEL.Error)) {
+            saveLog(szTAG, LOG_LEVEL.Error, szMessage);
         }
     }
 
-    /**
-     * Error 级别日志（消息 + 异常）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param e 异常对象
-     */
-    public static void e(String szTAG, String szMessage, Exception e) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Error)) {
-            StringBuilder sb = new StringBuilder(szMessage);
+    public static void e(final String szTAG, final String szMessage, final Exception e) {
+        if (isLoggable(szTAG, LOG_LEVEL.Error)) {
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【异常信息】: ").append(getExceptionInfo(e));
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Error, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Error, sb.toString());
         }
     }
 
-    /**
-     * Error 级别日志（仅异常）
-     * @param szTAG 标签
-     * @param e 异常对象
-     */
-    public static void e(String szTAG, Exception e) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Error)) {
-            String message = "【异常信息】: " + getExceptionInfo(e);
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Error, message);
+    public static void e(final String szTAG, final Exception e) {
+        if (isLoggable(szTAG, LOG_LEVEL.Error)) {
+            final String message = "【异常信息】: " + getExceptionInfo(e);
+            saveLog(szTAG, LOG_LEVEL.Error, message);
         }
     }
 
-    /**
-     * Error 级别日志（消息 + 异常 + 堆栈）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param e 异常对象
-     * @param listStackTrace 堆栈信息
-     */
-    public static void e(String szTAG, String szMessage, Exception e, StackTraceElement[] listStackTrace) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Error)) {
-            StringBuilder sb = new StringBuilder(szMessage);
+    public static void e(final String szTAG, final String szMessage, final Exception e, final StackTraceElement[] listStackTrace) {
+        if (isLoggable(szTAG, LOG_LEVEL.Error)) {
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【异常信息】: ").append(getExceptionInfo(e));
             sb.append("\n【堆栈信息】: ").append(getStackTraceInfo(listStackTrace));
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Error, sb.toString());
-        }
-    }
-
-    // ================================= 补全所有日志重载方法（Warn 级别） =================================
-    /**
-     * Warn 级别日志（仅消息）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     */
-    public static void w(String szTAG, String szMessage) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Warn)) {
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Warn, szMessage);
+            saveLog(szTAG, LOG_LEVEL.Error, sb.toString());
         }
     }
 
     /**
-     * Warn 级别日志（消息 + 异常）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param e 异常对象
+     * 补齐你需要的：LogUtils.e(TAG, "uncaughtException: 崩溃处理异常", e)
      */
-    public static void w(String szTAG, String szMessage, Exception e) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Warn)) {
-            StringBuilder sb = new StringBuilder(szMessage);
+    public static void e(final String szTAG, final String szMessage, final Throwable e) {
+        if (isLoggable(szTAG, LOG_LEVEL.Error)) {
+            final StringBuilder sb = new StringBuilder(szMessage);
+            sb.append("\n【异常信息】: ").append(getThrowableInfo(e));
+            saveLog(szTAG, LOG_LEVEL.Error, sb.toString());
+        }
+    }
+
+    // ====================== Warn 日志重载 ======================
+    public static void w(final String szTAG, final String szMessage) {
+        if (isLoggable(szTAG, LOG_LEVEL.Warn)) {
+            saveLog(szTAG, LOG_LEVEL.Warn, szMessage);
+        }
+    }
+
+    public static void w(final String szTAG, final String szMessage, final Exception e) {
+        if (isLoggable(szTAG, LOG_LEVEL.Warn)) {
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【异常信息】: ").append(getExceptionInfo(e));
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Warn, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Warn, sb.toString());
         }
     }
 
-    /**
-     * Warn 级别日志（仅异常）
-     * @param szTAG 标签
-     * @param e 异常对象
-     */
-    public static void w(String szTAG, Exception e) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Warn)) {
-            String message = "【异常信息】: " + getExceptionInfo(e);
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Warn, message);
+    public static void w(final String szTAG, final Exception e) {
+        if (isLoggable(szTAG, LOG_LEVEL.Warn)) {
+            final String message = "【异常信息】: " + getExceptionInfo(e);
+            saveLog(szTAG, LOG_LEVEL.Warn, message);
         }
     }
 
-    // ================================= 补全所有日志重载方法（Info 级别） =================================
-    /**
-     * Info 级别日志（仅消息）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     */
-    public static void i(String szTAG, String szMessage) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Info)) {
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Info, szMessage);
+    // ====================== Info 日志重载 ======================
+    public static void i(final String szTAG, final String szMessage) {
+        if (isLoggable(szTAG, LOG_LEVEL.Info)) {
+            saveLog(szTAG, LOG_LEVEL.Info, szMessage);
         }
     }
 
-    /**
-     * Info 级别日志（消息 + 数据对象）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param obj 数据对象（自动转为字符串）
-     */
-    public static void i(String szTAG, String szMessage, Object obj) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Info)) {
-            String objStr = obj == null ? "null" : obj.toString();
-            StringBuilder sb = new StringBuilder(szMessage);
+    public static void i(final String szTAG, final String szMessage, final Object obj) {
+        if (isLoggable(szTAG, LOG_LEVEL.Info)) {
+            final String objStr = obj == null ? "null" : obj.toString();
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【数据对象】: ").append(objStr);
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Info, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Info, sb.toString());
         }
     }
 
-    // ================================= 补全所有日志重载方法（Debug 级别） =================================
-    /**
-     * Debug 级别日志（仅消息）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     */
-    public static void d(String szTAG, String szMessage) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, szMessage);
+    // ====================== Debug 日志重载 ======================
+    public static void d(final String szTAG, final String szMessage) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug)) {
+            saveLog(szTAG, LOG_LEVEL.Debug, szMessage);
         }
     }
 
-    /**
-     * Debug 级别日志（消息 + 堆栈）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param listStackTrace 堆栈信息
-     */
-    public static void d(String szTAG, String szMessage, StackTraceElement[] listStackTrace) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
-            StringBuilder sbMessage = new StringBuilder(szMessage);
+    public static void d(final String szTAG, final String szMessage, final StackTraceElement[] listStackTrace) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug)) {
+            final StringBuilder sbMessage = new StringBuilder(szMessage);
             sbMessage.append("\n【调用堆栈】: ").append(getStackTraceInfo(listStackTrace));
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sbMessage.toString());
+            saveLog(szTAG, LOG_LEVEL.Debug, sbMessage.toString());
         }
     }
 
-    /**
-     * Debug 级别日志（消息 + 异常）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param e 异常对象
-     */
-    public static void d(String szTAG, String szMessage, Exception e) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
-            StringBuilder sb = new StringBuilder(szMessage);
+    public static void d(final String szTAG, final String szMessage, final Exception e) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug)) {
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【异常信息】: ").append(getExceptionInfo(e));
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Debug, sb.toString());
         }
     }
 
-    /**
-     * Debug 级别日志（异常 + 堆栈）
-     * @param szTAG 标签
-     * @param e 异常对象
-     * @param listStackTrace 堆栈信息
-     */
-    public static void d(String szTAG, Exception e, StackTraceElement[] listStackTrace) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
-            StringBuilder sbMessage = new StringBuilder();
+    public static void d(final String szTAG, final Exception e, final StackTraceElement[] listStackTrace) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug)) {
+            final StringBuilder sbMessage = new StringBuilder();
             sbMessage.append("【异常信息】: ").append(getExceptionInfo(e));
             sbMessage.append("\n【调用堆栈】: ").append(getStackTraceInfo(listStackTrace));
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sbMessage.toString());
+            saveLog(szTAG, LOG_LEVEL.Debug, sbMessage.toString());
         }
     }
 
-    /**
-     * Debug 级别日志（消息 + 数据对象）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param obj 数据对象（自动转为字符串）
-     */
-	public static void d(String szTAG, String szMessage, Object obj) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
-            String objStr = obj == null ? "null" : obj.toString();
-            StringBuilder sb = new StringBuilder(szMessage);
+    public static void d(final String szTAG, final String szMessage, final Object obj) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug)) {
+            final String objStr = obj == null ? "null" : obj.toString();
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【数据对象】: ").append(objStr);
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Debug, sb.toString());
         }
     }
 
-    /**
-     * Debug 级别日志（仅数据对象）
-     * @param szTAG 标签
-     * @param obj 数据对象（自动转为字符串）
-     */
-    public static void d(String szTAG, Object obj) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
-            String objStr = obj == null ? "null" : obj.toString();
-            String message = "【数据对象】: " + objStr;
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, message);
+    public static void d(final String szTAG, final Object obj) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug)) {
+            final String objStr = obj == null ? "null" : obj.toString();
+            final String message = "【数据对象】: " + objStr;
+            saveLog(szTAG, LOG_LEVEL.Debug, message);
         }
     }
 
-    // ================================= 补全所有日志重载方法（Verbose 级别） =================================
-    /**
-     * Verbose 级别日志（仅消息）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     */
-    public static void v(String szTAG, String szMessage) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Verbose)) {
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Verbose, szMessage);
+    // ====================== Verbose 日志重载 ======================
+    public static void v(final String szTAG, final String szMessage) {
+        if (isLoggable(szTAG, LOG_LEVEL.Verbose)) {
+            saveLog(szTAG, LOG_LEVEL.Verbose, szMessage);
         }
     }
 
-    /**
-     * Verbose 级别日志（消息 + 数据对象）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param obj 数据对象（自动转为字符串）
-     */
-    public static void v(String szTAG, String szMessage, Object obj) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Verbose)) {
-            String objStr = obj == null ? "null" : obj.toString();
-            StringBuilder sb = new StringBuilder(szMessage);
+    public static void v(final String szTAG, final String szMessage, final Object obj) {
+        if (isLoggable(szTAG, LOG_LEVEL.Verbose)) {
+            final String objStr = obj == null ? "null" : obj.toString();
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【数据对象】: ").append(objStr);
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Verbose, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Verbose, sb.toString());
         }
     }
 
-    /**
-     * Verbose 级别日志（仅数据对象）
-     * @param szTAG 标签
-     * @param obj 数据对象（自动转为字符串）
-     */
-    public static void v(String szTAG, Object obj) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Verbose)) {
-            String objStr = obj == null ? "null" : obj.toString();
-            String message = "【数据对象】: " + objStr;
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Verbose, message);
+    public static void v(final String szTAG, final Object obj) {
+        if (isLoggable(szTAG, LOG_LEVEL.Verbose)) {
+            final String objStr = obj == null ? "null" : obj.toString();
+            final String message = "【数据对象】: " + objStr;
+            saveLog(szTAG, LOG_LEVEL.Verbose, message);
         }
     }
 
-    // ================================= 新增：通用日志工具方法（补充调试能力） =================================
-    /**
-     * 打印当前线程信息（Debug 级别）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     */
-    public static void printThreadInfo(String szTAG, String szMessage) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug)) {
-            Thread currentThread = Thread.currentThread();
-            StringBuilder sb = new StringBuilder(szMessage);
+    // ====================== 扩展工具打印 ======================
+    public static void printThreadInfo(final String szTAG, final String szMessage) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug)) {
+            final Thread currentThread = Thread.currentThread();
+            final StringBuilder sb = new StringBuilder(szMessage);
             sb.append("\n【线程信息】: ")
 				.append("线程名=").append(currentThread.getName())
 				.append(", 线程ID=").append(currentThread.getId())
 				.append(", 线程状态=").append(currentThread.getState().name());
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Debug, sb.toString());
         }
     }
 
-    /**
-     * 打印 Map 数据（Debug 级别，格式化输出，便于查看）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param map 要打印的 Map 数据
-     */
-    public static <K, V> void printMap(String szTAG, String szMessage, Map<K, V> map) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug) && map != null) {
-            StringBuilder sb = new StringBuilder(szMessage);
-            sb.append("\n【Map 数据】（size=").append(map.size()).append("）:");
-            for (Map.Entry<K, V> entry : map.entrySet()) {
-                String keyStr = entry.getKey() == null ? "null" : entry.getKey().toString();
-                String valueStr = entry.getValue() == null ? "null" : entry.getValue().toString();
+    public static <K, V> void printMap(final String szTAG, final String szMessage, final Map<K, V> map) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug) && map != null) {
+            final StringBuilder sb = new StringBuilder(szMessage);
+            sb.append("\n【Map 数据】size=").append(map.size());
+            for (final Map.Entry<K, V> entry : map.entrySet()) {
+                final String keyStr = entry.getKey() == null ? "null" : entry.getKey().toString();
+                final String valueStr = entry.getValue() == null ? "null" : entry.getValue().toString();
                 sb.append("\n  ").append(keyStr).append(" = ").append(valueStr);
             }
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Debug, sb.toString());
         }
     }
 
-    /**
-     * 打印 List 数据（Debug 级别，格式化输出）
-     * @param szTAG 标签
-     * @param szMessage 日志消息
-     * @param list 要打印的 List 数据
-     */
-    public static <T> void printList(String szTAG, String szMessage, List<T> list) {
-        if (isLoggable(szTAG, LogUtils.LOG_LEVEL.Debug) && list != null) {
-            StringBuilder sb = new StringBuilder(szMessage);
-            sb.append("\n【List 数据】（size=").append(list.size()).append("）:");
+    public static <T> void printList(final String szTAG, final String szMessage, final List<T> list) {
+        if (isLoggable(szTAG, LOG_LEVEL.Debug) && list != null) {
+            final StringBuilder sb = new StringBuilder(szMessage);
+            sb.append("\n【List 数据】size=").append(list.size());
             for (int i = 0; i < list.size(); i++) {
-                T item = list.get(i);
-                String itemStr = item == null ? "null" : item.toString();
+                final T item = list.get(i);
+                final String itemStr = item == null ? "null" : item.toString();
                 sb.append("\n  索引").append(i).append(" = ").append(itemStr);
             }
-            saveLog(szTAG, LogUtils.LOG_LEVEL.Debug, sb.toString());
+            saveLog(szTAG, LOG_LEVEL.Debug, sb.toString());
         }
     }
 
-    // ================================= 私有工具方法（异常/堆栈信息格式化） =================================
-    /**
-     * 格式化异常信息（提取异常类型、消息、简化堆栈）
-     * @param e 异常对象
-     * @return 格式化后的异常字符串
-     */
-    private static String getExceptionInfo(Exception e) {
+    // ====================== 私有格式化工具 ======================
+    private static String getExceptionInfo(final Exception e) {
         if (e == null) {
             return "异常对象为null";
         }
-        StringBuilder sb = new StringBuilder();
-        // 异常类型 + 异常消息
-        sb.append(e.getClass().getSimpleName()).append(" : ").append(e.getMessage() == null ? "无异常消息" : e.getMessage());
-        // 简化堆栈（取前5行，避免日志过长）
-        StackTraceElement[] stackTrace = e.getStackTrace();
+        final StringBuilder sb = new StringBuilder();
+        sb.append(e.getClass().getSimpleName()).append(" : ")
+			.append(e.getMessage() == null ? "无异常消息" : e.getMessage());
+
+        final StackTraceElement[] stackTrace = e.getStackTrace();
         if (stackTrace != null && stackTrace.length > 0) {
-            sb.append("\n  简化堆栈（前5行）:");
-            int limit = Math.min(stackTrace.length, 5);
+            final int limit = Math.min(stackTrace.length, 5);
             for (int i = 0; i < limit; i++) {
                 sb.append("\n    ").append(stackTrace[i].toString());
             }
@@ -597,20 +530,31 @@ public class LogUtils {
         return sb.toString();
     }
 
-    /**
-     * 格式化堆栈信息（提取关键调用链路）
-     * @param stackTrace 堆栈数组
-     * @return 格式化后的堆栈字符串
-     */
-    private static String getStackTraceInfo(StackTraceElement[] stackTrace) {
+    private static String getThrowableInfo(final Throwable e) {
+        if (e == null) {
+            return "异常对象为null";
+        }
+        final StringBuilder sb = new StringBuilder();
+        sb.append(e.getClass().getSimpleName()).append(" : ")
+			.append(e.getMessage() == null ? "无异常消息" : e.getMessage());
+
+        final StackTraceElement[] stackTrace = e.getStackTrace();
+        if (stackTrace != null && stackTrace.length > 0) {
+            final int limit = Math.min(stackTrace.length, 5);
+            for (int i = 0; i < limit; i++) {
+                sb.append("\n    ").append(stackTrace[i].toString());
+            }
+        }
+        return sb.toString();
+    }
+
+    private static String getStackTraceInfo(final StackTraceElement[] stackTrace) {
         if (stackTrace == null || stackTrace.length == 0) {
             return "堆栈信息为空";
         }
-        StringBuilder sb = new StringBuilder();
-        // 过滤 LogUtils 内部调用，取真实业务调用链路（前8行）
+        final StringBuilder sb = new StringBuilder();
         int count = 0;
-        for (StackTraceElement element : stackTrace) {
-            // 跳过 LogUtils 自身的堆栈（避免冗余）
+        for (final StackTraceElement element : stackTrace) {
             if (element.getClassName().contains("cc.winboll.studio.libappbase.LogUtils")) {
                 continue;
             }
@@ -618,157 +562,122 @@ public class LogUtils {
 				.append(element.getMethodName()).append("(")
 				.append(element.getFileName()).append(":").append(element.getLineNumber()).append(")");
             count++;
-            if (count >= 8) { // 限制堆栈长度，避免日志过大
+            if (count >= 8) {
                 break;
             }
         }
         return sb.toString();
     }
 
-    // ================================= 原有核心方法（保留并优化） =================================
-    /**
-     * 日志文件保存函数（优化：增加异常捕获完整性，避免流泄漏）
-     * @param szTAG 标签
-     * @param logLevel 日志级别
-     * @param szMessage 日志消息
-     */
-    static void saveLog(String szTAG, LogUtils.LOG_LEVEL logLevel, String szMessage) {
+    // ====================== 日志持久化读写 ======================
+    private static void saveLog(final String szTAG, final LogUtils.LOG_LEVEL logLevel, final String szMessage) {
         BufferedWriter out = null;
         try {
-            // 确保日志文件存在（创建父目录 + 文件）
             if (!_mfLogCatchFile.exists()) {
-                File parentDir = _mfLogCatchFile.getParentFile();
+                final File parentDir = _mfLogCatchFile.getParentFile();
                 if (parentDir != null && !parentDir.exists()) {
                     parentDir.mkdirs();
                 }
                 _mfLogCatchFile.createNewFile();
             }
-            // 追加写入日志（UTF-8编码，避免中文乱码）
             out = new BufferedWriter(new OutputStreamWriter(
 										 new FileOutputStream(_mfLogCatchFile, true), "UTF-8"));
-            String logLine = "[" + logLevel + "]  " 
-				+ mSimpleDateFormat.format(System.currentTimeMillis()) 
-				+ "  [" + szTAG + "]\n" 
-				+ szMessage + "\n\n"; // 增加空行，区分不同日志
+            final String logLine = "[" + logLevel + "]  "
+				+ mSimpleDateFormat.format(System.currentTimeMillis())
+				+ "  [" + szTAG + "]\n"
+				+ szMessage + "\n\n";
             out.write(logLine);
-            out.flush(); // 强制刷新，确保日志及时写入
+            out.flush();
         } catch (IOException e) {
-            // 日志写入失败时，打印系统日志（避免递归调用）
-            android.util.Log.e(TAG, "日志写入失败: " + e.getMessage());
+            Log.e(TAG, "saveLog 日志写入失败", e);
         } finally {
-            // 关闭流，避免资源泄漏（Java 7 手动关闭，无 try-with-resources）
             if (out != null) {
                 try {
                     out.close();
                 } catch (IOException e) {
-                    android.util.Log.e(TAG, "流关闭失败: " + e.getMessage());
+                    Log.e(TAG, "saveLog 流关闭失败", e);
                 }
             }
         }
     }
 
-    /**
-     * 历史日志加载函数（优化：增加流关闭，避免内存泄漏）
-     * @return 日志内容字符串（空串表示无日志）
-     */
     public static String loadLog() {
         if (_mfLogCatchFile == null || !_mfLogCatchFile.exists()) {
             return "日志文件不存在";
         }
-        StringBuffer sb = new StringBuffer();
+        final StringBuffer sb = new StringBuffer();
         BufferedReader in = null;
         try {
             in = new BufferedReader(new InputStreamReader(
 										new FileInputStream(_mfLogCatchFile), "UTF-8"));
-            String line = "";
+            String line;
             while ((line = in.readLine()) != null) {
-                sb.append(line);
-                sb.append("\n");
+                sb.append(line).append("\n");
             }
         } catch (IOException e) {
-            sb.append("日志加载失败: ").append(e.getMessage());
-            LogUtils.e(TAG, "日志加载异常", e);
+            sb.append("日志加载失败");
+            Log.e(TAG, "loadLog 读取日志异常", e);
         } finally {
-            // 关闭流，避免资源泄漏
             if (in != null) {
                 try {
                     in.close();
                 } catch (IOException e) {
-                    LogUtils.e(TAG, "流关闭异常", e);
+                    Log.e(TAG, "loadLog 读取流关闭异常", e);
                 }
             }
         }
         return sb.toString();
     }
 
-    /**
-     * 清理日志函数（优化：支持清空日志，避免文件过大）
-     */
     public static void cleanLog() {
         if (_mfLogCatchFile == null) {
-            LogUtils.d(TAG, "日志文件未初始化，无需清理");
+            Log.d(TAG, "cleanLog 日志文件未初始化");
             return;
         }
+        BufferedWriter out = null;
         try {
-            // 清空文件内容（覆盖写入空字符串）
-            BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
-														new FileOutputStream(_mfLogCatchFile, false), "UTF-8"));
+            out = new BufferedWriter(new OutputStreamWriter(
+										 new FileOutputStream(_mfLogCatchFile, false), "UTF-8"));
             out.write("");
             out.flush();
-            out.close();
-            LogUtils.d(TAG, "日志已清空，文件路径: " + _mfLogCatchFile.getPath());
+            Log.d(TAG, "cleanLog 日志已清空");
         } catch (IOException e) {
-            LogUtils.e(TAG, "日志清空失败", e);
+            Log.e(TAG, "cleanLog 清空日志失败", e);
+        } finally {
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "cleanLog 流关闭异常", e);
+                }
+            }
         }
     }
 
-    /**
-     * 检查日志文件大小（新增：避免日志文件过大占用内存）
-     * @param maxSizeMB 最大允许大小（MB）
-     * @return true：文件超过限制；false：文件大小正常
-     */
-    public static boolean checkLogFileSize(int maxSizeMB) {
+    public static boolean checkLogFileSize(final int maxSizeMB) {
         if (_mfLogCatchFile == null || !_mfLogCatchFile.exists()) {
             return false;
         }
-        // 转换为字节（1MB = 1024*1024 字节）
-        long maxSizeByte = maxSizeMB * 1024 * 1024;
-        long fileSize = _mfLogCatchFile.length();
-        LogUtils.d(TAG, String.format("日志文件大小: %.2f MB（限制: %d MB）", 
-									  fileSize / (1024.0 * 1024), maxSizeMB));
+        final long maxSizeByte = 1048576L * maxSizeMB;
+        final long fileSize = _mfLogCatchFile.length();
         return fileSize > maxSizeByte;
     }
 
-    /**
-     * 初始化检查（新增：快速判断 LogUtils 是否初始化完成）
-     * @return true：已初始化；false：未初始化
-     */
-    public static boolean isInited() {
-        return _IsInited;
-    }
-
-    /**
-     * 显示短提示（新增：日志+Toast联动，调试时快速提示）
-     * @param context 上下文
-     * @param message 提示内容
-     */
     public static void showShortToast(final Context context, final String message) {
         if (context == null || message == null) {
             return;
         }
-        // 主线程显示Toast，避免子线程崩溃
         if (Thread.currentThread().getId() == android.os.Process.myTid()) {
             Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
         } else {
-            ((android.app.Activity) context).runOnUiThread(new Runnable() {
+            final Context uiContext = context;
+            ((android.app.Activity) uiContext).runOnUiThread(new Runnable() {
 					@Override
 					public void run() {
-						Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+						Toast.makeText(uiContext, message, Toast.LENGTH_SHORT).show();
 					}
 				});
         }
-        // 同时写入日志
-        LogUtils.d(TAG, "Toast提示: " + message);
     }
 }
 
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
index fa2f438..56f5d38 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java
@@ -8,6 +8,7 @@ package cc.winboll.studio.libappbase;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Editable;
@@ -248,7 +249,10 @@ public class LogView extends RelativeLayout {
 		}
 		mSelectAllTAGCheckBox.setLayoutParams(layoutParams2);
 		//mSelectAllTAGCheckBox.setPadding(0,0,0,0);
-		mSelectAllTAGCheckBox.setTextColor(mContext.getResources().getColor(R.color.white));
+		TypedArray ta1 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+		int toolbarTextColor1 = ta1.getColor(0, mContext.getResources().getColor(R.color.white));
+		ta1.recycle();
+		mSelectAllTAGCheckBox.setTextColor(toolbarTextColor1);
         mSelectAllTAGCheckBox.setOnClickListener(new View.OnClickListener(){
                 @Override
                 public void onClick(View v) {
@@ -502,10 +506,17 @@ public class LogView extends RelativeLayout {
 			}
 			holder.tvText.setLayoutParams(layoutParams);
 			holder.tvText.setPadding(0,0,0,0);
-			holder.tvText.setTextColor(mContext.getResources().getColor(R.color.white));
+			TypedArray ta2 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+			int toolbarTextColor2 = ta2.getColor(0, mContext.getResources().getColor(R.color.white));
+			ta2.recycle();
+			holder.tvText.setTextColor(toolbarTextColor2);
             holder.cbChecked.setChecked(item.isChecked());
 			holder.cbChecked.setLayoutParams(layoutParams);
 			holder.cbChecked.setPadding(0,0,0,0);
+			TypedArray ta3 = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+			int toolbarTextColor3 = ta3.getColor(0, mContext.getResources().getColor(R.color.white));
+			ta3.recycle();
+			holder.cbChecked.setTextColor(toolbarTextColor3);
             holder.cbChecked.setOnClickListener(new View.OnClickListener(){
 
                     @Override
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
index 7530abb..dcbe80a 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/BackupUtils.java
@@ -62,11 +62,11 @@ public class BackupUtils {
 
         // 核心修改：入参Map非空且非空集合时，使用入参初始化；否则内部new HashMap()
         this.mDataDirFileMap = (dataDirFileMap != null && !dataDirFileMap.isEmpty()) 
-			? new HashMap<>(dataDirFileMap) // 新建Map避免外部篡改内部数据
-			: new HashMap<>();
+			? new HashMap<String, String>(dataDirFileMap)
+			: new HashMap<String, String>();
         this.mSdcardFileMap = (sdcardFileMap != null && !sdcardFileMap.isEmpty())
-			? new HashMap<>(sdcardFileMap) // 深拷贝，隔离外部引用
-			: new HashMap<>();
+			? new HashMap<String, String>(sdcardFileMap)
+			: new HashMap<String, String>();
 
         LogUtils.d(TAG, "BackupUtils初始化完成 → SFTP服务器：" + ftpAuthModel.getFtpServer() + ":" + ftpAuthModel.getFtpPort() + " | 上传目录：" + mFtpTargetDir);
         LogUtils.d(TAG, "SDCard Map基础根目录：" + (mAppExternalFilesDir == null ? "获取失败" : mAppExternalFilesDir.getAbsolutePath()));
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/CrashHandleNotifyUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/CrashHandleNotifyUtils.java
index 00e3842..06f9d73 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/CrashHandleNotifyUtils.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/CrashHandleNotifyUtils.java
@@ -1,33 +1,36 @@
 package cc.winboll.studio.libappbase.utils;
 
-import android.app.Application;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
 
 import cc.winboll.studio.libappbase.CrashHandler;
-import cc.winboll.studio.libappbase.GlobalCrashActivity;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.R;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/29 21:12
- * @Describe 应用崩溃处理通知实用工具集（类库兼容版）
+ * 应用崩溃处理通知实用工具集（类库兼容版）
  * 核心功能：作为独立类库使用，发送崩溃通知，点击跳转宿主应用的 GlobalCrashActivity 并传递日志
  * 适配说明：移除固定包名依赖，通过外部传入宿主包名，支持任意应用集成使用
+ * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2025/11/29 21:12:00
+ * @EditTime 2026/05/11 21:55:00
  */
 public class CrashHandleNotifyUtils {
 
+    // ====================== 常量定义 ======================
     public static final String TAG = "CrashHandleNotifyUtils";
-
     /** 通知渠道ID（Android 8.0+ 必须） */
     private static final String CRASH_NOTIFY_CHANNEL_ID = "crash_notify_channel";
     /** 通知渠道名称（用户可见） */
@@ -38,202 +41,322 @@ public class CrashHandleNotifyUtils {
     private static final int API_LEVEL_ANDROID_12 = 31;
     /** PendingIntent.FLAG_IMMUTABLE 常量值（API 31+） */
     private static final int FLAG_IMMUTABLE = 0x00000040;
+    /** 通知摘要最大长度 */
+    private static final int SUMMARY_MAX_LENGTH = 200;
+    /** 分享日志请求码 */
+    private static final int REQUEST_CODE_SHARE_LOG = 0x002;
+    /** 缓存崩溃日志子目录 */
+    private static final String CRASH_LOG_CACHE_SUBDIR = "crashnotify";
+    /** 缓存崩溃日志文件名 */
+    private static final String CRASH_LOG_CACHE_FILENAME = "crash_log.txt";
 
-    /** 通知内容最大行数（控制在3行，超出部分省略） */
-    private static final int NOTIFICATION_MAX_LINES = 3;
+    // ====================== 静态成员 ======================
+    private static String sHostPackageName = "";
+    private static String sCrashLogCacheFilePath = "";
 
+    // ====================== 正则表达式定义 ======================
+    private static final String REGEX_EXCEPTION_TYPE = "([\\w.]+Exception|[\\w.]+Error)";
+    private static final String REGEX_EXCEPTION_MESSAGE = "(?<=:\\s)(.+?)(?=\\n|\\r|$)";
+    private static final String REGEX_STACK_TRACE = "\\s+at\\s+([\\w.$]+)\\.([\\w<>]+)\\(([^:]+\\.java):(\\d+)\\)";
+    private static final String REGEX_CAUSE = "(?<=Caused by:\\s)" + REGEX_EXCEPTION_TYPE + "\\s*:";
 
+    // ====================== 对外核心方法 ======================
     /**
-     * 处理未捕获异常（核心方法，类库入口）
-     * 改进点：新增宿主包名参数，移除类库对固定包名的依赖
-     * @param hostApp 宿主应用的 Application 实例（用于获取宿主上下文）
-     * @param hostPackageName 宿主应用的包名（关键：用于绑定意图、匹配 Activity）
-     * @param errorLog 崩溃日志（从宿主 CrashHandler 传递过来）
+     * 处理未捕获异常（类库入口核心方法）
+     * @param hostApp 宿主Application实例
+     * @param hostPackageName 宿主应用包名
+     * @param errorLog 崩溃日志内容
+     * @param reportCrashActivity 崩溃详情跳转Activity类
      */
-    public static void handleUncaughtException(Application hostApp, String hostPackageName, String errorLog) {
-        // 1. 校验核心参数（类库场景必须严格校验，避免空指针）
+    public static void handleUncaughtException(final android.app.Application hostApp,
+                                               final String hostPackageName,
+                                               final String errorLog,
+                                               final Class<?> reportCrashActivity) {
+        LogUtils.d(TAG, "handleUncaughtException 进入方法");
         if (hostApp == null || TextUtils.isEmpty(hostPackageName) || TextUtils.isEmpty(errorLog)) {
-            LogUtils.e(TAG, "发送崩溃通知失败：参数为空（hostApp=" + hostApp + ", hostPackageName=" + hostPackageName + ", errorLog=" + errorLog + "）");
+            LogUtils.e(TAG, "handleUncaughtException 参数为空校验不通过");
             return;
         }
-
-        // 2. 获取宿主应用名称（使用宿主上下文，避免类库包名混淆）
-        String hostAppName = getHostAppName(hostApp, hostPackageName);
-
-        // 3. 发送崩溃通知到宿主通知栏（点击跳转宿主的 GlobalCrashActivity）
-        sendCrashNotification(hostApp, hostPackageName, hostAppName, errorLog);
+        sHostPackageName = hostPackageName;
+        final String hostAppName = getHostAppName(hostApp, hostPackageName);
+        final String crashLogFilePath = saveCrashLogToCache(hostApp, errorLog);
+        if (TextUtils.isEmpty(crashLogFilePath)) {
+            LogUtils.e(TAG, "保存崩溃日志到缓存文件失败");
+            return;
+        }
+        sCrashLogCacheFilePath = crashLogFilePath;
+        final Intent shareIntent = new Intent(hostApp, ShareLogActivity.class);
+        shareIntent.putExtra(ShareLogActivity.EXTRA_CRASH_LOG_FILEPATH, crashLogFilePath);
+        shareIntent.putExtra(ShareLogActivity.EXTRA_CRASH_LOG_SUBJECT, "崩溃日志");
+        shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        final PendingIntent sharePendingIntent = createSharePendingIntent(hostApp, shareIntent);
+        sendCrashNotification(hostApp, hostPackageName, hostAppName, errorLog, reportCrashActivity, sharePendingIntent);
     }
 
     /**
-     * 重载方法：兼容原有调用逻辑（避免宿主集成时改动过大）
-     * 从 Intent 中提取崩溃日志和宿主包名，适配原有 CrashHandler 调用方式
-     * @param hostApp 宿主应用的 Application 实例
-     * @param intent 存储崩溃信息的意图（extra 中携带崩溃日志）
+     * 重载兼容方法：适配原有CrashHandler调用方式
+     * @param hostApp 宿主Application实例
+     * @param intent 携带崩溃信息Intent
+     * @param reportCrashActivity 崩溃详情Activity
      */
-    public static void handleUncaughtException(Application hostApp, Intent intent) {
-        // 从意图中提取宿主包名（优先使用意图中携带的包名，无则用宿主 Application 包名）
+    public static void handleUncaughtException(final android.app.Application hostApp,
+                                               final Intent intent,
+                                               final Class<?> reportCrashActivity) {
+        LogUtils.d(TAG, "handleUncaughtException 重载方法进入");
         String hostPackageName = intent.getStringExtra("EXTRA_HOST_PACKAGE_NAME");
         if (TextUtils.isEmpty(hostPackageName)) {
             hostPackageName = hostApp.getPackageName();
-            LogUtils.w(TAG, "意图中未携带宿主包名，使用 Application 包名：" + hostPackageName);
+            LogUtils.w(TAG, "未携带宿主包名，默认使用应用自身包名");
         }
-
-        // 从意图中提取崩溃日志（与 CrashHandler.EXTRA_CRASH_INFO 保持一致）
-        String errorLog = intent.getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
-
-        // 调用核心方法处理
-        handleUncaughtException(hostApp, hostPackageName, errorLog);
+        final String errorLog = intent.getStringExtra(CrashHandler.EXTRA_CRASH_LOG);
+        handleUncaughtException(hostApp, hostPackageName, errorLog, reportCrashActivity);
     }
 
     /**
-     * 获取宿主应用名称（类库场景适配：使用宿主包名获取，避免类库包名干扰）
-     * @param hostContext 宿主应用的上下文（Application 实例）
-     * @param hostPackageName 宿主应用的包名
-     * @return 宿主应用名称（读取失败返回 "未知应用"）
+     * 资源释放
+     * @param hostContext 宿主上下文
      */
-    private static String getHostAppName(Context hostContext, String hostPackageName) {
+    public static void release(final Context hostContext) {
+        LogUtils.d(TAG, "release 执行资源释放");
+        sHostPackageName = "";
+        sCrashLogCacheFilePath = "";
+    }
+
+    // ====================== 内部工具方法 ======================
+    /**
+     * 获取宿主应用名称
+     * @param hostContext 宿主上下文
+     * @param hostPackageName 宿主包名
+     * @return 应用名称，失败返回未知应用
+     */
+    private static String getHostAppName(final Context hostContext, final String hostPackageName) {
         try {
-            // 用宿主包名获取宿主应用信息，确保获取的是宿主的应用名称（类库关键改进）
-            return hostContext.getPackageManager().getApplicationLabel(
-                hostContext.getPackageManager().getApplicationInfo(hostPackageName, 0)
-            ).toString();
+            return hostContext.getPackageManager()
+                .getApplicationLabel(hostContext.getPackageManager()
+                                     .getApplicationInfo(hostPackageName, 0)).toString();
         } catch (Exception e) {
-            LogUtils.e(TAG, "获取宿主应用名称失败（包名：" + hostPackageName + "）", e);
+            LogUtils.e(TAG, "获取宿主应用名称失败", e);
             return "未知应用";
         }
     }
 
     /**
-     * 发送崩溃通知到宿主系统通知栏（类库兼容版）
-     * 改进点：全程使用宿主上下文和宿主包名，避免类库包名依赖
-     * @param hostContext 宿主应用的上下文（Application 实例）
-     * @param hostPackageName 宿主应用的包名
-     * @param hostAppName 宿主应用的名称（用于通知标题）
-     * @param errorLog 崩溃日志（传递给宿主的 GlobalCrashActivity）
+     * 保存崩溃日志到缓存文件
+     * @param hostContext 宿主上下文
+     * @param crashLog 崩溃日志内容
+     * @return 缓存文件路径，失败返回空字符串
      */
-    private static void sendCrashNotification(Context hostContext, String hostPackageName, String hostAppName, String errorLog) {
-        // 1. 获取宿主的通知管理器（使用宿主上下文，确保通知归属宿主应用）
-        NotificationManager notificationManager = (NotificationManager) hostContext.getSystemService(Context.NOTIFICATION_SERVICE);
-        if (notificationManager == null) {
-            LogUtils.e(TAG, "获取宿主 NotificationManager 失败（包名：" + hostPackageName + "）");
-            return;
+    private static String saveCrashLogToCache(final Context hostContext, final String crashLog) {
+        if (hostContext == null || TextUtils.isEmpty(crashLog)) {
+            return "";
         }
-
-        // 2. 适配 Android 8.0+（API 26+）：创建宿主的通知渠道（归属宿主，避免类库渠道冲突）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            createCrashNotifyChannel(hostContext, notificationManager);
+        BufferedReader reader = null;
+        FileOutputStream fos = null;
+        try {
+            final File cacheDir = new File(hostContext.getCacheDir(), CRASH_LOG_CACHE_SUBDIR);
+            if (!cacheDir.exists()) {
+                cacheDir.mkdirs();
+            }
+            final File cacheFile = new File(cacheDir, CRASH_LOG_CACHE_FILENAME);
+            if (cacheFile.exists()) {
+                cacheFile.delete();
+            }
+            cacheFile.createNewFile();
+            fos = new FileOutputStream(cacheFile);
+            fos.write(crashLog.getBytes("UTF-8"));
+            fos.flush();
+            LogUtils.d(TAG, "saveCrashLogToCache 保存崩溃日志到缓存: " + cacheFile.getAbsolutePath());
+            return cacheFile.getAbsolutePath();
+        } catch (Exception e) {
+            LogUtils.e(TAG, "saveCrashLogToCache 异常", e);
+            return "";
+        } finally {
+            if (reader != null) {
+                try { reader.close(); } catch (Exception e) {}
+            }
+            if (fos != null) {
+                try { fos.close(); } catch (Exception e) {}
+            }
         }
-
-        // 3. 构建通知意图（核心改进：绑定宿主包名，跳转宿主的 GlobalCrashActivity）
-        PendingIntent jumpIntent = getGlobalCrashPendingIntent(hostContext, hostPackageName, errorLog);
-        if (jumpIntent == null) {
-            LogUtils.e(TAG, "构建跳转意图失败（宿主包名：" + hostPackageName + "）");
-            return;
-        }
-
-        // 4. 构建通知实例（使用宿主上下文，确保通知资源归属宿主）
-        Notification notification = buildNotification(hostContext, hostAppName, errorLog, jumpIntent);
-
-        // 5. 发送通知（归属宿主应用，避免类库与宿主通知混淆）
-        notificationManager.notify(CRASH_NOTIFY_ID, notification);
-        LogUtils.d(TAG, "崩溃通知发送成功（宿主包名：" + hostPackageName + "，标题：" + hostAppName + "，日志长度：" + errorLog.length() + "字符）");
     }
 
     /**
-     * 创建宿主应用的崩溃通知渠道（类库场景：渠道归属宿主，避免类库与宿主渠道冲突）
-     * @param hostContext 宿主应用的上下文
-     * @param notificationManager 宿主的通知管理器
+     * 读取缓存的崩溃日志文件内容
+     * @param hostContext 宿主上下文
+     * @return 日志内容，失败返回空字符串
      */
-    private static void createCrashNotifyChannel(Context hostContext, NotificationManager notificationManager) {
-        // 仅 Android 8.0+ 执行（避免低版本报错）
+    private static String readCachedCrashLog(final Context hostContext) {
+        if (hostContext == null || TextUtils.isEmpty(sCrashLogCacheFilePath)) {
+            return "";
+        }
+        BufferedReader reader = null;
+        try {
+            final File cacheFile = new File(sCrashLogCacheFilePath);
+            if (!cacheFile.exists()) {
+                LogUtils.w(TAG, "readCachedCrashLog 缓存文件不存在");
+                return "";
+            }
+            reader = new BufferedReader(new InputStreamReader(new FileInputStream(cacheFile), "UTF-8"));
+            final StringBuilder sb = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append("\n");
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            LogUtils.e(TAG, "readCachedCrashLog 异常", e);
+            return "";
+        } finally {
+            if (reader != null) {
+                try { reader.close(); } catch (Exception e) {}
+            }
+        }
+    }
+
+    /**
+     * 发送崩溃系统通知
+     * @param hostContext 宿主上下文
+     * @param hostPackageName 宿主包名
+     * @param hostAppName 宿主应用名
+     * @param errorLog 崩溃日志
+     * @param reportCrashActivity 跳转Activity
+     * @param sharePendingIntent 分享日志PendingIntent
+     */
+    private static void sendCrashNotification(final Context hostContext,
+                                              final String hostPackageName,
+                                              final String hostAppName,
+                                              final String errorLog,
+                                              final Class<?> reportCrashActivity,
+                                              final PendingIntent sharePendingIntent) {
+        final NotificationManager notificationManager =
+            (NotificationManager) hostContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        if (notificationManager == null) {
+            LogUtils.e(TAG, "获取NotificationManager失败");
+            return;
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            createCrashNotifyChannel(hostContext, notificationManager);
+        }
+        final PendingIntent jumpIntent = getGlobalCrashPendingIntent(hostContext,
+                                                                     hostPackageName, errorLog, reportCrashActivity);
+        if (jumpIntent == null) {
+            LogUtils.e(TAG, "构建跳转PendingIntent失败");
+            return;
+        }
+        final Notification notification = buildNotification(hostContext, hostPackageName, hostAppName, errorLog, jumpIntent, sharePendingIntent);
+        notificationManager.notify(CRASH_NOTIFY_ID, notification);
+        LogUtils.d(TAG, "崩溃通知发送成功，宿主包名：" + hostPackageName);
+    }
+
+    /**
+     * 创建分享日志PendingIntent
+     * @param hostContext 宿主上下文
+     * @param shareIntent 分享意图
+     * @return PendingIntent实例
+     */
+    private static PendingIntent createSharePendingIntent(final Context hostContext, final Intent shareIntent) {
+        int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= API_LEVEL_ANDROID_12) {
+            flags |= FLAG_IMMUTABLE;
+        }
+        return PendingIntent.getActivity(
+            hostContext,
+            REQUEST_CODE_SHARE_LOG,
+            shareIntent,
+            flags
+        );
+    }
+
+    /**
+     * 创建通知渠道（适配Android O及以上）
+     * @param hostContext 宿主上下文
+     * @param notificationManager 通知管理器
+     */
+    private static void createCrashNotifyChannel(final Context hostContext,
+                                                 final NotificationManager notificationManager) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            // 构建通知渠道（归属宿主应用，描述明确类库用途）
             android.app.NotificationChannel channel = new android.app.NotificationChannel(
                 CRASH_NOTIFY_CHANNEL_ID,
                 CRASH_NOTIFY_CHANNEL_NAME,
                 NotificationManager.IMPORTANCE_DEFAULT
             );
             channel.setDescription("应用崩溃通知（由 WinBoLL Studio 类库提供，点击查看详情）");
-            // 注册渠道到宿主的通知管理器，确保渠道归属宿主
             notificationManager.createNotificationChannel(channel);
-            LogUtils.d(TAG, "宿主崩溃通知渠道创建成功（宿主包名：" + hostContext.getPackageName() + "，渠道ID：" + CRASH_NOTIFY_CHANNEL_ID + "）");
+            LogUtils.d(TAG, "通知渠道创建完成");
         }
     }
 
     /**
-     * 核心改进：构建跳转宿主 GlobalCrashActivity 的意图（类库关键）
-     * 1. 绑定宿主包名，确保类库能正确启动宿主的 Activity；
-     * 2. 传递崩溃日志，与宿主 GlobalCrashActivity 日志接收逻辑匹配；
-     * 3. 使用宿主上下文，避免类库上下文导致的适配问题。
-     * @param hostContext 宿主应用的上下文
-     * @param hostPackageName 宿主应用的包名
-     * @param errorLog 崩溃日志（传递给宿主的 GlobalCrashActivity）
-     * @return 跳转崩溃详情页的 PendingIntent
+     * 构建跳转崩溃详情页PendingIntent
+     * @param hostContext 宿主上下文
+     * @param hostPackageName 宿主包名
+     * @param errorLog 崩溃日志
+     * @param reportCrashActivity 目标Activity
+     * @return PendingIntent实例
      */
-    private static PendingIntent getGlobalCrashPendingIntent(Context hostContext, String hostPackageName, String errorLog) {
+    private static PendingIntent getGlobalCrashPendingIntent(final Context hostContext,
+                                                             final String hostPackageName,
+                                                             final String errorLog,
+                                                             final Class<?> reportCrashActivity) {
         try {
-            // 1. 构建跳转宿主 GlobalCrashActivity 的显式意图（类库场景必须显式指定宿主包名）
-            Intent crashIntent = new Intent(hostContext, GlobalCrashActivity.class);
-            // 关键：绑定宿主包名，确保意图能正确匹配宿主的 Activity（避免类库包名干扰）
+            final Intent crashIntent = new Intent(hostContext, reportCrashActivity);
             crashIntent.setPackage(hostPackageName);
-            // 传递崩溃日志（键：EXTRA_CRASH_INFO，与宿主 GlobalCrashActivity 完全匹配）
             crashIntent.putExtra(CrashHandler.EXTRA_CRASH_LOG, errorLog);
-            // 设置意图标志：确保在宿主应用中正常启动，避免重复创建和任务栈混乱
             crashIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
-            // 2. 构建 PendingIntent（使用宿主上下文，适配高版本）
             int flags = PendingIntent.FLAG_UPDATE_CURRENT;
             if (Build.VERSION.SDK_INT >= API_LEVEL_ANDROID_12) {
                 flags |= FLAG_IMMUTABLE;
             }
-
             return PendingIntent.getActivity(
                 hostContext,
-                CRASH_NOTIFY_ID, // 用通知ID作为请求码，确保唯一（避免意图复用）
+                CRASH_NOTIFY_ID,
                 crashIntent,
                 flags
             );
         } catch (Exception e) {
-            LogUtils.e(TAG, "构建跳转意图失败（宿主包名：" + hostPackageName + "）", e);
+            LogUtils.e(TAG, "构建跳转Intent异常", e);
             return null;
         }
     }
 
     /**
-     * 构建通知实例（类库兼容版）
-     * 改进点：使用宿主上下文加载资源，确保通知样式适配宿主应用
-     * @param hostContext 宿主应用的上下文
-     * @param hostAppName 宿主应用的名称（通知标题）
-     * @param errorLog 崩溃日志（通知内容）
-     * @param jumpIntent 通知点击跳转意图（跳转宿主的 GlobalCrashActivity）
-     * @return 构建完成的 Notification 对象
+     * 构建Notification通知实例
+     * @param hostContext 宿主上下文
+     * @param hostPackageName 宿主包名
+     * @param hostAppName 宿主应用名
+     * @param errorLog 崩溃日志
+     * @param jumpIntent 点击跳转意图
+     * @param shareIntent 分享日志意图
+     * @return 构建好的Notification
      */
-    private static Notification buildNotification(Context hostContext, String hostAppName, String errorLog, PendingIntent jumpIntent) {
-        // 兼容 Android 8.0+：指定宿主的通知渠道ID
+    @SuppressWarnings("deprecation")
+    private static Notification buildNotification(final Context hostContext,
+                                                 final String hostPackageName,
+                                                 final String hostAppName,
+                                                 final String errorLog,
+                                                 final PendingIntent jumpIntent,
+                                                 final PendingIntent shareIntent) {
         Notification.Builder builder = new Notification.Builder(hostContext);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             builder.setChannelId(CRASH_NOTIFY_CHANNEL_ID);
         }
-
-        // 核心：用BigTextStyle控制“默认3行省略，下拉显示完整”（使用宿主上下文构建）
-        Notification.BigTextStyle bigTextStyle = new Notification.BigTextStyle();
-        bigTextStyle.setSummaryText("日志已省略，下拉查看完整内容");
-        bigTextStyle.bigText(errorLog);
-        bigTextStyle.setBigContentTitle(hostAppName + " 崩溃"); // 标题明确标识宿主和崩溃状态
+        final String briefInfo = extractBriefInfo(errorLog);
+        final Notification.BigTextStyle bigTextStyle = new Notification.BigTextStyle();
+        bigTextStyle.setBigContentTitle(hostAppName + " 崩溃");
+        bigTextStyle.bigText(briefInfo);
+        bigTextStyle.setSummaryText("点击查看详情");
         builder.setStyle(bigTextStyle);
-
-        // 配置通知核心参数（全程使用宿主上下文，确保资源归属宿主）
-        builder
-            // 关键：使用宿主应用的小图标（避免类库图标显示异常）
-            .setSmallIcon(hostContext.getApplicationInfo().icon)
+        builder.setSmallIcon(hostContext.getApplicationInfo().icon)
             .setContentTitle(hostAppName + " 崩溃")
-            .setContentText(getShortContent(errorLog)) // 3行内缩略文本
-            .setContentIntent(jumpIntent) // 点击跳转宿主的 GlobalCrashActivity
-            .setAutoCancel(true) // 点击后自动关闭
+            .setContentText(briefInfo.split("\n")[0])
+            .setContentIntent(jumpIntent)
+            .setAutoCancel(true)
             .setWhen(System.currentTimeMillis())
             .setPriority(Notification.PRIORITY_DEFAULT);
-
-        // 适配 Android 4.1+：确保在宿主应用中正常显示
+        if (shareIntent != null) {
+            builder.addAction(android.R.drawable.ic_menu_send, "分享日志", shareIntent);
+        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             return builder.build();
         } else {
@@ -242,23 +365,79 @@ public class CrashHandleNotifyUtils {
     }
 
     /**
-     * 辅助方法：截取日志文本，确保显示在3行内（通用逻辑，无包名依赖）
-     * @param content 完整崩溃日志
-     * @return 3行内的缩略文本
+     * 截取缩略日志文本
+     * @param content 原始日志
+     * @return 缩略文案
      */
-    private static String getShortContent(String content) {
-        if (content == null || content.isEmpty()) {
+    private static String getShortContent(final String errorLog) {
+        if (errorLog == null || errorLog.isEmpty()) {
             return "无崩溃日志";
         }
-        int maxLength = 80; // 估算3行字符数（可根据需求调整）
-        return content.length() <= maxLength ? content : content.substring(0, maxLength) + "...";
+        final String brief = extractBriefInfo(errorLog);
+        final String firstLine = brief.split("\n")[0];
+        if (firstLine.length() > 80) {
+            return firstLine.substring(0, 80) + "...";
+        }
+        return firstLine;
     }
 
     /**
-     * 释放资源（类库场景：空实现，避免宿主调用时报错，预留扩展）
-     * @param hostContext 宿主应用的上下文（显式传入，避免类库上下文依赖）
+     * 使用正则表达式从崩溃日志中提取简要信息
+     * @param crashLog 完整崩溃日志
+     * @return 简要崩溃信息
      */
-    public static void release(Context hostContext) {
-        LogUtils.d(TAG, "CrashHandleNotifyUtils 资源释放完成（宿主包名：" + (hostContext != null ? hostContext.getPackageName() : "未知") + "）");
+    private static String extractBriefInfo(final String crashLog) {
+        if (crashLog == null || crashLog.isEmpty()) {
+            return "无崩溃日志";
+        }
+        final StringBuilder brief = new StringBuilder();
+        try {
+            java.util.regex.Pattern exceptionPattern = java.util.regex.Pattern.compile(REGEX_EXCEPTION_TYPE);
+            java.util.regex.Matcher exceptionMatcher = exceptionPattern.matcher(crashLog);
+            if (exceptionMatcher.find()) {
+                brief.append(exceptionMatcher.group(1));
+            }
+            java.util.regex.Pattern messagePattern = java.util.regex.Pattern.compile(REGEX_EXCEPTION_MESSAGE);
+            java.util.regex.Matcher messageMatcher = messagePattern.matcher(crashLog);
+            if (messageMatcher.find()) {
+                String message = messageMatcher.group(1).trim();
+                if (message.length() > 100) {
+                    message = message.substring(0, 100) + "...";
+                }
+                if (brief.length() > 0) {
+                    brief.append(" - ");
+                }
+                brief.append(message);
+            }
+            java.util.regex.Pattern causePattern = java.util.regex.Pattern.compile(REGEX_CAUSE);
+            java.util.regex.Matcher causeMatcher = causePattern.matcher(crashLog);
+            if (causeMatcher.find()) {
+                if (brief.length() > 0) {
+                    brief.append("\n");
+                }
+                brief.append("原因: ").append(causeMatcher.group(1));
+            }
+            java.util.regex.Pattern stackPattern = java.util.regex.Pattern.compile(REGEX_STACK_TRACE);
+            java.util.regex.Matcher stackMatcher = stackPattern.matcher(crashLog);
+            int lineCount = 0;
+            while (stackMatcher.find() && lineCount < 3) {
+                if (brief.length() > 0) {
+                    brief.append("\n");
+                }
+                brief.append("  at ").append(stackMatcher.group(1)).append(".")
+                     .append(stackMatcher.group(2)).append("(")
+                     .append(stackMatcher.group(3)).append(":")
+                     .append(stackMatcher.group(4)).append(")");
+                lineCount++;
+            }
+            if (brief.length() == 0) {
+                brief.append(crashLog.length() > SUMMARY_MAX_LENGTH ? crashLog.substring(0, SUMMARY_MAX_LENGTH) + "..." : crashLog);
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "提取崩溃简要信息失败", e);
+            brief.setLength(0);
+            brief.append(crashLog.length() > SUMMARY_MAX_LENGTH ? crashLog.substring(0, SUMMARY_MAX_LENGTH) + "..." : crashLog);
+        }
+        return brief.toString();
     }
-}
+}
\ No newline at end of file
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ShareLogActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ShareLogActivity.java
new file mode 100644
index 0000000..a9edd48
--- /dev/null
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ShareLogActivity.java
@@ -0,0 +1,91 @@
+package cc.winboll.studio.libappbase.utils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+
+/**
+ * 分享崩溃日志窗口类
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @CreateTime 2026/05/11 22:30:00
+ */
+public class ShareLogActivity extends Activity {
+
+    public static final String TAG = "ShareLogActivity";
+    public static final String EXTRA_CRASH_LOG_FILEPATH = "crash_log_filepath";
+    public static final String EXTRA_CRASH_LOG_SUBJECT = "crash_log_subject";
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.d(TAG, "onCreate 进入方法");
+
+        final Intent intent = getIntent();
+        if (intent == null) {
+            Log.e(TAG, "onCreate intent 为空");
+            finish();
+            return;
+        }
+
+        final String crashLogFilePath = intent.getStringExtra(EXTRA_CRASH_LOG_FILEPATH);
+        if (crashLogFilePath == null || crashLogFilePath.isEmpty()) {
+            Log.e(TAG, "onCreate crashLogFilePath 为空");
+            Toast.makeText(this, "日志文件路径无效", Toast.LENGTH_SHORT).show();
+            finish();
+            return;
+        }
+
+        final String subject = intent.getStringExtra(EXTRA_CRASH_LOG_SUBJECT);
+        handleShareCrashLog(crashLogFilePath, subject);
+    }
+
+    private void handleShareCrashLog(final String crashLogFilePath, final String subject) {
+        Log.d(TAG, "handleShareCrashLog crashLogFilePath = " + crashLogFilePath);
+
+        final File crashLogFile = new File(crashLogFilePath);
+        if (!crashLogFile.exists()) {
+            Log.e(TAG, "handleShareCrashLog 文件不存在");
+            Toast.makeText(this, "日志文件不存在", Toast.LENGTH_SHORT).show();
+            finish();
+            return;
+        }
+
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new InputStreamReader(new FileInputStream(crashLogFile), "UTF-8"));
+            final StringBuilder sb = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line).append("\n");
+            }
+            final String logContent = sb.toString();
+
+            final Intent shareIntent = new Intent(Intent.ACTION_SEND);
+            shareIntent.setType("text/plain");
+            shareIntent.putExtra(Intent.EXTRA_TEXT, logContent);
+            if (subject != null && !subject.isEmpty()) {
+                shareIntent.putExtra(Intent.EXTRA_SUBJECT, subject);
+            } else {
+                shareIntent.putExtra(Intent.EXTRA_SUBJECT, "崩溃日志");
+            }
+
+            startActivity(Intent.createChooser(shareIntent, "分享日志到"));
+            Log.d(TAG, "handleShareCrashLog 分享成功");
+        } catch (Exception e) {
+            Log.e(TAG, "handleShareCrashLog 异常", e);
+            Toast.makeText(this, "分享失败: " + e.getMessage(), Toast.LENGTH_SHORT).show();
+        } finally {
+            if (reader != null) {
+                try { reader.close(); } catch (Exception e) {}
+            }
+            finish();
+        }
+    }
+}
\ No newline at end of file
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
index 5634df0..8d94b53 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/AboutView.java
@@ -421,9 +421,10 @@ public class AboutView extends LinearLayout {
          */
         private android.graphics.drawable.Drawable create_item_background() {
             android.graphics.drawable.GradientDrawable drawable = new android.graphics.drawable.GradientDrawable();
-            drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_200));
+            drawable.setStroke(1, mItemContext.getResources().getColor(R.color.gray_300));
             drawable.setCornerRadius(4);
-            drawable.setColor(mItemContext.getResources().getColor(android.R.color.white));
+            boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
+            drawable.setColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_800) : mItemContext.getResources().getColor(android.R.color.white));
             return drawable;
         }
 
@@ -449,7 +450,8 @@ public class AboutView extends LinearLayout {
             TextView tvTitle = new TextView(mItemContext);
             tvTitle.setText(mTitle);
             tvTitle.setTextSize(16);
-            tvTitle.setTextColor(mItemContext.getResources().getColor(R.color.gray_900));
+            boolean isNightMode = (mItemContext.getResources().getConfiguration().uiMode & android.content.res.Configuration.UI_MODE_NIGHT_MASK) == android.content.res.Configuration.UI_MODE_NIGHT_YES;
+            tvTitle.setTextColor(isNightMode ? mItemContext.getResources().getColor(R.color.gray_500) : mItemContext.getResources().getColor(R.color.gray_900));
             llText.addView(tvTitle);
             // 内容
             TextView tvContent = new TextView(mItemContext);
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java
index 4bc6f0f..32609ec 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/widget/LogTagSpinner.java
@@ -3,6 +3,7 @@ package cc.winboll.studio.libappbase.widget;
 import android.content.Context;
 import android.graphics.Color;
 import android.text.TextUtils;
+import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
@@ -153,9 +154,12 @@ public class LogTagSpinner extends Spinner {
 		itemTv.setPadding(mTextPadding, 0, mTextPadding, 0);
 		// 4. 文字对齐（垂直居中+靠左，符合常规 UI 设计）
 		//itemTv.setGravity(View.GRAVITY_CENTER_VERTICAL | View.GRAVITY_START);
-		// 5. 文字颜色（统一深色，可改为项目颜色资源）
-		itemTv.setTextColor(this.mContext.getColor(R.color.white));
-		itemTv.setBackgroundColor(this.mContext.getColor(R.color.btn_gray_normal));
+// 5. 文字颜色（使用主题属性 ?attr/toolbarTextColor）
+		TypedArray ta = mContext.obtainStyledAttributes(new int[] { R.attr.toolbarTextColor });
+		int toolbarTextColor = ta.getColor(0, mContext.getResources().getColor(R.color.white));
+		ta.recycle();
+		itemTv.setTextColor(toolbarTextColor);
+		itemTv.setBackgroundColor(this.mContext.getResources().getColor(R.color.btn_gray_normal));
 		// 6. 文字溢出处理（最多 2 行，超出省略，避免长标签换行过多）
 		itemTv.setSingleLine(false);
 		itemTv.setMaxLines(2);
diff --git a/libappbase/src/main/res/layout-night/activity_about.xml b/libappbase/src/main/res/layout-night/activity_about.xml
new file mode 100644
index 0000000..962c60f
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/activity_about.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
+
+	<android.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
+		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>
diff --git a/libappbase/src/main/res/layout-night/activity_globalcrash.xml b/libappbase/src/main/res/layout-night/activity_globalcrash.xml
new file mode 100644
index 0000000..cf4e1f7
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/activity_globalcrash.xml
@@ -0,0 +1,16 @@
+<?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:background="?attr/activityBackgroundColor">>
+
+	<cc.winboll.studio.libappbase.GlobalCrashReportView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/activityglobalcrashGlobalCrashReportView1"/>
+
+</LinearLayout>
+
diff --git a/libappbase/src/main/res/layout-night/activity_log.xml b/libappbase/src/main/res/layout-night/activity_log.xml
new file mode 100644
index 0000000..b49e51a
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/activity_log.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
+
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/logview"/>
+
+</LinearLayout>
+
diff --git a/libappbase/src/main/res/layout-night/activity_nfc_rsa_operate.xml b/libappbase/src/main/res/layout-night/activity_nfc_rsa_operate.xml
new file mode 100644
index 0000000..d19cd6e
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/activity_nfc_rsa_operate.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="24dp"
+    android:gravity="center_horizontal"
+    android:background="?attr/activityBackgroundColor">
+
+    <!-- NFC状态提示文本 -->
+    <TextView
+        android:id="@+id/tv_nfc_state"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="正在监听NFC卡片，请贴近设备检测密钥..."
+        android:textSize="17sp"
+        android:textColor="?attr/activityTextColor"
+        android:gravity="center"
+        android:padding="12dp"
+        android:layout_marginBottom="30dp"/>
+
+    <!-- 私钥显示区域 -->
+    <TextView
+        android:id="@+id/tv_private_key"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="私钥内容：无"
+        android:textSize="14sp"
+        android:textColor="?attr/activityTextColor"
+        android:layout_marginBottom="12dp"
+        android:maxLines="5"
+        android:ellipsize="end"/>
+
+    <!-- 公钥显示区域 -->
+    <TextView
+        android:id="@+id/tv_public_key"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="公钥内容：无"
+        android:textSize="14sp"
+        android:textColor="?attr/activityTextColor"
+        android:layout_marginBottom="40dp"
+        android:maxLines="5"
+        android:ellipsize="end"/>
+
+    <!-- 核心功能按钮（复用：保存本地/初始化密钥） -->
+    <Button
+        android:id="@+id/btn_create_write_key"
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:text="功能按钮待激活"
+        android:textSize="16sp"
+        android:textColor="?attr/toolbarTextColor"
+        android:backgroundTint="?attr/toolbarBackgroundColor"
+        android:padding="14dp"
+        android:enabled="false"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/libappbase/src/main/res/layout-night/dialog_sign_get.xml b/libappbase/src/main/res/layout-night/dialog_sign_get.xml
new file mode 100644
index 0000000..9d6256d
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/dialog_sign_get.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="16dp"
+	android:gravity="center"
+	android:background="?attr/dialogBackgroundColor">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="应用指纹校验"
+		android:textSize="16sp"
+		android:textColor="?attr/dialogTextColor"
+		android:textStyle="bold"
+		android:layout_marginBottom="12dp"/>
+
+	<ScrollView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content">
+
+		<EditText
+			android:id="@+id/et_sign_fingerprint"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:background="@android:drawable/edit_text"
+			android:textSize="12sp"
+			android:gravity="top"
+			android:hint="签名获取中..."
+			android:singleLine="false"
+			android:scrollHorizontally="false"
+			android:scrollbars="vertical"
+			android:overScrollMode="always"
+			android:typeface="monospace"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"/>
+
+	</ScrollView>
+
+	<TextView
+		android:id="@+id/tv_auth_result"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="12dp"
+		android:textSize="11sp"
+		android:gravity="center"
+		android:textColor="?attr/dialogTextColor"/>/>
+
+</LinearLayout>
+
diff --git a/libappbase/src/main/res/layout-night/dialog_winboll_host.xml b/libappbase/src/main/res/layout-night/dialog_winboll_host.xml
new file mode 100644
index 0000000..642b30b
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/dialog_winboll_host.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:background="?attr/dialogBackgroundColor">
+
+    <!-- 标题 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="设置服务器地址"
+        android:textSize="16sp"
+        android:textColor="?attr/dialogTextColor"
+        android:textStyle="bold"
+        android:layout_marginBottom="16dp"/>
+
+    <!-- 地址输入框 -->
+    <EditText
+        android:id="@+id/et_host_input"
+        android:layout_width="300dp"
+        android:layout_height="wrap_content"
+        android:hint="请输入服务器地址（如http://localhost:8080）"
+        android:textSize="14sp"
+        android:textColor="?attr/dialogTextColor"
+        android:inputType="textUri"
+        android:padding="8dp"
+        android:background="@android:drawable/edit_text"
+        android:layout_marginBottom="16dp"/>
+
+    <!-- 按钮容器 -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="end">
+
+        <!-- 取消按钮 -->
+        <Button
+            android:id="@+id/btn_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="取消"
+            android:textSize="14sp"
+            android:textColor="?attr/dialogTextColor"
+            android:layout_marginRight="8dp"/>
+
+        <!-- 确认按钮 -->
+        <Button
+            android:id="@+id/btn_confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="确认"
+            android:textSize="14sp"
+            android:backgroundTint="?attr/toolbarBackgroundColor"
+            android:textColor="?attr/toolbarTextColor"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/libappbase/src/main/res/layout-night/item_logtag.xml b/libappbase/src/main/res/layout-night/item_logtag.xml
new file mode 100644
index 0000000..f00bf13
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/item_logtag.xml
@@ -0,0 +1,25 @@
+<?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="horizontal"
+	android:layout_width="wrap_content"
+	android:layout_height="match_parent"
+	android:background="@drawable/bg_border_round">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="@dimen/log_button_height"
+		android:textSize="@dimen/log_text_size"
+		android:layout_marginLeft="5dp"
+		android:id="@+id/viewlogtagTextView1"/>
+
+	<CheckBox
+		android:layout_width="wrap_content"
+		android:layout_height="@dimen/log_button_height"
+		android:textSize="@dimen/log_text_size"
+		android:textColor="?attr/toolbarTextColor"
+		android:id="@+id/viewlogtagCheckBox1"/>
+
+</LinearLayout>
+
diff --git a/libappbase/src/main/res/layout-night/layout_about_view.xml b/libappbase/src/main/res/layout-night/layout_about_view.xml
new file mode 100644
index 0000000..a1753ff
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/layout_about_view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/aboutViewBackgroundColor">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:gravity="center_horizontal"
+		android:paddingLeft="16dp"
+		android:paddingTop="16dp"
+		android:paddingRight="16dp"
+		android:paddingBottom="16dp">
+
+		<cc.winboll.studio.libappbase.views.DebugSwitchImageView
+			android:id="@+id/iv_app_icon"
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:layout_marginBottom="8dp"
+			android:scaleType="centerCrop"/>
+
+		<TextView
+			android:id="@+id/tv_app_name_version"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textColor="?attr/aboutViewTitleColor"/>
+
+		<TextView
+			android:id="@+id/tv_app_desc"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="4dp"
+			android:layout_marginBottom="8dp"
+			android:textSize="14sp"
+			android:textColor="?attr/aboutViewTextColor"/>
+
+		<View
+			android:layout_width="match_parent"
+			android:layout_height="1px"
+			android:layout_marginTop="4dp"
+			android:layout_marginBottom="8dp"
+			android:background="?attr/aboutViewDividerColor"/>
+
+		<LinearLayout
+			android:id="@+id/ll_function_container"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"/>
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:layout_marginTop="8dp"
+			android:spacing="20dp">
+
+			<ImageButton
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:src="@drawable/ic_debug_step_over"
+				android:id="@+id/ib_debug_step_over"
+				android:scaleType="fitCenter"
+				android:adjustViewBounds="true"
+				android:background="@null"/>
+
+			<ImageButton
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:src="@drawable/ic_winboll"
+				android:id="@+id/ib_winbollhostdialog"
+				android:scaleType="fitCenter"
+				android:adjustViewBounds="true"
+				android:background="@null"/>
+
+			<ImageButton
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:src="@drawable/ic_key"
+				android:id="@+id/ib_signgetdialog"
+				android:scaleType="fitCenter"
+				android:adjustViewBounds="true"
+				android:background="@null"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+</ScrollView>
+
diff --git a/libappbase/src/main/res/layout-night/view_globalcrashreport.xml b/libappbase/src/main/res/layout-night/view_globalcrashreport.xml
new file mode 100644
index 0000000..a5f427e
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/view_globalcrashreport.xml
@@ -0,0 +1,41 @@
+<?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:theme="?attr/themeDebug"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/colorTextBackgound"
+	android:id="@+id/viewglobalcrashreportLinearLayout1">
+
+    <android.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:background="?attr/colorTittleBackgound"
+		android:titleTextColor="?attr/colorTittle"
+		android:id="@+id/viewglobalcrashreportToolbar1"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:fillViewport="true">
+
+		<HorizontalScrollView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:padding="16dp"
+				android:textColor="?attr/colorText"
+				android:id="@+id/viewglobalcrashreportTextView1"/>
+
+		</HorizontalScrollView>
+
+	</ScrollView>
+
+</LinearLayout>
+
diff --git a/libappbase/src/main/res/layout-night/view_log.xml b/libappbase/src/main/res/layout-night/view_log.xml
new file mode 100644
index 0000000..d8459a0
--- /dev/null
+++ b/libappbase/src/main/res/layout-night/view_log.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:theme="?attr/themeDebug"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/colorTextBackgound">
+
+	<RelativeLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="34dp"
+		android:layout_alignParentTop="true"
+		android:background="?attr/colorTittleBackgound"
+		android:id="@+id/viewlogRelativeLayoutToolbar">
+
+<Button
+			android:layout_width="@dimen/log_button_width"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:text="Clean"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogButtonClean"
+			android:layout_marginLeft="5dp"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="20dp"
+			android:textSize="@dimen/log_text_size"
+			android:padding="@dimen/log_text_padding"
+			android:text="LV:"
+			android:layout_toRightOf="@+id/viewlogButtonClean"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogTextView1"
+			android:background="?attr/colorTittleBackgound"
+			android:textColor="?attr/toolbarTextColor"/>
+
+		<cc.winboll.studio.libappbase.widget.LogTagSpinner
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@+id/viewlogTextView1"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogSpinner1"
+			android:padding="@dimen/log_spinner_text_padding"/>
+
+		<CheckBox
+			android:layout_width="@dimen/log_checkbox_width"
+			android:layout_height="@dimen/log_checkbox_height"
+			android:textSize="@dimen/log_text_size"
+			android:layout_toLeftOf="@+id/viewlogButtonCopy"
+			android:layout_centerVertical="true"
+			android:text="Selectable"
+			android:background="?attr/colorTittleBackgound"
+			android:id="@+id/viewlogCheckBoxSelectable"
+			android:padding="@dimen/log_text_padding"
+			android:textColor="?attr/toolbarTextColor"/>
+
+		<Button
+			android:layout_width="@dimen/log_button_width"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
+			android:text="Copy"
+			android:layout_alignParentRight="true"
+			android:layout_centerVertical="true"
+			android:id="@+id/viewlogButtonCopy"
+			android:layout_marginRight="5dp"/>
+
+	</RelativeLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/log_button_height"
+		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
+		android:id="@+id/viewlogLinearLayout1"
+		android:gravity="center_vertical"
+		android:background="?attr/colorTittleBackgound">
+
+		<CheckBox
+			android:layout_width="wrap_content"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:text="ALL"
+			android:padding="2dp"
+			android:id="@+id/viewlogCheckBox1"
+			android:background="?attr/colorTittleBackgound"
+			android:textColor="?attr/toolbarTextColor"
+			android:layout_marginLeft="5dp"
+			android:layout_marginRight="5dp"/>
+
+		<EditText
+			android:layout_width="50dp"
+			android:ems="10"
+			android:layout_height="@dimen/log_button_height"
+			android:textSize="@dimen/log_text_size"
+			android:textColor="?attr/colorText"
+			android:background="?attr/colorTittleBackgound"
+			android:singleLine="true"
+			android:id="@+id/tagsearch_et"/>
+
+		<HorizontalScrollView
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:background="?attr/colorTittleBackgound"
+			android:scrollbars="none"
+			android:padding="2dp"
+			android:layout_weight="1.0"
+			android:id="@+id/viewlogHorizontalScrollView1">
+
+			<cc.winboll.studio.libappbase.views.HorizontalListView
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:id="@+id/tags_listview"/>
+
+		</HorizontalScrollView>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1.0"
+		android:layout_alignParentBottom="true"
+		android:layout_below="@+id/viewlogLinearLayout1">
+
+		<ScrollView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="?attr/colorTextBackgound"
+			android:id="@+id/viewlogScrollViewLog">
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:textSize="@dimen/log_text_size"
+				android:text="Text"
+				android:textColor="?attr/debugTextColor"
+				android:textIsSelectable="true"
+				android:id="@+id/viewlogTextViewLog"/>
+
+		</ScrollView>
+
+	</RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/libappbase/src/main/res/layout/activity_about.xml b/libappbase/src/main/res/layout/activity_about.xml
index c43ccfb..962c60f 100644
--- a/libappbase/src/main/res/layout/activity_about.xml
+++ b/libappbase/src/main/res/layout/activity_about.xml
@@ -4,11 +4,13 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
 
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="?attr/toolbarBackgroundColor"
 		android:id="@+id/toolbar"/>
 
 	<LinearLayout
diff --git a/libappbase/src/main/res/layout/activity_globalcrash.xml b/libappbase/src/main/res/layout/activity_globalcrash.xml
index 92e847d..ab9120e 100644
--- a/libappbase/src/main/res/layout/activity_globalcrash.xml
+++ b/libappbase/src/main/res/layout/activity_globalcrash.xml
@@ -2,9 +2,10 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
 
 	<cc.winboll.studio.libappbase.GlobalCrashReportView
 		android:layout_width="match_parent"
diff --git a/libappbase/src/main/res/layout/activity_log.xml b/libappbase/src/main/res/layout/activity_log.xml
index a5f2ea2..b49e51a 100644
--- a/libappbase/src/main/res/layout/activity_log.xml
+++ b/libappbase/src/main/res/layout/activity_log.xml
@@ -3,7 +3,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activityBackgroundColor">
 
 	<cc.winboll.studio.libappbase.LogView
 		android:layout_width="match_parent"
diff --git a/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml b/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
index f379304..d19cd6e 100644
--- a/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
+++ b/libappbase/src/main/res/layout/activity_nfc_rsa_operate.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:padding="24dp"
     android:gravity="center_horizontal"
-    android:background="@android:color/white">
+    android:background="?attr/activityBackgroundColor">
 
     <!-- NFC状态提示文本 -->
     <TextView
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:text="正在监听NFC卡片，请贴近设备检测密钥..."
         android:textSize="17sp"
-        android:textColor="@android:color/black"
+        android:textColor="?attr/activityTextColor"
         android:gravity="center"
         android:padding="12dp"
         android:layout_marginBottom="30dp"/>
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:text="私钥内容：无"
         android:textSize="14sp"
-        android:textColor="@android:color/darker_gray"
+        android:textColor="?attr/activityTextColor"
         android:layout_marginBottom="12dp"
         android:maxLines="5"
         android:ellipsize="end"/>
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:text="公钥内容：无"
         android:textSize="14sp"
-        android:textColor="@android:color/darker_gray"
+        android:textColor="?attr/activityTextColor"
         android:layout_marginBottom="40dp"
         android:maxLines="5"
         android:ellipsize="end"/>
@@ -50,10 +50,9 @@
         android:layout_height="wrap_content"
         android:text="功能按钮待激活"
         android:textSize="16sp"
-        android:textColor="@android:color/white"
-        android:backgroundTint="@android:color/holo_blue_light"
+        android:textColor="?attr/toolbarTextColor"
+        android:backgroundTint="?attr/toolbarBackgroundColor"
         android:padding="14dp"
         android:enabled="false"/>
 
-</LinearLayout>
-
+</LinearLayout>
\ No newline at end of file
diff --git a/libappbase/src/main/res/layout/dialog_sign_get.xml b/libappbase/src/main/res/layout/dialog_sign_get.xml
index f05f7aa..9d6256d 100644
--- a/libappbase/src/main/res/layout/dialog_sign_get.xml
+++ b/libappbase/src/main/res/layout/dialog_sign_get.xml
@@ -6,14 +6,14 @@
 	android:orientation="vertical"
 	android:padding="16dp"
 	android:gravity="center"
-	android:background="#FFDCDCDC">
+	android:background="?attr/dialogBackgroundColor">
 
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:text="应用指纹校验"
 		android:textSize="16sp"
-		android:textColor="@color/gray_900"
+		android:textColor="?attr/dialogTextColor"
 		android:textStyle="bold"
 		android:layout_marginBottom="12dp"/>
 
@@ -46,7 +46,7 @@
 		android:layout_marginTop="12dp"
 		android:textSize="11sp"
 		android:gravity="center"
-		android:textColor="@color/gray_900"/>
+		android:textColor="?attr/dialogTextColor"/>/>
 
 </LinearLayout>
 
diff --git a/libappbase/src/main/res/layout/dialog_winboll_host.xml b/libappbase/src/main/res/layout/dialog_winboll_host.xml
index 807a0e7..642b30b 100644
--- a/libappbase/src/main/res/layout/dialog_winboll_host.xml
+++ b/libappbase/src/main/res/layout/dialog_winboll_host.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="16dp"
-    android:background="#FFFFFF">
+    android:background="?attr/dialogBackgroundColor">
 
     <!-- 标题 -->
     <TextView
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:text="设置服务器地址"
         android:textSize="16sp"
-        android:textColor="#212121"
+        android:textColor="?attr/dialogTextColor"
         android:textStyle="bold"
         android:layout_marginBottom="16dp"/>
 
@@ -23,6 +23,7 @@
         android:layout_height="wrap_content"
         android:hint="请输入服务器地址（如http://localhost:8080）"
         android:textSize="14sp"
+        android:textColor="?attr/dialogTextColor"
         android:inputType="textUri"
         android:padding="8dp"
         android:background="@android:drawable/edit_text"
@@ -42,6 +43,7 @@
             android:layout_height="wrap_content"
             android:text="取消"
             android:textSize="14sp"
+            android:textColor="?attr/dialogTextColor"
             android:layout_marginRight="8dp"/>
 
         <!-- 确认按钮 -->
@@ -51,8 +53,8 @@
             android:layout_height="wrap_content"
             android:text="确认"
             android:textSize="14sp"
-            android:backgroundTint="#2196F3"
-            android:textColor="#FFFFFF"/>
+            android:backgroundTint="?attr/toolbarBackgroundColor"
+            android:textColor="?attr/toolbarTextColor"/>
 
     </LinearLayout>
 
diff --git a/libappbase/src/main/res/layout/item_logtag.xml b/libappbase/src/main/res/layout/item_logtag.xml
index a397e01..f00bf13 100644
--- a/libappbase/src/main/res/layout/item_logtag.xml
+++ b/libappbase/src/main/res/layout/item_logtag.xml
@@ -18,6 +18,7 @@
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/log_button_height"
 		android:textSize="@dimen/log_text_size"
+		android:textColor="?attr/toolbarTextColor"
 		android:id="@+id/viewlogtagCheckBox1"/>
 
 </LinearLayout>
diff --git a/libappbase/src/main/res/layout/layout_about_view.xml b/libappbase/src/main/res/layout/layout_about_view.xml
index 38949c4..a1753ff 100644
--- a/libappbase/src/main/res/layout/layout_about_view.xml
+++ b/libappbase/src/main/res/layout/layout_about_view.xml
@@ -2,7 +2,8 @@
 <ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/aboutViewBackgroundColor">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -26,7 +27,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:textSize="18sp"
-			android:textColor="@color/gray_900"/>
+			android:textColor="?attr/aboutViewTitleColor"/>
 
 		<TextView
 			android:id="@+id/tv_app_desc"
@@ -35,14 +36,14 @@
 			android:layout_marginTop="4dp"
 			android:layout_marginBottom="8dp"
 			android:textSize="14sp"
-			android:textColor="@color/gray_500"/>
+			android:textColor="?attr/aboutViewTextColor"/>
 
 		<View
 			android:layout_width="match_parent"
 			android:layout_height="1px"
 			android:layout_marginTop="4dp"
 			android:layout_marginBottom="8dp"
-			android:background="@color/gray_200"/>
+			android:background="?attr/aboutViewDividerColor"/>
 
 		<LinearLayout
 			android:id="@+id/ll_function_container"
diff --git a/libappbase/src/main/res/layout/notification_crash.xml b/libappbase/src/main/res/layout/notification_crash.xml
new file mode 100644
index 0000000..6fbe3e3
--- /dev/null
+++ b/libappbase/src/main/res/layout/notification_crash.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="12dp">
+
+    <TextView
+        android:id="@+id/notification_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:textColor="#333333"
+        android:singleLine="true"
+        android:ellipsize="end" />
+
+    <TextView
+        android:id="@+id/notification_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textSize="14sp"
+        android:textColor="#666666"
+        android:minHeight="200dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/libappbase/src/main/res/layout/notification_crash_expanded.xml b/libappbase/src/main/res/layout/notification_crash_expanded.xml
new file mode 100644
index 0000000..0a1a118
--- /dev/null
+++ b/libappbase/src/main/res/layout/notification_crash_expanded.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="12dp">
+
+    <TextView
+        android:id="@+id/notification_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:textColor="#333333"
+        android:singleLine="true"
+        android:ellipsize="end" />
+
+    <TextView
+        android:id="@+id/notification_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textSize="13sp"
+        android:textColor="#666666"
+        android:scrollbars="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/libappbase/src/main/res/layout/view_globalcrashreport.xml b/libappbase/src/main/res/layout/view_globalcrashreport.xml
index 65c05a7..a5f427e 100644
--- a/libappbase/src/main/res/layout/view_globalcrashreport.xml
+++ b/libappbase/src/main/res/layout/view_globalcrashreport.xml
@@ -2,29 +2,35 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:theme="?attr/themeDebug"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="?attr/colorTextBackgound"
 	android:id="@+id/viewglobalcrashreportLinearLayout1">
 
     <android.widget.Toolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+		android:background="?attr/colorTittleBackgound"
+		android:titleTextColor="?attr/colorTittle"
 		android:id="@+id/viewglobalcrashreportToolbar1"/>
 
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0">
+		android:layout_weight="1.0"
+		android:fillViewport="true">
 
 		<HorizontalScrollView
 			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+			android:layout_height="wrap_content">
 
 			<TextView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:background="#FFFFFFFF"
+				android:padding="16dp"
+				android:textColor="?attr/colorText"
 				android:id="@+id/viewglobalcrashreportTextView1"/>
 
 		</HorizontalScrollView>
diff --git a/libappbase/src/main/res/layout/view_log.xml b/libappbase/src/main/res/layout/view_log.xml
index 0e323e3..b728fbd 100644
--- a/libappbase/src/main/res/layout/view_log.xml
+++ b/libappbase/src/main/res/layout/view_log.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:theme="?attr/themeDebug"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="#FF000000">
+	android:background="?attr/colorTextBackgound">
 
 	<RelativeLayout
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="34dp"
 		android:layout_alignParentTop="true"
-		android:background="@drawable/bg_toolbar_log"
+		android:background="?attr/colorTittleBackgound"
 		android:id="@+id/viewlogRelativeLayoutToolbar">
 
 		<Button
@@ -19,8 +20,8 @@
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
 			android:text="Clean"
-			android:textColor="@color/white"
-			android:backgroundTint="@drawable/btn_gray_bg"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogButtonClean"
 			android:layout_marginLeft="5dp"/>
@@ -34,8 +35,8 @@
 			android:layout_toRightOf="@+id/viewlogButtonClean"
 			android:layout_centerVertical="true"
 			android:id="@+id/viewlogTextView1"
-			android:background="@color/btn_gray_normal"
-			android:textColor="@color/black"/>
+			android:background="?attr/colorTittleBackgound"
+			android:textColor="?attr/toolbarTextColor"/>
 
 		<cc.winboll.studio.libappbase.widget.LogTagSpinner
 			android:layout_width="wrap_content"
@@ -52,17 +53,17 @@
 			android:layout_toLeftOf="@+id/viewlogButtonCopy"
 			android:layout_centerVertical="true"
 			android:text="Selectable"
-			android:background="@color/btn_gray_normal"
+			android:background="?attr/colorTittleBackgound"
 			android:id="@+id/viewlogCheckBoxSelectable"
 			android:padding="@dimen/log_text_padding"
-			android:textColor="@color/white"/>
+			android:textColor="?attr/toolbarTextColor"/>
 
 		<Button
 			android:layout_width="@dimen/log_button_width"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
-			android:textColor="@color/white"
-			android:backgroundTint="@drawable/btn_gray_bg"
+			android:textColor="?attr/activityTextColor"
+			android:background="?attr/toolbarBackgroundColor"
 			android:text="Copy"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
@@ -78,7 +79,7 @@
 		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 		android:id="@+id/viewlogLinearLayout1"
 		android:gravity="center_vertical"
-		android:background="@drawable/bg_toolbar_log">
+		android:background="?attr/colorTittleBackgound">
 
 		<CheckBox
 			android:layout_width="wrap_content"
@@ -87,7 +88,8 @@
 			android:text="ALL"
 			android:padding="2dp"
 			android:id="@+id/viewlogCheckBox1"
-			android:background="@drawable/bg_border_round"
+			android:background="?attr/colorTittleBackgound"
+			android:textColor="?attr/toolbarTextColor"
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>
 
@@ -96,13 +98,15 @@
 			android:ems="10"
 			android:layout_height="@dimen/log_button_height"
 			android:textSize="@dimen/log_text_size"
+			android:textColor="?attr/colorText"
+			android:background="?attr/colorTittleBackgound"
 			android:singleLine="true"
 			android:id="@+id/tagsearch_et"/>
 
 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:background="@drawable/bg_border"
+			android:background="?attr/colorTittleBackgound"
 			android:scrollbars="none"
 			android:padding="2dp"
 			android:layout_weight="1.0"
@@ -128,7 +132,7 @@
 		<ScrollView
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:background="#FF000000"
+			android:background="?attr/colorTextBackgound"
 			android:id="@+id/viewlogScrollViewLog">
 
 			<TextView
@@ -136,7 +140,7 @@
 				android:layout_height="match_parent"
 				android:textSize="@dimen/log_text_size"
 				android:text="Text"
-				android:textColor="#FF00FF00"
+				android:textColor="?attr/debugTextColor"
 				android:textIsSelectable="true"
 				android:id="@+id/viewlogTextViewLog"/>
 
@@ -144,5 +148,4 @@
 
 	</RelativeLayout>
 
-</RelativeLayout>
-
+</RelativeLayout>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values-night/attrs.xml b/libappbase/src/main/res/values-night/attrs.xml
new file mode 100644
index 0000000..3cb4ac4
--- /dev/null
+++ b/libappbase/src/main/res/values-night/attrs.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- 全局主题属性 -->
+    <attr name="themeDebug" format="reference"/>
+
+    <!-- GlobalCrashActivity 样式属性 -->
+    <declare-styleable name="GlobalCrashActivity">
+        <attr name="colorTittle" format="color" />
+        <attr name="colorTittleBackgound" format="color" />
+        <attr name="colorText" format="color" />
+        <attr name="colorTextBackgound" format="color" />
+    </declare-styleable>
+
+    <!-- AboutView 样式属性 -->
+    <declare-styleable name="AboutViewStyle">
+        <attr name="aboutViewBackgroundColor" format="color" />
+        <attr name="aboutViewTextColor" format="color" />
+        <attr name="aboutViewTitleColor" format="color" />
+        <attr name="aboutViewDividerColor" format="color" />
+    </declare-styleable>
+
+    
+
+    <!-- DialogStyle 样式属性 -->
+    <declare-styleable name="DialogStyle">
+        <attr name="dialogBackgroundColor" format="color" />
+        <attr name="dialogTextColor" format="color" />
+    </declare-styleable>
+
+    <!-- 窗体/控件通用背景色属性 -->
+    <attr name="toolbarBackgroundColor" format="color"/>
+    <attr name="textViewBackgroundColor" format="color"/>
+    <attr name="editTextBackgroundColor" format="color"/>
+    <attr name="scrollViewBackgroundColor" format="color"/>
+
+    <!-- 窗体/控件通用文字色属性 -->
+    <attr name="toolbarTextColor" format="color"/>
+    <attr name="textViewTextColor" format="color"/>
+    <attr name="editTextTextColor" format="color"/>
+
+    <!-- ActivityStyle 样式属性 -->
+    <attr name="activityBackgroundColor" format="color"/>
+    <attr name="activityTextColor" format="color"/>
+
+    <!-- MainWindowStyle 主窗口样式属性 -->
+    <attr name="mainWindowBackgroundColor" format="color"/>
+    <attr name="mainWindowTextColor" format="color"/>
+
+    <!-- MainWindowDarkStyle 深色模式主窗口样式属性 -->
+    <attr name="mainWindowDarkBackgroundColor" format="color"/>
+    <attr name="mainWindowDarkTextColor" format="color"/>
+
+    <!-- DebugLogStyle 应用调试日志样式属性 -->
+    <attr name="debugTextColor" format="color"/>
+
+</resources>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values-night/colors.xml b/libappbase/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..4612c3a
--- /dev/null
+++ b/libappbase/src/main/res/values-night/colors.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#FF1E3A5F</color>
+    <color name="colorPrimaryDark">#FF15253D</color>
+    <color name="colorAccent">#FF4DA6FF</color>
+    <color name="colorText">#FFE0E0E0</color>
+	<color name="colorTextBackgound">#FF0D1B2A</color>
+
+	<!-- ============== 基础黑白（必含，适配文字/背景） ============== -->
+	<color name="white">#FFFFFF</color>
+	<color name="black">#000000</color>
+
+	<!-- ============== 基础色系（按钮/强调色常用） ============== -->
+	<color name="blue_light">#4A90E2</color>
+	<color name="blue_normal">#2196F3</color>
+	<color name="blue_dark">#1976D2</color>
+	<color name="green_light">#66BB6A</color>
+	<color name="green_normal">#4CAF50</color>
+	<color name="green_dark">#388E3C</color>
+	<color name="red_light">#EF5350</color>
+	<color name="red_normal">#F44336</color>
+	<color name="red_dark">#D32F2F</color>
+	<color name="yellow_light">#FFF59D</color>
+	<color name="yellow_normal">#FFC107</color>
+	<color name="yellow_dark">#FFA000</color>
+	<color name="orange_normal">#FF9800</color>
+	<color name="purple_normal">#9C27B0</color>
+
+	<!-- ============== 透明色（遮罩/背景叠加） ============== -->
+	<color name="transparent">#00000000</color>
+	<color name="black_transparent_50">#80000000</color>
+
+	<!-- ============== 不透明灰色（常用深浅梯度） ============== -->
+	<color name="gray_100">#1A1A1A</color>
+	<color name="gray_200">#262626</color>
+	<color name="gray_300">#333333</color>
+	<color name="gray_400">#4D4D4D</color>
+	<color name="gray_500">#666666</color>
+	<color name="gray_600">#808080</color>
+	<color name="gray_700">#999999</color>
+	<color name="gray_800">#B3B3B3</color>
+	<color name="gray_900">#CCCCCC</color>
+
+	<!-- ============== 半透明灰色 ============== -->
+	<color name="gray_transparent_30">#4D333333</color>
+	<color name="gray_transparent_50">#80333333</color>
+	<color name="gray_transparent_70">#B3333333</color>
+
+	<color name="gray_light">#333333</color>
+	<color name="gray_mid">#666666</color>
+	<color name="gray_dark">#999999</color>
+	<color name="gray_black">#CCCCCC</color>
+
+	<!-- ============== 遮罩/蒙层 ============== -->
+	<color name="mask_gray">#804D4D4D</color>
+	<color name="bg_overlay_gray">#4D1A1A1A</color>
+
+	<!-- ============== 按钮灰色 ============== -->
+	<color name="btn_gray_normal">#666666</color>
+	<color name="btn_gray_pressed">#4D4D4D</color>
+	<color name="btn_gray_disabled">#333333</color>
+
+	<!-- ============== 主题颜色 ============== -->
+	<color name="mainWindowBackgroundColor">#FF0D1B2A</color>
+	<color name="mainWindowTextColor">#FFE0E0E0</color>
+	<color name="toolbarTextColor">#FFE0E0E0</color>
+	<color name="toolbarBackgroundColor">#FF1E3A5F</color>
+	
+	<color name="debugTextColor">#FF00FF00</color>
+
+</resources>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values-night/styles.xml b/libappbase/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..b8d576a
--- /dev/null
+++ b/libappbase/src/main/res/values-night/styles.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- APPBaseTheme 深色模式主题 -->
+    <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="themeDebug">@style/DebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="aboutViewTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="aboutViewTitleColor">?attr/mainWindowDarkTextColor</item>
+        <item name="aboutViewDividerColor">?attr/mainWindowTextColor</item>
+        
+        
+        <item name="dialogBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="dialogTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="textViewTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="editTextBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="editTextTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="scrollViewBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="activityBackgroundColor">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="activityTextColor">?attr/mainWindowDarkTextColor</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
+    </style>
+
+    <!-- DebugActivityTheme 深色模式样式 -->
+    <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">?attr/mainWindowDarkTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
+        <item name="colorTextBackgound">?attr/mainWindowDarkBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        
+	</style>
+
+    <!-- DialogStyle 对话框样式 -->
+	<style name="DialogStyle" parent="@android:style/Theme.Dialog">
+		<item name="android:windowBackground">@android:color/transparent</item>
+		<item name="android:windowNoTitle">true</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values/attrs.xml b/libappbase/src/main/res/values/attrs.xml
index 5a4ca3c..b569d4f 100644
--- a/libappbase/src/main/res/values/attrs.xml
+++ b/libappbase/src/main/res/values/attrs.xml
@@ -1,13 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="themeGlobalCrashActivity" format="reference"/>
+    <!-- 全局主题属性 -->
+    <attr name="themeDebug" format="reference"/>
 
-    <declare-styleable name="GlobalCrashActivity">
-        <attr name="colorTittle" format="color" />
-        <attr name="colorTittleBackgound" format="color" />
-        <attr name="colorText" format="color" />
-        <attr name="colorTextBackgound" format="color" />
+    <!-- AboutView 样式属性 -->
+    <declare-styleable name="AboutView">
+        <attr name="app_name" format="string" />
+        <attr name="app_apkfoldername" format="string" />
+        <attr name="app_apkname" format="string" />
+        <attr name="app_gitname" format="string" />
+        <attr name="app_gitowner" format="string" />
+        <attr name="app_gitappbranch" format="string" />
+        <attr name="app_gitappsubprojectfolder" format="string" />
+        <attr name="appdescription" format="string" />
+        <attr name="appicon" format="reference" />
+        <attr name="is_adddebugtools" format="boolean" />
     </declare-styleable>
 
-</resources>
+    <!-- AboutViewStyle 样式属性 -->
+    <declare-styleable name="AboutViewStyle">
+        <attr name="aboutViewBackgroundColor" format="color" />
+        <attr name="aboutViewTextColor" format="color" />
+        <attr name="aboutViewTitleColor" format="color" />
+        <attr name="aboutViewDividerColor" format="color" />
+    </declare-styleable>
+
+    
+
+    <!-- DialogStyle 样式属性 -->
+    <declare-styleable name="DialogStyle">
+        <attr name="dialogBackgroundColor" format="color" />
+        <attr name="dialogTextColor" format="color" />
+    </declare-styleable>
+
+    <!-- 窗体/控件通用背景色属性 -->
+    <attr name="toolbarBackgroundColor" format="color"/>
+    <attr name="textViewBackgroundColor" format="color"/>
+    <attr name="editTextBackgroundColor" format="color"/>
+    <attr name="scrollViewBackgroundColor" format="color"/>
+
+    <!-- 窗体/控件通用文字色属性 -->
+    <attr name="toolbarTextColor" format="color"/>
+    <attr name="textViewTextColor" format="color"/>
+    <attr name="editTextTextColor" format="color"/>
+
+    <!-- ActivityStyle 样式属性 -->
+    <attr name="activityBackgroundColor" format="color"/>
+    <attr name="activityTextColor" format="color"/>
+
+    <!-- MainWindowStyle 主窗口样式属性 -->
+    <attr name="mainWindowBackgroundColor" format="color"/>
+    <attr name="mainWindowTextColor" format="color"/>
+
+    <!-- MainWindowDarkStyle 深色模式主窗口样式属性 -->
+    <attr name="mainWindowDarkBackgroundColor" format="color"/>
+    <attr name="mainWindowDarkTextColor" format="color"/>
+
+    <!-- DebugLogStyle 应用调试日志样式属性 -->
+    <attr name="debugTextColor" format="color"/>
+
+</resources>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values/colors.xml b/libappbase/src/main/res/values/colors.xml
index 940fec4..28712e5 100644
--- a/libappbase/src/main/res/values/colors.xml
+++ b/libappbase/src/main/res/values/colors.xml
@@ -1,74 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#FF00B322</color>
-    <color name="colorPrimaryDark">#FF005C12</color>
+    <color name="colorPrimaryDark">#FF008F1A</color>
     <color name="colorAccent">#FF8DFFA2</color>
-    <color name="colorText">#FFFFFB8D</color>
-	<color name="colorTextBackgound">#FF000000</color>
+    <color name="colorText">#FF000000</color>
+	<color name="colorTextBackgound">#FFF5F5F5</color>
 
 	<!-- ============== 基础黑白（必含，适配文字/背景） ============== -->
-	<color name="white">#FFFFFF</color>          <!-- 纯白色（文字/背景） -->
-	<color name="black">#000000</color>          <!-- 近黑色（重要文字） -->
+	<color name="white">#FFFFFF</color>
+	<color name="black">#000000</color>
 
 	<!-- ============== 基础色系（按钮/强调色常用） ============== -->
-	<!-- 蓝色系（常用：确认/链接/主题色） -->
-	<color name="blue_light">#4A90E2</color>     <!-- 浅蓝（次要按钮） -->
-	<color name="blue_normal">#2196F3</color>    <!-- 标准蓝（主题/确认按钮） -->
-	<color name="blue_dark">#1976D2</color>      <!-- 深蓝（按压态/重要强调） -->
-	<!-- 绿色系（常用：成功/完成/安全提示） -->
-	<color name="green_light">#66BB6A</color>    <!-- 浅绿（次要成功态） -->
-	<color name="green_normal">#4CAF50</color>   <!-- 标准绿（成功按钮/提示） -->
-	<color name="green_dark">#388E3C</color>     <!-- 深绿（按压态/重要成功） -->
-	<!-- 红色系（常用：错误/警告/删除按钮） -->
-	<color name="red_light">#EF5350</color>      <!-- 浅红（次要错误提示） -->
-	<color name="red_normal">#F44336</color>     <!-- 标准红（删除/错误按钮） -->
-	<color name="red_dark">#D32F2F</color>       <!-- 深红（按压态/重要错误） -->
-	<!-- 黄色系（常用：警告/提醒/高亮） -->
-	<color name="yellow_light">#FFF59D</color>   <!-- 浅黄（次要提醒） -->
-	<color name="yellow_normal">#FFC107</color>  <!-- 标准黄（警告提示/高亮） -->
-	<color name="yellow_dark">#FFA000</color>    <!-- 深黄（重要警告） -->
-	<!-- 橙色系（常用：提醒/进度/活力色） -->
-	<color name="orange_normal">#FF9800</color>  <!-- 标准橙（提醒按钮/进度） -->
-	<!-- 紫色系（常用：特殊强调/个性按钮） -->
-	<color name="purple_normal">#9C27B0</color>  <!-- 标准紫（特殊功能按钮） -->
+	<color name="blue_light">#4A90E2</color>
+	<color name="blue_normal">#2196F3</color>
+	<color name="blue_dark">#1976D2</color>
+	<color name="green_light">#66BB6A</color>
+	<color name="green_normal">#4CAF50</color>
+	<color name="green_dark">#388E3C</color>
+	<color name="red_light">#EF5350</color>
+	<color name="red_normal">#F44336</color>
+	<color name="red_dark">#D32F2F</color>
+	<color name="yellow_light">#FFF59D</color>
+	<color name="yellow_normal">#FFC107</color>
+	<color name="yellow_dark">#FFA000</color>
+	<color name="orange_normal">#FF9800</color>
+	<color name="purple_normal">#9C27B0</color>
 
 	<!-- ============== 透明色（遮罩/背景叠加） ============== -->
-	<color name="transparent">#00000000</color>  <!-- 全透明 -->
-	<color name="black_transparent_50">#80000000</color> <!-- 50%透明黑（遮罩） -->
+	<color name="transparent">#00000000</color>
+	<color name="black_transparent_50">#80000000</color>
 
+	<!-- ============== 不透明灰色（常用深浅梯度） ============== -->
+	<color name="gray_100">#F5F5F5</color>
+	<color name="gray_200">#EEEEEE</color>
+	<color name="gray_300">#E0E0E0</color>
+	<color name="gray_400">#BDBDBD</color>
+	<color name="gray_500">#9E9E9E</color>
+	<color name="gray_600">#757575</color>
+	<color name="gray_700">#616161</color>
+	<color name="gray_800">#424242</color>
+	<color name="gray_900">#212121</color>
 
+	<!-- ============== 半透明灰色 ============== -->
+	<color name="gray_transparent_30">#4D9E9E9E</color>
+	<color name="gray_transparent_50">#809E9E9E</color>
+	<color name="gray_transparent_70">#B39E9E9E</color>
 
-	<!-- 1. 不透明灰色（常用深浅梯度，直接用） -->
-	<color name="gray_100">#F5F5F5</color> <!-- 极浅灰（接近白色，背景用） -->
-	<color name="gray_200">#EEEEEE</color> <!-- 浅灰（卡片/分割线背景） -->
-	<color name="gray_300">#E0E0E0</color> <!-- 中浅灰（边框/次要背景） -->
-	<color name="gray_400">#BDBDBD</color> <!-- 中灰（次要文字/图标） -->
-	<color name="gray_500">#9E9E9E</color> <!-- 标准中灰（常用辅助文字） -->
-	<color name="gray_600">#757575</color> <!-- 中深灰（常规辅助文字） -->
-	<color name="gray_700">#616161</color> <!-- 深灰（重要辅助文字） -->
-	<color name="gray_800">#424242</color> <!-- 极深灰（接近黑色，标题副文本） -->
-	<color name="gray_900">#212121</color> <!-- 近黑色（特殊场景用） -->
+	<color name="gray_light">#EEE</color>
+	<color name="gray_mid">#999</color>
+	<color name="gray_dark">#666</color>
+	<color name="gray_black">#333</color>
 
-	<!-- 2. 半透明灰色（带透明度，遮罩/蒙层用） -->
-	<color name="gray_transparent_30">#4D9E9E9E</color> <!-- 30%透明中灰（A=4D） -->
-	<color name="gray_transparent_50">#809E9E9E</color> <!-- 50%透明中灰（A=80） -->
-	<color name="gray_transparent_70">#B39E9E9E</color> <!-- 70%透明中灰（A=B3） -->
-
-	<color name="gray_light">#EEE</color>  <!-- 等价 #EEEEEE（浅灰） -->
-	<color name="gray_mid">#999</color>    <!-- 等价 #999999（中灰） -->
-	<color name="gray_dark">#666</color>   <!-- 等价 #666666（深灰） -->
-	<color name="gray_black">#333</color>  <!-- 等价 #333333（极深灰） -->
-
-	<!-- 50% 透明中灰（弹窗遮罩常用） -->
+	<!-- ============== 遮罩/蒙层 ============== -->
 	<color name="mask_gray">#809E9E9E</color>
-	<!-- 30% 透明深灰（背景叠加） -->
 	<color name="bg_overlay_gray">#4D424242</color>
 
-	<!-- 1. 常规灰色（按钮默认态，常用中灰） -->
+	<!-- ============== 按钮灰色 ============== -->
 	<color name="btn_gray_normal">#9E9E9E</color>
-	<!-- 2. 按压深色（按钮点击态，加深一级，提升交互感） -->
 	<color name="btn_gray_pressed">#757575</color>
-	<!-- 3. 禁用灰色（按钮不可点击态，浅灰） -->
 	<color name="btn_gray_disabled">#E0E0E0</color>
 
-</resources>
+	<!-- ============== 主题颜色 ============== -->
+	<color name="mainWindowBackgroundColor">#FFF5F5F5</color>
+	<color name="mainWindowTextColor">#FF000000</color>
+	<color name="toolbarTextColor">#FF000000</color>
+	<color name="toolbarBackgroundColor">#FF00B322</color>
+	
+	<color name="debugTextColor">#FF808080</color>
+
+</resources>
\ No newline at end of file
diff --git a/libappbase/src/main/res/values/strings.xml b/libappbase/src/main/res/values/strings.xml
index 99fef9d..c2219d5 100644
--- a/libappbase/src/main/res/values/strings.xml
+++ b/libappbase/src/main/res/values/strings.xml
@@ -3,4 +3,6 @@
 
     <string name="lib_name">libappbase</string>
     <string name="hello_world">Hello, world!</string>
+	<string name="shared_user_id">cc.winboll.studio</string>
+    <string name="shared_user_label">studio@winboll.cc</string>
 </resources>
diff --git a/libappbase/src/main/res/values/styles.xml b/libappbase/src/main/res/values/styles.xml
index 160ac17..92d8143 100644
--- a/libappbase/src/main/res/values/styles.xml
+++ b/libappbase/src/main/res/values/styles.xml
@@ -1,20 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- APPBaseTheme 普通模式主题 -->
     <style name="APPBaseTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
+        <item name="themeDebug">@style/DebugActivityTheme</item>
+        <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
+        
+        
+        <item name="dialogBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="dialogTextColor">?attr/mainWindowTextColor</item>
+        <item name="toolbarBackgroundColor">@color/toolbarBackgroundColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        <item name="textViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="textViewTextColor">?attr/mainWindowTextColor</item>
+        <item name="editTextBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="editTextTextColor">?attr/mainWindowTextColor</item>
+        <item name="scrollViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="activityTextColor">?attr/mainWindowTextColor</item>
+        <item name="mainWindowBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowTextColor">@color/mainWindowTextColor</item>
+        <item name="mainWindowDarkBackgroundColor">@color/mainWindowBackgroundColor</item>
+        <item name="mainWindowDarkTextColor">@color/mainWindowTextColor</item>
     </style>
 
-    <style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
-        <item name="colorTittle">#FFFFF600</item>
-        <item name="colorTittleBackgound">#FF00B322</item>
-        <item name="colorText">#FF00B322</item>
-        <item name="colorTextBackgound">#FF000000</item>
+    <!-- DebugActivityTheme 普通模式样式 -->
+    <style name="DebugActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">?attr/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">?attr/debugTextColor</item>
+        <item name="colorTextBackgound">?attr/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
+        
 	</style>
-	
+
+    <!-- DialogStyle 对话框样式 -->
 	<style name="DialogStyle" parent="@android:style/Theme.Dialog">
 		<item name="android:windowBackground">@android:color/transparent</item>
 		<item name="android:windowNoTitle">true</item>
 	</style>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/libdebugtemp/.gitignore b/libdebugtemp/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/libdebugtemp/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/libdebugtemp/build.gradle b/libdebugtemp/build.gradle
new file mode 100644
index 0000000..b11c04e
--- /dev/null
+++ b/libdebugtemp/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply from: '../.winboll/winboll_lib_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 30
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}
diff --git a/libdebugtemp/build.properties b/libdebugtemp/build.properties
new file mode 100644
index 0000000..9805e56
--- /dev/null
+++ b/libdebugtemp/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Fri May 01 17:09:11 HKT 2026
+stageCount=57
+libraryProject=libdebugtemp
+baseVersion=15.0
+publishVersion=15.0.56
+buildCount=0
+baseBetaVersion=15.0.57
diff --git a/libdebugtemp/proguard-rules.pro b/libdebugtemp/proguard-rules.pro
new file mode 100644
index 0000000..536058a
--- /dev/null
+++ b/libdebugtemp/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:/tools/adt-bundle-windows-x86_64-20131030/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/libdebugtemp/src/main/AndroidManifest.xml b/libdebugtemp/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..f30d087
--- /dev/null
+++ b/libdebugtemp/src/main/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio" >
+
+    <application>
+        <activity
+            android:name=".LibraryActivity"
+            android:label="@string/lib_name" >
+        </activity>
+    </application>
+
+</manifest>
+
diff --git a/libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java b/libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java
new file mode 100644
index 0000000..b4a25a8
--- /dev/null
+++ b/libdebugtemp/src/main/java/cc/winboll/studio/LibraryActivity.java
@@ -0,0 +1,12 @@
+package cc.winboll.studio;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class LibraryActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.library);
+    }
+}
diff --git a/libdebugtemp/src/main/res/drawable-hdpi/ic_launcher.png b/libdebugtemp/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/libdebugtemp/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/libdebugtemp/src/main/res/drawable-mdpi/ic_launcher.png b/libdebugtemp/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/libdebugtemp/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/libdebugtemp/src/main/res/drawable-xhdpi/ic_launcher.png b/libdebugtemp/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/libdebugtemp/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/libdebugtemp/src/main/res/drawable-xxhdpi/ic_launcher.png b/libdebugtemp/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4df1894
Binary files /dev/null and b/libdebugtemp/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/libdebugtemp/src/main/res/layout/library.xml b/libdebugtemp/src/main/res/layout/library.xml
new file mode 100644
index 0000000..5f67086
--- /dev/null
+++ b/libdebugtemp/src/main/res/layout/library.xml
@@ -0,0 +1,11 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+
+    <TextView
+        android:text="@string/text_libraryactivity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/libdebugtemp/src/main/res/values-v21/styles.xml b/libdebugtemp/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..0948fdc
--- /dev/null
+++ b/libdebugtemp/src/main/res/values-v21/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light">
+	</style>
+</resources>
\ No newline at end of file
diff --git a/libdebugtemp/src/main/res/values/strings.xml b/libdebugtemp/src/main/res/values/strings.xml
new file mode 100644
index 0000000..7d1f811
--- /dev/null
+++ b/libdebugtemp/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="lib_name">libdebugtemp</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="text_libraryactivity">LibraryActivity</string>
+
+</resources>
diff --git a/libdebugtemp/src/main/res/values/styles.xml b/libdebugtemp/src/main/res/values/styles.xml
new file mode 100644
index 0000000..8d78246
--- /dev/null
+++ b/libdebugtemp/src/main/res/values/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Holo.Light">
+	</style>
+</resources>
\ No newline at end of file
diff --git a/libwinboll/.gitignore b/libwinboll/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/libwinboll/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/libwinboll/build.gradle b/libwinboll/build.gradle
new file mode 100644
index 0000000..75e82de
--- /dev/null
+++ b/libwinboll/build.gradle
@@ -0,0 +1,42 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply from: '../.winboll/winboll_lib_build.gradle'
+apply from: '../.winboll/winboll_lint_build.gradle'
+
+android {
+	// 适配MIUI12
+	compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 26
+        targetSdkVersion 30
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+	// 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+	// Gson
+	api 'com.google.code.gson:gson:2.8.9'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+	// 添加JSch依赖（SFTP核心，com.jcraft:jsch:0.1.54）
+	api 'com.jcraft:jsch:0.1.54'
+	
+	// WinBoLL库 nexus.winboll.cc 地址
+	api 'cc.winboll.studio:libaes:15.20.3'
+    api 'cc.winboll.studio:libappbase:15.20.9'
+	
+    api fileTree(dir: 'libs', include: ['*.jar'])
+}
diff --git a/libwinboll/build.properties b/libwinboll/build.properties
new file mode 100644
index 0000000..cc56cae
--- /dev/null
+++ b/libwinboll/build.properties
@@ -0,0 +1,8 @@
+#Created by .winboll/winboll_app_build.gradle
+#Wed May 13 13:48:00 CST 2026
+stageCount=2
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.1
+buildCount=2
+baseBetaVersion=15.20.2
diff --git a/libwinboll/proguard-rules.pro b/libwinboll/proguard-rules.pro
new file mode 100644
index 0000000..536058a
--- /dev/null
+++ b/libwinboll/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:/tools/adt-bundle-windows-x86_64-20131030/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/libwinboll/src/main/AndroidManifest.xml b/libwinboll/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..2323080
--- /dev/null
+++ b/libwinboll/src/main/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cc.winboll.studio.libwinboll" >
+
+    <application>
+        <activity
+            android:name=".WinBoLLLibraryActivity">
+        </activity>
+    </application>
+
+</manifest>
+
diff --git a/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java b/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java
new file mode 100644
index 0000000..bb86ae9
--- /dev/null
+++ b/libwinboll/src/main/java/cc/winboll/studio/libwinboll/WinBoLLLibraryActivity.java
@@ -0,0 +1,17 @@
+package cc.winboll.studio.libwinboll;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+public class WinBoLLLibraryActivity extends Activity 
+{
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_winbolllibrary);
+		
+		ToastUtils.show("WinBoLLLibraryActivity onCreate");
+    }
+}
diff --git a/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/libwinboll/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/libwinboll/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/libwinboll/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png b/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4df1894
Binary files /dev/null and b/libwinboll/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/libwinboll/src/main/res/layout/activity_winbolllibrary.xml b/libwinboll/src/main/res/layout/activity_winbolllibrary.xml
new file mode 100644
index 0000000..97dc11a
--- /dev/null
+++ b/libwinboll/src/main/res/layout/activity_winbolllibrary.xml
@@ -0,0 +1,11 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="cc.winboll.studio.libwinboll.WinBoLLLibraryActivity"/>
+
+</LinearLayout>
diff --git a/libwinboll/src/main/res/values-v21/styles.xml b/libwinboll/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..0948fdc
--- /dev/null
+++ b/libwinboll/src/main/res/values-v21/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light">
+	</style>
+</resources>
\ No newline at end of file
diff --git a/libwinboll/src/main/res/values/strings.xml b/libwinboll/src/main/res/values/strings.xml
new file mode 100644
index 0000000..b677aa6
--- /dev/null
+++ b/libwinboll/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="lib_name">libwinboll</string>
+    <string name="hello_world">Hello world!</string>
+
+</resources>
diff --git a/libwinboll/src/main/res/values/styles.xml b/libwinboll/src/main/res/values/styles.xml
new file mode 100644
index 0000000..8d78246
--- /dev/null
+++ b/libwinboll/src/main/res/values/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Holo.Light">
+	</style>
+</resources>
\ No newline at end of file
diff --git a/settings.gradle-demo b/settings.gradle-demo
index 477853a..73a9840 100644
--- a/settings.gradle-demo
+++ b/settings.gradle-demo
@@ -72,6 +72,7 @@
 
 // WinBoLL 项目编译设置
 //include ':winboll'
+//include ':libwinboll'
 //rootProject.name = "winboll"
 
 // RegExpUtils 项目编译设置
@@ -82,3 +83,16 @@
 //include ':gpsrelaysentinel'
 //include ':libgpsrelaysentinel'
 //rootProject.name = "gpsrelaysentinel"
+
+// Gallery 项目编译设置
+//include ':gallery'
+//rootProject.name = "gallery"
+
+// DebugTemp 项目编译设置
+//include ':debugtemp'
+//include ':libdebugtemp'
+//rootProject.name = "debugtemp"
+
+// AutoNFC 项目编译设置
+//include ':autonfc'
+//rootProject.name = "autonfc"
diff --git a/winboll/build.gradle b/winboll/build.gradle
index 46828ad..f1ca517 100644
--- a/winboll/build.gradle
+++ b/winboll/build.gradle
@@ -31,7 +31,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11"
+        versionName "15.20"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-    
+	api project(':libwinboll')
     api 'com.google.code.gson:gson:2.10.1'
 	
 	// 下拉控件
@@ -67,8 +67,6 @@ dependencies {
     api 'io.github.medyo:android-about-page:2.0.0'
 	// 网络连接类库
     api 'com.squareup.okhttp3:okhttp:4.4.1'
-	// OkHttp网络请求
-     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
      // FastJSON解析
      implementation 'com.alibaba:fastjson:1.2.76'
     
@@ -86,7 +84,6 @@ dependencies {
      //注意：以下5个库必须要引入
     //implementation 'androidx.appcompat:appcompat:1.4.1'
     api 'androidx.recyclerview:recyclerview:1.0.0'
-    api 'com.google.code.gson:gson:2.8.5'
     api 'com.github.bumptech.glide:glide:4.9.0'
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 
@@ -107,13 +104,5 @@ dependencies {
 	implementation 'com.termux:terminal-view:0.118.0'
 	implementation 'com.termux:termux-shared:0.118.0'
 	
-	// WinBoLL库 nexus.winboll.cc 地址
-	api 'cc.winboll.studio:libaes:15.15.2'
-    api 'cc.winboll.studio:libappbase:15.15.11'
-	
-	// WinBoLL备用库 jitpack.io 地址
-	//api 'com.github.ZhanGSKen:AES:aes-v15.15.7'
-	//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4'
-	
 	api fileTree(dir: 'libs', include: ['*.jar'])
 }
diff --git a/winboll/build.properties b/winboll/build.properties
index c7c8cc1..cc56cae 100644
--- a/winboll/build.properties
+++ b/winboll/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed May 06 13:39:52 CST 2026
-stageCount=27
-libraryProject=
-baseVersion=15.11
-publishVersion=15.11.26
-buildCount=22
-baseBetaVersion=15.11.27
+#Wed May 13 13:48:00 CST 2026
+stageCount=2
+libraryProject=libwinboll
+baseVersion=15.20
+publishVersion=15.20.1
+buildCount=2
+baseBetaVersion=15.20.2
diff --git a/winboll/src/main/AndroidManifest.xml b/winboll/src/main/AndroidManifest.xml
index 9c136b1..a949d1a 100644
--- a/winboll/src/main/AndroidManifest.xml
+++ b/winboll/src/main/AndroidManifest.xml
@@ -15,14 +15,13 @@
     <uses-permission android:name="android.permission.REORDER_TASKS"/>
 
     <!-- 计算应用存储空间 -->
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
+    <uses-permission
+        android:name="android.permission.GET_PACKAGE_SIZE"/>
 
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission"/>
 
-    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
-
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
index e2a9402..3ffc723 100644
--- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java
@@ -11,6 +11,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.models.DrawerMenuBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
@@ -36,33 +37,32 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setTheme(cc.winboll.studio.winboll.theme.WinBoLLThemeUtil.getThemeTypeID(this));
         super.onCreate(savedInstanceState);
-        // ------------------- 新增：初始化MainActivity的Handler（关键） -------------------
         initMainHandler();
-
         if (mBrowserFragment == null) {
             String externalUrl = extractExternalUrl(getIntent());
             if (externalUrl != null) {
                 mBrowserFragment = BrowserFragment.newInstance(externalUrl);
             } else {
-                mBrowserFragment = new BrowserFragment();
+                mBrowserFragment = BrowserFragment.newInstance();
             }
             addFragment(mBrowserFragment);
         }
         showFragment(mBrowserFragment);
     }
 
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        String externalUrl = extractExternalUrl(intent);
-        if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
-            Message msg = Message.obtain();
-            msg.what = BrowserFragment.MSG_OPEN_URL;
-            msg.obj = externalUrl;
-            mBrowserFragment.getBrowserHandler().sendMessage(msg);
-        }
-    }
+//    @Override
+//    protected void onNewIntent(Intent intent) {
+//        super.onNewIntent(intent);
+//        String externalUrl = extractExternalUrl(intent);
+//        if (externalUrl != null && mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+//            Message msg = Message.obtain();
+//            msg.what = BrowserFragment.MSG_OPEN_URL;
+//            msg.obj = externalUrl;
+//            mBrowserFragment.getBrowserHandler().sendMessage(msg);
+//        }
+//    }
 
     private String extractExternalUrl(Intent intent) {
         if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
@@ -170,32 +170,35 @@ public class MainActivity extends DrawerFragmentActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        int nItemId = item.getItemId();
-		if (nItemId == R.id.item_home) {
-			// 发送MSG_HOMEPAGE消息给BrowserFragment
-			if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
-				Message msg = Message.obtain();
-				msg.what = BrowserFragment.MSG_HOMEPAGE;
-				mBrowserFragment.getBrowserHandler().sendMessage(msg);
-			}
-		} else if (nItemId == R.id.item_settings) {
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
-        } else if (nItemId == R.id.item_about) {
-			Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
-
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
-        } else if (nItemId == R.id.item_mytermux) {
-			Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
-			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			startActivity(intent);
-        } else if (nItemId == R.id.item_termux_env_test) {
-			Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
-
-			WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+        if (AESThemeUtil.onWinBoLLThemeItemSelected(this, item)) {
+            recreate();
         } else {
-			return super.onOptionsItemSelected(item);
-		}
-
+            int nItemId = item.getItemId();
+            if (nItemId == R.id.item_home) {
+                if (mBrowserFragment != null && mBrowserFragment.getBrowserHandler() != null) {
+                    Message msg = Message.obtain();
+                    msg.what = BrowserFragment.MSG_HOMEPAGE;
+                    mBrowserFragment.getBrowserHandler().sendMessage(msg);
+                }
+            } else if (nItemId == R.id.item_settings) {
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), SettingsActivity.class);
+            } else if (nItemId == R.id.item_about) {
+                Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_mytermux) {
+                Intent intent = new Intent(getApplicationContext(), MyTermuxActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            } else if (nItemId == R.id.item_termux_env_test) {
+                Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else if (nItemId == R.id.item_library_activity) {
+                Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class);
+                WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class);
+            } else {
+                return super.onOptionsItemSelected(item);
+            }
+        }
         return true;
     }
 
diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java
index 9d4f407..7dedd62 100644
--- a/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/activities/BaseWinBoLLActivity.java
@@ -5,8 +5,8 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.models.AESThemeBean;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.winboll.theme.WinBoLLThemeUtil;
 
 /**
  * @Author 豆包&ZhanGSKen<zhangsken@qq.com>
@@ -29,16 +29,11 @@ public abstract class BaseWinBoLLActivity extends AppCompatActivity implements I
     }
 
     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()));
+        return WinBoLLThemeUtil.getThemeStyleType(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     void setThemeStyle() {
-        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        setTheme(WinBoLLThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 
     @Override
diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java
index 5e7bddd..6bd2b29 100644
--- a/winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/applications/MyTermuxActivity.java
@@ -1,31 +1,46 @@
 package cc.winboll.studio.winboll.applications;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.winboll.R;
+import cc.winboll.studio.winboll.models.TermuxButtonManager;
+import cc.winboll.studio.winboll.models.TermuxButtonModel;
 import cc.winboll.studio.winboll.termux.TermuxCommandExecutor;
+import java.util.ArrayList;
 
 public class MyTermuxActivity extends AppCompatActivity {
 
     public static final String TAG = "MyTermuxActivity";
 
     private Toolbar mToolbar;
-    private Button mTermuxButton;
-	private Button mTermuxWorkSpacesButton;
+    private ListView mListView;
+    private Button mBtnAdd;
+    private ButtonAdapter mAdapter;
+    private ArrayList<TermuxButtonModel> mButtonList;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my_termux);
 
-        // 初始化工具栏
         initToolbar();
-        // 初始化按钮
-        initView();
+        initListView();
+        initAddButton();
+        refreshList();
     }
 
     private void initToolbar() {
@@ -34,44 +49,189 @@ public class MyTermuxActivity extends AppCompatActivity {
             setSupportActionBar(mToolbar);
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						LogUtils.d(TAG, "点击返回按钮");
-						finish();
-					}
-				});
-            LogUtils.d(TAG, "工具栏初始化完成");
+                @Override
+                public void onClick(View v) {
+                    finish();
+                }
+            });
         }
     }
 
-    private void initView() {
-        mTermuxButton = findViewById(R.id.btn_termux);
-        if (mTermuxButton != null) {
-            mTermuxButton.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						LogUtils.d(TAG, "点击 Termux 按钮");
-						TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~");
-						//TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
-					}
-				});
-            LogUtils.d(TAG, "Termux 按钮初始化完成");
-        }
+    private void initListView() {
+        mListView = findViewById(R.id.list_termux_buttons);
+        mButtonList = new ArrayList<TermuxButtonModel>();
+        mAdapter = new ButtonAdapter();
+        mListView.setAdapter(mAdapter);
 
-		mTermuxWorkSpacesButton = findViewById(R.id.btn_termuxworkspaces);
-        if (mTermuxWorkSpacesButton != null) {
-            mTermuxWorkSpacesButton.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						LogUtils.d(TAG, "点击 TermuxWorkSpaces 按钮");
-						TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this, "cd ~/TermuxWorkSpaces", "./TermuxWorkSpaces");
-					}
-				});
-            LogUtils.d(TAG, "TermuxWorkSpaces 按钮初始化完成");
-        }
+        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                TermuxButtonModel model = mButtonList.get(position);
+                TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
+                    model.getExeCommand(), model.getWorkDir());
+            }
+        });
+
+        mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+            @Override
+            public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+                showContextMenu(position);
+                return true;
+            }
+        });
     }
 
-    private boolean isTermuxAvailable() {
-        return TermuxCommandExecutor.isTermuxInstalled(this);
+    private void initAddButton() {
+        mBtnAdd = findViewById(R.id.btn_add_termux_button);
+        mBtnAdd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showButtonDialog(-1, null);
+            }
+        });
+    }
+
+    private void refreshList() {
+        mButtonList.clear();
+        ArrayList<TermuxButtonModel> loaded = TermuxButtonManager.loadButtons(this);
+        if (loaded != null) {
+            mButtonList.addAll(loaded);
+        }
+        mAdapter.notifyDataSetChanged();
+    }
+
+    private void showContextMenu(final int position) {
+        final TermuxButtonModel model = mButtonList.get(position);
+        String[] items = new String[]{
+            getString(R.string.menu_execute),
+            getString(R.string.menu_edit),
+            getString(R.string.menu_delete),
+            getString(R.string.menu_cancel)
+        };
+        new AlertDialog.Builder(this)
+            .setTitle(model.getButtonName())
+            .setItems(items, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    if (which == 0) {
+                        TermuxCommandExecutor.openTermuxBash(MyTermuxActivity.this,
+                            model.getExeCommand(), model.getWorkDir());
+                    } else if (which == 1) {
+                        showButtonDialog(position, model);
+                    } else if (which == 2) {
+                        showDeleteConfirmDialog(position);
+                    }
+                }
+            })
+            .show();
+    }
+
+    private void showDeleteConfirmDialog(final int position) {
+        new AlertDialog.Builder(this)
+            .setTitle(getString(R.string.dialog_delete_title))
+            .setMessage(getString(R.string.dialog_delete_message) + mButtonList.get(position).getButtonName())
+            .setPositiveButton(getString(R.string.dialog_confirm), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    TermuxButtonManager.deleteButton(MyTermuxActivity.this, mButtonList, position);
+                    refreshList();
+                    Toast.makeText(MyTermuxActivity.this, R.string.toast_deleted, Toast.LENGTH_SHORT).show();
+                }
+            })
+            .setNegativeButton(getString(R.string.dialog_cancel), null)
+            .show();
+    }
+
+    private void showButtonDialog(final int index, final TermuxButtonModel model) {
+        final boolean isEdit = (model != null);
+
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(40, 20, 40, 20);
+
+        final EditText etName = new EditText(this);
+        etName.setHint(R.string.hint_button_name);
+        if (model != null) {
+            etName.setText(model.getButtonName());
+        }
+        layout.addView(etName);
+
+        final EditText etCommand = new EditText(this);
+        etCommand.setHint(R.string.hint_exe_command);
+        if (model != null) {
+            etCommand.setText(model.getExeCommand());
+        }
+        layout.addView(etCommand);
+
+        final EditText etWorkDir = new EditText(this);
+        etWorkDir.setHint(R.string.hint_work_dir);
+        if (model != null) {
+            etWorkDir.setText(model.getWorkDir());
+        }
+        layout.addView(etWorkDir);
+
+        int titleResId = isEdit ? R.string.dialog_edit_title : R.string.dialog_add_title;
+        new AlertDialog.Builder(this)
+            .setTitle(titleResId)
+            .setView(layout)
+            .setPositiveButton(getString(R.string.dialog_save), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    String name = etName.getText().toString().trim();
+                    String command = etCommand.getText().toString().trim();
+                    String workDir = etWorkDir.getText().toString().trim();
+                    if (name.isEmpty() || command.isEmpty()) {
+                        Toast.makeText(MyTermuxActivity.this, R.string.toast_fields_required, Toast.LENGTH_SHORT).show();
+                        return;
+                    }
+                    TermuxButtonModel newModel = new TermuxButtonModel();
+                    newModel.setButtonName(name);
+                    newModel.setExeCommand(command);
+                    newModel.setWorkDir(workDir);
+                    if (isEdit) {
+                        TermuxButtonManager.updateButton(MyTermuxActivity.this, mButtonList, index, newModel);
+                    } else {
+                        TermuxButtonManager.addButton(MyTermuxActivity.this, mButtonList, newModel);
+                    }
+                    refreshList();
+                }
+            })
+            .setNegativeButton(getString(R.string.dialog_cancel), null)
+            .show();
+    }
+
+    private class ButtonAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return mButtonList.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mButtonList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            TextView tv;
+            if (convertView == null) {
+                tv = new TextView(MyTermuxActivity.this);
+                tv.setPadding(30, 20, 30, 20);
+                tv.setTextSize(16);
+                tv.setMinHeight(80);
+            } else {
+                tv = (TextView) convertView;
+            }
+
+            TermuxButtonModel model = mButtonList.get(position);
+            tv.setText(model.getButtonName() + "\n" + model.getExeCommand());
+            tv.setTextColor(getResources().getColor(android.R.color.white));
+            return tv;
+        }
     }
 }
diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonManager.java b/winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonManager.java
new file mode 100644
index 0000000..456a2a2
--- /dev/null
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/models/TermuxButtonManager.java
@@ -0,0 +1,37 @@
+package cc.winboll.studio.winboll.models;
+
+import android.content.Context;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.util.ArrayList;
+
+public class TermuxButtonManager {
+
+    public static ArrayList<TermuxButtonModel> loadButtons(Context context) {
+        ArrayList<TermuxButtonModel> list = new ArrayList<TermuxButtonModel>();
+        BaseBean.loadBeanList(context, list, TermuxButtonModel.class);
+        return list;
+    }
+
+    public static boolean saveButtons(Context context, ArrayList<TermuxButtonModel> list) {
+        return BaseBean.saveBeanList(context, list, TermuxButtonModel.class);
+    }
+
+    public static void addButton(Context context, ArrayList<TermuxButtonModel> list, TermuxButtonModel button) {
+        list.add(button);
+        saveButtons(context, list);
+    }
+
+    public static void updateButton(Context context, ArrayList<TermuxButtonModel> list, int index, TermuxButtonModel button) {
+        if (index >= 0 && index < list.size()) {
+            list.set(index, button);
+            saveButtons(context, list);
+        }
+    }
+
+    public static void deleteButton(Context context, ArrayList<TermuxButtonModel> list, int index) {
+        if (index >= 0 && index < list.size()) {
+            list.remove(index);
+            saveButtons(context, list);
+        }
+    }
+}
diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeBean.java b/winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeBean.java
new file mode 100644
index 0000000..1d748d7
--- /dev/null
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeBean.java
@@ -0,0 +1,49 @@
+package cc.winboll.studio.winboll.theme;
+
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.winboll.R;
+
+public class WinBoLLThemeBean {
+
+    public static final String TAG = "WinBoLLThemeBean";
+
+    public static int getDefaultThemeStyleID() {
+        return R.style.MyAppTheme;
+    }
+
+    public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
+        int themeStyleID = getDefaultThemeStyleID();
+        if (AESThemeBean.ThemeType.DEPTH == themeType) {
+            themeStyleID = R.style.MyDepthAppTheme;
+        } else if (AESThemeBean.ThemeType.SKY == themeType) {
+            themeStyleID = R.style.MySkyAppTheme;
+        } else if (AESThemeBean.ThemeType.GOLDEN == themeType) {
+            themeStyleID = R.style.MyGoldenAppTheme;
+        } else if (AESThemeBean.ThemeType.BEARING == themeType) {
+            themeStyleID = R.style.MyBearingAppTheme;
+        } else if (AESThemeBean.ThemeType.MEMOR == themeType) {
+            themeStyleID = R.style.MyMemorAppTheme;
+        } else if (AESThemeBean.ThemeType.TAO == themeType) {
+            themeStyleID = R.style.MyTaoAppTheme;
+        }
+        return themeStyleID;
+    }
+
+    public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
+        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES;
+        if (R.style.MyDepthAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.DEPTH;
+        } else if (R.style.MySkyAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.SKY;
+        } else if (R.style.MyGoldenAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.GOLDEN;
+        } else if (R.style.MyBearingAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.BEARING;
+        } else if (R.style.MyMemorAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.MEMOR;
+        } else if (R.style.MyTaoAppTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.TAO;
+        }
+        return themeStyle;
+    }
+}
diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeUtil.java b/winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeUtil.java
new file mode 100644
index 0000000..1e6640d
--- /dev/null
+++ b/winboll/src/main/java/cc/winboll/studio/winboll/theme/WinBoLLThemeUtil.java
@@ -0,0 +1,36 @@
+package cc.winboll.studio.winboll.theme;
+
+import android.content.Context;
+import cc.winboll.studio.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+
+public class WinBoLLThemeUtil {
+
+    public static final String TAG = "WinBoLLThemeUtil";
+
+    public static int getThemeTypeID(Context context) {
+        AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
+        int themeTypeID;
+        if (bean == null) {
+            themeTypeID = WinBoLLThemeBean.getDefaultThemeStyleID();
+        } else {
+            int aesStyleID = bean.getCurrentThemeTypeID();
+            AESThemeBean.ThemeType themeType = WinBoLLThemeBean.getThemeStyleType(aesStyleID);
+            themeTypeID = WinBoLLThemeBean.getThemeStyleID(themeType);
+        }
+        return themeTypeID;
+    }
+
+    public static void saveThemeStyleID(Context context, int nThemeTypeID) {
+        AESThemeBean bean = new AESThemeBean(nThemeTypeID);
+        AESThemeBean.saveBean(context, bean);
+    }
+
+    public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
+        return WinBoLLThemeBean.getThemeStyleType(nThemeStyleID);
+    }
+
+    public static int getThemeStyleID(AESThemeBean.ThemeType themeType) {
+        return WinBoLLThemeBean.getThemeStyleID(themeType);
+    }
+}
diff --git a/winboll/src/main/res/layout/activity_my_termux.xml b/winboll/src/main/res/layout/activity_my_termux.xml
index 4334b51..f7417f5 100644
--- a/winboll/src/main/res/layout/activity_my_termux.xml
+++ b/winboll/src/main/res/layout/activity_my_termux.xml
@@ -4,8 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:gravity="top">
+	android:layout_height="match_parent">
 
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/toolbar"
@@ -17,74 +16,20 @@
 		app:titleTextColor="@android:color/white"
 		app:subtitleTextColor="@android:color/white"/>
 
-	<ScrollView
+	<ListView
+		android:id="@+id/list_termux_buttons"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0">
+		android:layout_weight="1.0"
+		android:divider="@android:color/darker_gray"
+		android:dividerHeight="1dp"/>
 
-		<LinearLayout
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
-				<HorizontalScrollView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.0">
-
-					<LinearLayout
-						android:orientation="horizontal"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content">
-
-						<cc.winboll.studio.winboll.views.TermuxButton
-							android:id="@+id/btn_termux"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="Termux"
-							android:textSize="18sp"
-							android:padding="16dp"
-							android:backgroundTint="@android:color/holo_blue_dark"
-							app:exeCommand="cd ~"
-							app:workDir="~"
-							app:isCommitted="true"
-							app:commitTitle="打开 Termux"
-							app:commitInfo="打开 Termux 应用"/>
-
-						<cc.winboll.studio.winboll.views.TermuxButton
-							android:id="@+id/btn_termuxworkspaces"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:text="TermuxWorkSpaces"
-							android:textSize="18sp"
-							android:padding="16dp"
-							android:backgroundTint="@android:color/holo_blue_dark"
-							app:exeCommand="cd ~/TermuxWorkSpaces"
-							app:workDir="~"
-							app:isCommitted="false"
-							app:commitTitle="打开 TermuxWorkSpaces"
-							app:commitInfo="打开 Termux 应用，进入 TermuxWorkSpaces 目录。"/>
-
-					</LinearLayout>
-
-				</HorizontalScrollView>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="+"
-					android:id="@+id/btn_addtermuxbutton"/>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-	</ScrollView>
+	<Button
+		android:id="@+id/btn_add_termux_button"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/add_termux_button"
+		android:textSize="16sp"
+		android:padding="12dp"/>
 
 </LinearLayout>
-
diff --git a/winboll/src/main/res/menu/toolbar_test.xml b/winboll/src/main/res/menu/toolbar_test.xml
index bb3b59a..ccd0574 100644
--- a/winboll/src/main/res/menu/toolbar_test.xml
+++ b/winboll/src/main/res/menu/toolbar_test.xml
@@ -7,6 +7,9 @@
 			<item
 				android:id="@+id/item_termux_env_test"
 				android:title="TermuxEnvTestActivity"/>
+			<item
+				android:id="@+id/item_library_activity"
+				android:title="WinBoLLLibraryActivity"/>
         </menu>
     </item>
 </menu>
diff --git a/winboll/src/main/res/values/colors.xml b/winboll/src/main/res/values/colors.xml
index b49a043..c31ed9d 100644
--- a/winboll/src/main/res/values/colors.xml
+++ b/winboll/src/main/res/values/colors.xml
@@ -4,4 +4,10 @@
     <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#FF9800</color>
     <color name="pattern_lock_black">#000000</color>
+
+    <color name="mainWindowBackgroundColor">#FFF5F5F5</color>
+    <color name="mainWindowTextColor">#FF000000</color>
+    <color name="toolbarTextColor">#FF000000</color>
+    <color name="toolbarBackgroundColor">#FF00B322</color>
+    <color name="debugTextColor">#FF808080</color>
 </resources>
\ No newline at end of file
diff --git a/winboll/src/main/res/values/strings.xml b/winboll/src/main/res/values/strings.xml
index 0cc6cdd..02aac87 100644
--- a/winboll/src/main/res/values/strings.xml
+++ b/winboll/src/main/res/values/strings.xml
@@ -13,4 +13,21 @@
     <string name="toolbar_icon_description">WinBoLL APP</string>
     <string name="my_termux_activity">MyTermuxActivity</string>
     <string name="pattern_lock_title">图案密码设置</string>
+    <string name="add_termux_button">+ 添加Termux按钮</string>
+    <string name="menu_execute">执行</string>
+    <string name="menu_edit">编辑</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_cancel">取消</string>
+    <string name="dialog_delete_title">确认删除</string>
+    <string name="dialog_delete_message">确定要删除</string>
+    <string name="dialog_add_title">添加Termux按钮</string>
+    <string name="dialog_edit_title">编辑Termux按钮</string>
+    <string name="dialog_save">保存</string>
+    <string name="dialog_confirm">确定</string>
+    <string name="dialog_cancel">取消</string>
+    <string name="hint_button_name">按钮名称</string>
+    <string name="hint_exe_command">执行命令</string>
+    <string name="hint_work_dir">工作目录（默认 ~）</string>
+    <string name="toast_deleted">已删除</string>
+    <string name="toast_fields_required">按钮名称和执行命令不能为空</string>
 </resources>
diff --git a/winboll/src/main/res/values/styles.xml b/winboll/src/main/res/values/styles.xml
index e62a453..fcf0822 100644
--- a/winboll/src/main/res/values/styles.xml
+++ b/winboll/src/main/res/values/styles.xml
@@ -1,5 +1,57 @@
 <resources>
-	<style name="MyAppTheme" parent="AESTheme">
+    <style name="MyAppTheme" parent="AESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyDepthAppTheme" parent="DepthAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MySkyAppTheme" parent="SkyAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyGoldenAppTheme" parent="GoldenAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyBearingAppTheme" parent="BearingAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyMemorAppTheme" parent="MemorAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyTaoAppTheme" parent="TaoAESTheme">
+        <item name="themeDebug">@style/MyDebugActivityTheme</item>
+        <item name="aToolbar">@style/MyAESAToolbar</item>
+        <item name="aSupportToolbar">@style/MyAESASupportToolbar</item>
+    </style>
+
+    <style name="MyAESAToolbar" parent="AESAToolbar" />
+
+    <style name="MyAESASupportToolbar" parent="AESASupportToolbar" />
+
+    <style name="MyDebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/toolbarBackgroundColor</item>
+        <item name="colorTittle">@color/mainWindowTextColor</item>
+        <item name="colorTittleBackgound">@color/toolbarBackgroundColor</item>
+        <item name="colorText">@color/debugTextColor</item>
+        <item name="colorTextBackgound">@color/mainWindowBackgroundColor</item>
+        <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="toolbarTextColor">@color/toolbarTextColor</item>
     </style>
-	
 </resources>