diff --git a/aes/build.properties b/aes/build.properties index 0994e68..26d3a6e 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jun 28 12:59:51 HKT 2025 -stageCount=3 +#Sun Aug 31 23:40:17 HKT 2025 +stageCount=4 libraryProject=libaes baseVersion=15.9 -publishVersion=15.9.2 +publishVersion=15.9.3 buildCount=0 -baseBetaVersion=15.9.3 +baseBetaVersion=15.9.4 diff --git a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java index ecec622..c2402e5 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.aes; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/24 23:52:29 * @Describe AES应用介绍窗口 */ diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 5c4419e..3206907 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -1,7 +1,7 @@ package cc.winboll.studio.aes; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/13 19:03:58 * @Describe AES应用类 */ diff --git a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java index 2dac13b..a3cd54b 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java +++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.aes; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/13 19:05:52 * @Describe 应用主窗口 */ diff --git a/androiddemo/app_update_description.txt b/androiddemo/app_update_description.txt index e69de29..8b13789 100644 --- a/androiddemo/app_update_description.txt +++ b/androiddemo/app_update_description.txt @@ -0,0 +1 @@ + diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index 20e7cb5..d32957f 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -67,6 +67,6 @@ dependencies { // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 api 'com.android.support:recyclerview-v7:28.0.0' - api 'cc.winboll.studio:libapputils:15.8.2' - api 'cc.winboll.studio:libappbase:15.8.2' + api 'cc.winboll.studio:libapputils:15.8.5' + api 'cc.winboll.studio:libappbase:15.9.5' } diff --git a/androiddemo/build.properties b/androiddemo/build.properties index 3572ff9..5e7cbee 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Jun 01 08:02:46 GMT 2025 -stageCount=0 +#Sun Aug 31 05:11:26 CST 2025 +stageCount=1 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=27 +buildCount=0 baseBetaVersion=15.0.1 diff --git a/androidxdemo/app_update_description.txt b/androidxdemo/app_update_description.txt index e69de29..8b13789 100644 --- a/androidxdemo/app_update_description.txt +++ b/androidxdemo/app_update_description.txt @@ -0,0 +1 @@ + diff --git a/androidxdemo/build.gradle b/androidxdemo/build.gradle index 366613a..a3c520e 100644 --- a/androidxdemo/build.gradle +++ b/androidxdemo/build.gradle @@ -29,7 +29,7 @@ android { // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.0" + versionName "15.1" if(true) { versionName = genVersionName("${versionName}") } @@ -67,7 +67,7 @@ dependencies { //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.fragment:fragment:1.1.0' - api 'cc.winboll.studio:libaes:15.9.2' - api 'cc.winboll.studio:libapputils:15.8.4' - api 'cc.winboll.studio:libappbase:15.8.4' + api 'cc.winboll.studio:libaes:15.9.3' + api 'cc.winboll.studio:libapputils:15.8.5' + api 'cc.winboll.studio:libappbase:15.9.5' } diff --git a/androidxdemo/build.properties b/androidxdemo/build.properties index 9bfd4a7..ac0d006 100644 --- a/androidxdemo/build.properties +++ b/androidxdemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jun 28 05:02:54 GMT 2025 -stageCount=0 +#Sun Aug 31 05:42:50 CST 2025 +stageCount=2 libraryProject= -baseVersion=15.0 -publishVersion=15.0.0 -buildCount=27 -baseBetaVersion=15.0.1 +baseVersion=15.1 +publishVersion=15.1.1 +buildCount=0 +baseBetaVersion=15.1.2 diff --git a/appbase/build.properties b/appbase/build.properties index 267add1..1c8be0a 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Aug 18 03:56:26 HKT 2025 +#Sun Aug 31 23:37:38 HKT 2025 stageCount=6 libraryProject=libappbase baseVersion=15.9 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 4db9ad0..1160928 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/App.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/App.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/05 09:54:42 * @Describe APPbase 应用类 */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java b/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java index 457d8e7..9e17410 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MyTileService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 19:30:10 */ import android.content.Context; diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java index da5178c..faf79d2 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/25 11:46:40 * @Describe 测试窗口2 */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java index 429cdcd..fedca95 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/25 05:04:22 */ import android.app.Activity; diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java index 453af98..0721c40 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/WinBoLLActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/05/10 09:48 * @Describe WinBoLL 窗口基础类 */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java b/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java index db180e9..c9d6a0e 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/handlers/MainServiceHandler.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.handlers; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/14 03:51:40 */ import android.os.Handler; diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java b/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java index 0e125ea..01dc414 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/MainServiceBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 07:06:13 */ import android.util.JsonReader; diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java index fccca87..75f7184 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoBindServiceBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/07 12:47:22 * @Describe TestServiceBean */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java index c1398e3..8d6a379 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/models/TestDemoServiceBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/07 12:49:21 * @Describe TestDemoServiceBean */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java index 0943119..fd4a35d 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/APPNewsWidgetClickListener.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.receivers; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/24 07:11:44 */ import android.content.BroadcastReceiver; diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java index ef02d5f..14f4318 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.receivers; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 06:58:04 * @Describe 主要广播接收器 */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java index e5436c6..0770241 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/AssistantService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.services; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/14 03:38:31 * @Describe 守护进程服务 */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java index b3dd1d4..f71bdbb 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.services; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 06:56:41 * @Describe 拨号主服务 * 参考: diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java index 1359e5e..7136d3c 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.services; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/07 12:45:49 * @Describe 启动时申请绑定到APPBase主服务的服务示例 */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java index 4902f5f..ee7de32 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.services; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/07 12:39:24 * @Describe 普通服务示例 */ diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java b/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java index 917e7f2..c922e84 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/threads/MainServiceThread.java @@ -1,7 +1,7 @@ package cc.winboll.studio.appbase.threads; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/14 03:46:44 */ import android.content.Context; diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java index 56822c7..71a5caa 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java @@ -1,6 +1,6 @@ package cc.winboll.studio.appbase.widgets; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/15 14:41:25 * @Describe TimeWidget */ diff --git a/apputils/build.properties b/apputils/build.properties index 12fe6de..2be9ccd 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jun 03 15:05:48 HKT 2025 -stageCount=5 +#Mon Sep 01 07:56:33 HKT 2025 +stageCount=7 libraryProject=libapputils baseVersion=15.8 -publishVersion=15.8.4 +publishVersion=15.8.6 buildCount=0 -baseBetaVersion=15.8.5 +baseBetaVersion=15.8.7 diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/App.java b/apputils/src/main/java/cc/winboll/studio/apputils/App.java index a96c41d..e4bffb5 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/App.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/App.java @@ -1,7 +1,7 @@ package cc.winboll.studio.apputils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/08 15:10:51 * @Describe 全局应用类 */ diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java index 56d097c..822af56 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.apputils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/03 11:02:49 * @Describe 一个可以浏览随 APP 附带的 Html 文档的窗口 */ diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java index 5cf01a7..8561e18 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.apputils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/18 10:32:21 * @Describe 二维码扫码解码窗口 */ diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java index 4789183..8c05dc3 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/TestBBMorseCodeActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.apputils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/23 16:14:45 */ import android.app.Activity; diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java index e7b71eb..f57a867 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.apputils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/05/13 11:15 * @Describe WinBoLLActivity */ diff --git a/autoinstaller/README.md b/autoinstaller/README.md new file mode 100644 index 0000000..0ffcd3b --- /dev/null +++ b/autoinstaller/README.md @@ -0,0 +1,35 @@ +# AutoInstaller + +#### 介绍 +APK 文件监控，监控指定文件路径的 APK 文件。 +在 APK 文件改变后自动调用系统安装命令安装，或者调用[应用信息查看器]打开。 + +#### 软件架构 +适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。 +也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。 + + +#### Gradle 编译说明 +调试版编译命令 ：gradle assembleBetaDebug +阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh autoinstaller + +#### 使用说明 + +#### 参与贡献 + +1. Fork 本仓库 +2. 新建 Feat_xxx 分支 +3. 提交代码 : ZhanGSKen(ZhanGSKen) +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/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java index 6163c2b..bc57789 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java @@ -1,7 +1,7 @@ package cc.winboll.studio.autoinstaller; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/04/28 02:39:58 * @Describe 全局应用类 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java index ec9a7c8..14c0d6d 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.autoinstaller; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/04/15 09:24:46 * @Describe 磁贴工具服务类 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java index b202be7..5cbc667 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.autoinstaller.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/04/02 20:50:29 * @Describe 监控的 APK 安装文件对应的应用信息数据模型 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java index f4a06da..0495068 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java @@ -1,7 +1,7 @@ package cc.winboll.studio.autoinstaller.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/05/27 17:36:01 * @Describe 应用配置数据类 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java index 15044db..4a80474 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java @@ -5,7 +5,7 @@ import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/04/15 09:27:39 * @Describe MainServiceBean */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java index 6bfa951..e5c6fef 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java @@ -9,7 +9,7 @@ import cc.winboll.studio.autoinstaller.services.MainService; import cc.winboll.studio.libappbase.LogUtils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/06 13:19:38 * @Describe 应用消息接收类 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java index 158ffc5..2cc702a 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java @@ -10,7 +10,7 @@ import cc.winboll.studio.autoinstaller.models.AppConfigs; import cc.winboll.studio.autoinstaller.utils.ServiceUtil; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/05/27 20:16:00 * @Describe MainService 守护进程服务 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/FileUtil.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/FileUtil.java index 7e9f236..96bf262 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/FileUtil.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/FileUtil.java @@ -1,7 +1,7 @@ package cc.winboll.studio.autoinstaller.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/05/27 17:56:31 * @Describe 文件管理类 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java index 6f0c95f..3ad7be3 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java @@ -1,7 +1,7 @@ package cc.winboll.studio.autoinstaller.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/11 06:28:50 * @Describe 一个获取安卓APK安装文件的应用包名的函数 */ diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/ServiceUtil.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/ServiceUtil.java index ef0c152..5fd0f93 100644 --- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/ServiceUtil.java +++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/ServiceUtil.java @@ -1,7 +1,7 @@ package cc.winboll.studio.autoinstaller.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/05/27 20:20:03 * @Describe 服务类工具 */ diff --git a/contacts/build.gradle b/contacts/build.gradle index 24e18ae..f30c00a 100644 --- a/contacts/build.gradle +++ b/contacts/build.gradle @@ -45,9 +45,9 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:libaes:15.9.2' - api 'cc.winboll.studio:libapputils:15.8.4' - api 'cc.winboll.studio:libappbase:15.8.4' + api 'cc.winboll.studio:libaes:15.9.3' + api 'cc.winboll.studio:libapputils:15.8.5' + api 'cc.winboll.studio:libappbase:15.9.5' // 权限请求框架：https://github.com/getActivity/XXPermissions api 'com.github.getActivity:XXPermissions:18.63' diff --git a/contacts/build.properties b/contacts/build.properties index 1ae7c04..67d8f38 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jul 17 09:57:24 HKT 2025 -stageCount=12 +#Sun Aug 31 06:05:42 CST 2025 +stageCount=17 libraryProject= baseVersion=15.3 -publishVersion=15.3.11 +publishVersion=15.3.16 buildCount=0 -baseBetaVersion=15.3.12 +baseBetaVersion=15.3.17 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/App.java b/contacts/src/main/java/cc/winboll/studio/contacts/App.java index 9f94d6b..9c255ae 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/App.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/App.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/08 15:10:51 * @Describe 全局应用类 */ diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java index 86a546d..c46df2d 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java @@ -1,5 +1,10 @@ package cc.winboll.studio.contacts; +/** + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/08/30 14:32 + * @Describe 主窗口 + */ import android.Manifest; import android.app.Activity; import android.app.ActivityManager; @@ -8,6 +13,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; +import android.os.Handler; import android.telecom.TelecomManager; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; @@ -41,7 +47,7 @@ import java.util.List; final public class MainActivity extends AppCompatActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener { - public static final String TAG = "MainActivity"; + public static final String TAG = "MainActivity"; public static final int REQUEST_HOME_ACTIVITY = 0; public static final int REQUEST_ABOUT_ACTIVITY = 1; @@ -55,13 +61,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct MainServiceBean mMainServiceBean; private TabLayout tabLayout; private ViewPager viewPager; - private List views; //用来存放放进ViewPager里面的布局 - //实例化存储imageView（导航原点）的集合 + private List views; ImageView[] imageViews; - //MyPagerAdapter adapter;//适配器 - MyPagerAdapter pagerAdapter; - LinearLayout linearLayout;//下标所在在LinearLayout布局里 - int currentPoint = 0;//当前被选中中页面的下标 + LinearLayout linearLayout; + int currentPoint = 0; private TelephonyManager telephonyManager; private MyPhoneStateListener phoneStateListener; @@ -70,30 +73,6 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct private static final int DIALER_REQUEST_CODE = 1; -// @Override -// public Activity getActivity() { -// return this; -// } - -// @Override -// public APPInfo getAppInfo() { -// String szBranchName = "contacts"; -// -// APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo(); -// appInfo.setAppName("Contacts"); -// appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); -// appInfo.setAppDescription("Contacts Description"); -// appInfo.setAppGitName("APP"); -// appInfo.setAppGitOwner("Studio"); -// appInfo.setAppGitAPPBranch(szBranchName); -// appInfo.setAppGitAPPSubProjectFolder(szBranchName); -// appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=Contacts"); -// appInfo.setAppAPKName("Contacts"); -// appInfo.setAppAPKFolderName("Contacts"); -// return appInfo; -// return null; -// } - @Override public Activity getActivity() { @@ -107,89 +86,62 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct @Override protected void onCreate(Bundle savedInstanceState) { - // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回 - //if (prosessIntents(getIntent())) return; - // 以下正常创建主窗口 super.onCreate(savedInstanceState); _MainActivity = this; setContentView(R.layout.activity_main); - // 初始化工具栏 - mToolbar = findViewById(R.id.activitymainToolbar1); + // 初始化工具栏（仅加载基础UI） + mToolbar = (Toolbar) findViewById(R.id.activitymainToolbar1); setSupportActionBar(mToolbar); -// if (isEnableDisplayHomeAsUp()) { -// // 显示后退按钮 -// getSupportActionBar().setDisplayHomeAsUpEnabled(true); -// } getSupportActionBar().setSubtitle(TAG); - tabLayout = findViewById(R.id.tabLayout); - viewPager = findViewById(R.id.viewPager); + tabLayout = (TabLayout) findViewById(R.id.tabLayout); + viewPager = (ViewPager) findViewById(R.id.viewPager); - // 创建Fragment列表和标题列表 - fragmentList = new ArrayList<>(); - tabTitleList = new ArrayList<>(); + // 创建Fragment列表（仅实例化，不加载数据） + fragmentList = new ArrayList(); + tabTitleList = new ArrayList(); fragmentList.add(CallLogFragment.newInstance(0)); - fragmentList.add(ContactsFragment.newInstance(1)); + fragmentList.add(ContactsFragment.newInstance(1)); // 延迟加载联系人数据 fragmentList.add(LogFragment.newInstance(2)); tabTitleList.add("通话记录"); tabTitleList.add("联系人"); tabTitleList.add("应用日志"); - // 设置ViewPager的适配器 + // 设置ViewPager适配器 MyPagerAdapter adapter = new MyPagerAdapter(getSupportFragmentManager(), fragmentList, tabTitleList); viewPager.setAdapter(adapter); + // 关键：关闭预加载，仅当前页初始化 + viewPager.setOffscreenPageLimit(0); + // 关联TabLayout和ViewPager tabLayout.setupWithViewPager(viewPager); - - -// initData(); -// initView(); -// //initPoint();//调用初始化导航原点的方法 -// viewPager.addOnPageChangeListener(this);//滑动事件 - - //ViewPager viewPager = findViewById(R.id.activitymainViewPager1); - //MyPagerAdapter pagerAdapter = new MyPagerAdapter(getSupportFragmentManager()); - //viewPager.setAdapter(pagerAdapter); - //TabLayout tabLayout = findViewById(R.id.activitymainTabLayout1); - //tabLayout.setupWithViewPager(viewPager); - -// mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class); -// if (mMainServiceBean == null) { -// mMainServiceBean = new MainServiceBean(); -// } -// cbMainService = findViewById(R.id.activitymainCheckBox1); -// cbMainService.setChecked(mMainServiceBean.isEnable()); -// cbMainService.setOnClickListener(new View.OnClickListener(){ -// @Override -// public void onClick(View view) { -// if (cbMainService.isChecked()) { -// MainService.startMainService(MainActivity.this); -// } else { -// MainService.stopMainService(MainActivity.this); -// } -// } -// }); - + // 初始化服务状态（延迟启动非核心服务） MainServiceBean mMainServiceBean = MainServiceBean.loadBean(this, MainServiceBean.class); if (mMainServiceBean == null) { mMainServiceBean = new MainServiceBean(); MainServiceBean.saveBean(this, mMainServiceBean); } if (mMainServiceBean.isEnable()) { - MainService.startMainService(this); + // 延迟1秒启动服务，避免阻塞启动 + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + MainService.startMainService(MainActivity.this); + } + }, 1000); } - // 初始化TelephonyManager和PhoneStateListener + // 初始化电话状态监听（基础功能保留） telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE); phoneStateListener = new MyPhoneStateListener(); telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE); } - // ViewPager的适配器 + // ViewPager适配器（Java 7语法） private class MyPagerAdapter extends FragmentPagerAdapter { private List fragmentList; @@ -226,91 +178,22 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct _MainActivity.startActivity(intent); } - //初始化view，即显示的图片 -// void initView() { -// viewPager = findViewById(R.id.activitymainViewPager1); -// pagerAdapter = new MyPagerAdapter(getSupportFragmentManager()); -// viewPager.setAdapter(pagerAdapter); -// //adapter = new MyPagerAdapter(views); -// //viewPager = findViewById(R.id.activitymainViewPager1); -// //viewPager.setAdapter(adapter); -// //linearLayout = findViewById(R.id.activitymainLinearLayout1); -// //initPoint();//初始化页面下方的点 -// viewPager.setOnPageChangeListener(this); -// -// } - - //初始化所要显示的布局 -// void initData() { -// LayoutInflater inflater = LayoutInflater.from(getActivity()); -// View view1 = inflater.inflate(R.layout.fragment_call_log, viewPager, false); -// View view2 = inflater.inflate(R.layout.fragment_contacts, viewPager, false); -// View view3 = inflater.inflate(R.layout.fragment_log, viewPager, false); -// -// views = new ArrayList<>(); -// views.add(view1); -// views.add(view2); -// views.add(view3); -// } - -// void initPoint() { -// imageViews = new ImageView[5];//实例化5个图片 -// for (int i = 0; i < linearLayout.getChildCount(); i++) { -// imageViews[i] = (ImageView) linearLayout.getChildAt(i); -// imageViews[i].setImageResource(R.drawable.ic_launcher); -// imageViews[i].setOnClickListener(this);//点击导航点，即可跳转 -// imageViews[i].setTag(i);//重复利用实例化的对象 -// } -// currentPoint = 0;//默认第一个坐标 -// imageViews[currentPoint].setImageResource(R.drawable.ic_launcher); -// } - - //OnPageChangeListener接口要实现的三个方法 - /* onPageScrollStateChanged(int state) - 此方法是在状态改变的时候调用，其中state这个参数有三种状态： - SCROLL_STATE_DRAGGING（1）表示用户手指“按在屏幕上并且开始拖动”的状态 - （手指按下但是还没有拖动的时候还不是这个状态，只有按下并且手指开始拖动后log才打出。） - SCROLL_STATE_IDLE（0）滑动动画做完的状态。 - SCROLL_STATE_SETTLING（2）在“手指离开屏幕”的状态。*/ + // OnPageChangeListener接口实现 @Override - public void onPageScrollStateChanged(int state) { + public void onPageScrollStateChanged(int state) {} - } - /* onPageScrolled(int position, float positionOffset, int positionOffsetPixels) - 当页面在滑动的时候会调用此方法，在滑动被停止之前，此方法回一直得到调用。其中三个参数的含义分别为： - - position :当前页面，即你点击滑动的页面（从A滑B，则是A页面的position。 - positionOffset:当前页面偏移的百分比 - positionOffsetPixels:当前页面偏移的像素位置*/ @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {} - } - /* onPageSelected(int position) - 此方法是页面滑动完后得到调用，position是你当前选中的页面的Position（位置编号） - (从A滑动到B，就是B的position)*/ - public void onPageSelected(int position) { - -// ImageView preView = imageViews[currentPoint]; -// preView.setImageResource(R.drawable.ic_launcher); -// ImageView currView = imageViews[position]; -// currView.setImageResource(R.drawable.ic_launcher); -// currentPoint = position; - } - - //小圆点点击事件 @Override - public void onClick(View v) { - // TODO Auto-generated method stub - //通过getTag(),可以判断是哪个控件 -// int i = (Integer) v.getTag(); -// viewPager.setCurrentItem(i);//直接跳转到某一个页面的情况 - } + public void onPageSelected(int position) {} + + @Override + public void onClick(View v) {} @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); - //setSubTitle(""); } private class MyPhoneStateListener extends PhoneStateListener { @@ -336,109 +219,31 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct LogUtils.d(TAG, "onDestroy() SOS"); } - - - // - // 处理传入的 Intent 数据 - // -// boolean prosessIntents(Intent intent) { -// if (intent == null -// || intent.getAction() == null -// || intent.getAction().equals("")) -// return false; -// -// if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) { -// try { -// WinBoLLActivity clazzActivity = UnitTestActivity.class.newInstance(); -// String tag = clazzActivity.getTag(); -// LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag); -// Intent subIntent = new Intent(this, UnitTestActivity.class); -// subIntent.setAction(intent.getAction()); -// File file = new File(getCacheDir(), UUID.randomUUID().toString()); -// //取出文件uri -// Uri uri = intent.getData(); -// if (uri == null) { -// uri = intent.getParcelableExtra(Intent.EXTRA_STREAM); -// } -// //获取文件真实地址 -// String szSrcPath = UriUtils.getFileFromUri(getApplication(), uri); -// if (TextUtils.isEmpty(szSrcPath)) { -// return false; -// } -// -// Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath())); -// //startWinBoLLActivity(subIntent, tag); -// WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class); -// } catch (IllegalAccessException | InstantiationException | IOException e) { -// LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); -// // 函数处理异常返回失败 -// return false; -// } -// } else { -// LogUtils.d(TAG, "prosessIntents|" + intent.getAction() + "|yet"); -// return false; -// } -// return true; -// } - -// @Override -// public String getTag() { -// return TAG; -// } - -// @Override -// public void onBackPressed() { -// exit(); -// } -// -// void exit() { -// YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){ -// -// @Override -// public void onYes() { -// WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll(); -// } -// -// @Override -// public void onNo() { -// } -// }; -// YesNoAlertDialog.show(this, "[ " + getString(R.string.app_name) + " ]", "Exit(Yes/No).\nIs close all activity?", listener); -// } - @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.toolbar_main, menu); return super.onCreateOptionsMenu(menu); } - @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.item_settings) { Intent intent = new Intent(this, SettingsActivity.class); startActivity(intent); - //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, CallActivity.class); } -// } else -// if (item.getItemId() == R.id.item_exit) { -// exit(); -// return true; -// } return super.onOptionsItemSelected(item); } - @Override protected void onResume() { super.onResume(); } /** - * Android M 及以上检查是否是系统默认电话应用 + * 检查是否是系统默认电话应用 */ public boolean isDefaultPhoneCallApp() { - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { TelecomManager manger = (TelecomManager) getSystemService(TELECOM_SERVICE); if (manger != null && manger.getDefaultDialerPackage() != null) { return manger.getDefaultDialerPackage().equals(getPackageName()); @@ -452,35 +257,22 @@ final public class MainActivity extends AppCompatActivity implements IWinBoLLAct if (manager == null) return false; for (ActivityManager.RunningServiceInfo service : manager.getRunningServices( - Integer.MAX_VALUE)) { + Integer.MAX_VALUE)) { if (serviceClass.getName().equals(service.service.getClassName())) { return true; } } - return false; } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { -// switch (resultCode) { -// case REQUEST_HOME_ACTIVITY : { -// LogUtils.d(TAG, "REQUEST_HOME_ACTIVITY"); -// break; -// } -// case REQUEST_ABOUT_ACTIVITY : { -// LogUtils.d(TAG, "REQUEST_ABOUT_ACTIVITY"); -// break; -// } -// default : { -// super.onActivityResult(requestCode, resultCode, data); -// } -// } if (requestCode == DIALER_REQUEST_CODE) { if (resultCode == Activity.RESULT_OK) { Toast.makeText(MainActivity.this, getString(R.string.app_name) + " 已成为默认电话应用", - Toast.LENGTH_SHORT).show(); + Toast.LENGTH_SHORT).show(); } } } } + 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 index 931846e..5110ce3 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/31 15:15:54 * @Describe 应用介绍窗口 */ 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 index 07bfd00..32e48d1 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/CallActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/20 17:15:46 * @Describe 拨号窗口 */ 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 index 2a73792..abcb72a 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/DialerActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/DialerActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/20 20:18:26 */ import android.content.Intent; 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 index 4664c02..0e8e1bc 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/21 05:37:42 */ import android.content.Context; 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 index 9b59cbc..c63ba08 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/UnitTestActivity.java @@ -11,7 +11,7 @@ import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.LogView; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 16:07:04 */ public class UnitTestActivity extends Activity { 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 index 18f5d47..33f9661 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.activities; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/31 15:16:45 * @Describe 应用窗口基类 */ 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 index 58ed096..58444bb 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.adapters; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/26 13:09:32 * @Describe CallLogAdapter */ @@ -40,6 +40,10 @@ public class CallLogAdapter extends RecyclerView.Adapter + * @Author ZhanGSKen * @Date 2025/02/26 13:35:44 * @Describe ContactAdapter */ diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ImagePagerAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ImagePagerAdapter.java index ea8ed41..c65e35d 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ImagePagerAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/ImagePagerAdapter.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.adapters; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/20 14:20:38 * @Describe ImagePagerAdapter */ 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 index a487b6f..443ca9b 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.adapters; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 17:27:41 * @Describe PhoneConnectRuleAdapter */ diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java b/contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java index afb9254..c92e20b 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/CallLogModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.beans; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/26 13:10:57 * @Describe CallLogModel */ diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java b/contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java index 1e56444..c7e7554 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/ContactModel.java @@ -1,9 +1,9 @@ package cc.winboll.studio.contacts.beans; /** - * @Author ZhanGSKen - * @Date 2025/02/26 13:37:00 - * @Describe ContactModel + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/08/30 14:32 + * @Describe 联系人信息数据模型 */ import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; @@ -18,13 +18,18 @@ public class ContactModel { private String name; private String number; private String pinyin; + // 新增：存储姓名的拼音首字母（如"啊牛"→"an"） + private String pinyinFirstLetter; public ContactModel(String name, String number) { this.name = name; this.number = number.replaceAll("\\s", ""); this.pinyin = convertToPinyin(name); + // 初始化时生成拼音首字母 + this.pinyinFirstLetter = convertToPinyinFirstLetter(name); } + // 原方法：转换为全拼（如"啊牛"→"aniu"） private String convertToPinyin(String chinese) { HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat(); format.setCaseType(HanyuPinyinCaseType.LOWERCASE); @@ -33,22 +38,55 @@ public class ContactModel { StringBuilder pinyin = new StringBuilder(); for (int i = 0; i < chinese.length(); i++) { char ch = chinese.charAt(i); - if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) { + if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) { // 仅处理汉字 try { String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format); - if (pinyinArray != null) { - pinyin.append(pinyinArray[0]); + if (pinyinArray != null && pinyinArray.length > 0) { + pinyin.append(pinyinArray[0]); // 取第一个拼音（多音字默认首选项） } } catch (BadHanyuPinyinOutputFormatCombination e) { e.printStackTrace(); } } else { - pinyin.append(ch); + pinyin.append(ch); // 非汉字直接拼接（如字母、数字、符号） } } return pinyin.toString(); } + // 新增：转换为拼音首字母（如"啊牛"→"an"） + private String convertToPinyinFirstLetter(String chinese) { + HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat(); + format.setCaseType(HanyuPinyinCaseType.LOWERCASE); + format.setToneType(HanyuPinyinToneType.WITHOUT_TONE); + + StringBuilder firstLetters = new StringBuilder(); + for (int i = 0; i < chinese.length(); i++) { + char ch = chinese.charAt(i); + if (Character.toString(ch).matches("[\\u4e00-\\u9fa5]")) { // 仅处理汉字 + try { + String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format); + if (pinyinArray != null && pinyinArray.length > 0) { + // 取拼音的第一个字母（如"a"、"niu"→"a"、"n"） + firstLetters.append(pinyinArray[0].charAt(0)); + } + } catch (BadHanyuPinyinOutputFormatCombination e) { + e.printStackTrace(); + } + } else { + // 非汉字可根据需求处理：此处保留原字符（如"李3"→"l3"，"张A"→"za"） + firstLetters.append(ch); + } + } + return firstLetters.toString(); + } + + // 新增：获取拼音首字母 + public String getPinyinFirstLetter() { + return pinyinFirstLetter; + } + + // 原有getter方法 public String getName() { return name; } diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/beans/MainServiceBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/beans/MainServiceBean.java index 93c5cea..90fb846 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/MainServiceBean.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/MainServiceBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.beans; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 07:06:13 */ import android.util.JsonReader; diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneConnectRuleModel.java b/contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneConnectRuleModel.java index 5bc0bd6..c27b753 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneConnectRuleModel.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/PhoneConnectRuleModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.beans; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/21 09:52:10 * @Describe 电话黑名单规则 */ diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/beans/RingTongBean.java b/contacts/src/main/java/cc/winboll/studio/contacts/beans/RingTongBean.java index db2f67e..39b2cb7 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/RingTongBean.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/RingTongBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.beans; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/24 18:47:11 * @Describe 手机铃声设置参数类 */ diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java b/contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java index a228aff..94775da 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.beans; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 19:51:40 * @Describe SettingsModel */ 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 index 19d1d5c..d787975 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.bobulltoon; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 13:47:48 * @Describe 汤姆猫管家 ：使用 BoBullToon 项目，对通讯地址进行筛选判断的好朋友。 */ @@ -11,6 +11,7 @@ import cc.winboll.studio.contacts.dun.Rules; import cc.winboll.studio.libappbase.LogUtils; import com.hjq.toast.ToastUtils; import java.io.File; +import java.io.FileFilter; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -154,6 +155,62 @@ public class TomCat { 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(); // 替换为实际的目标文件夹路径 @@ -170,9 +227,9 @@ public class TomCat { public boolean loadPhoneBoBullToon() { listPhoneBoBullToon.clear(); - File fBoBullToon = new File(getWorkingFolder(), "bobulltoon"); + File fBoBullToon = getBoBullToonDataFolder(); if (fBoBullToon.exists()) { - LogUtils.d(TAG, String.format("getWorkingFolder() %s", getWorkingFolder())); + LogUtils.d(TAG, String.format("getBoBullToonDataFolder() %s", getWorkingFolder())); for (File userFolder : fBoBullToon.listFiles()) { if (userFolder.isDirectory()) { for (File recordFile : userFolder.listFiles()) { 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 index 80a16e4..1484795 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.dun; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/21 06:15:10 * @Describe 云盾防御规则 */ 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 index d8dac2a..9143f94 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.fragments; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/20 12:57:00 * @Describe 拨号 */ @@ -161,4 +161,12 @@ public class CallLogFragment extends Fragment { _CallLogFragment.triggerUpdate(); } } + + @Override + public void onResume() { + super.onResume(); + //ToastUtils.show("onResume"); + callLogAdapter.relaodContacts(); + readCallLog(); // 窗口回显时更新通话记录 + } } 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 index dbaec57..b3926e4 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/ContactsFragment.java @@ -1,15 +1,18 @@ package cc.winboll.studio.contacts.fragments; + /** - * @Author ZhanGSKen - * @Date 2025/02/20 12:57:50 - * @Describe 联系人 + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/08/30 14:32 + * @Describe 联系人视图 */ 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; @@ -27,24 +30,39 @@ import androidx.recyclerview.widget.RecyclerView; import cc.winboll.studio.contacts.R; import cc.winboll.studio.contacts.adapters.ContactAdapter; import cc.winboll.studio.contacts.beans.ContactModel; +import cc.winboll.studio.libappbase.LogUtils; import com.hjq.toast.ToastUtils; import java.util.ArrayList; import java.util.List; - +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; public class ContactsFragment extends Fragment { public static final String TAG = "ContactsFragment"; - private static final String ARG_PAGE = "ARG_PAGE"; - private int mPage; - private static final int REQUEST_READ_CONTACTS = 1; + + private int mPage; private RecyclerView recyclerView; private ContactAdapter contactAdapter; - private List contactList = new ArrayList<>(); - private List originalContactList = new ArrayList<>(); private EditText searchEditText; + private Button btnDial; + private boolean isViewInitialized = false; // 标记视图是否已初始化 + + // 静态缓存：全局复用联系人数据 + private static List sCachedOriginalList = new ArrayList(); + private static List sCachedFilteredList = new ArrayList(); + + // 当前页面数据容器 + private List contactList = new ArrayList(); + private List originalContactList = new ArrayList(); + + // 异步工具 + private final ExecutorService executor = Executors.newSingleThreadExecutor(); + private final Handler mainHandler = new Handler(Looper.getMainLooper()); + private boolean isDataLoaded = false; + public static ContactsFragment newInstance(int page) { Bundle args = new Bundle(); @@ -65,103 +83,272 @@ public class ContactsFragment extends Fragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_contacts, container, false); + // 加载布局（已移除进度条相关代码） + View view = inflater.inflate(R.layout.fragment_contacts, container, false); + return view; } @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - recyclerView = view.findViewById(R.id.contacts_recycler_view); + // 初始化RecyclerView + recyclerView = (RecyclerView) view.findViewById(R.id.contacts_recycler_view); recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + contactList = new ArrayList(); contactAdapter = new ContactAdapter(getContext(), contactList); recyclerView.setAdapter(contactAdapter); + // 初始隐藏列表，数据加载后显示 + recyclerView.setVisibility(View.GONE); - searchEditText = view.findViewById(R.id.search_edit_text); - searchEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } + // 绑定搜索框和拨号按钮 + 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); + } - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - filterContacts(s.toString()); - } + // 首次可见时初始化资源 + @Override + public void onResume() { + super.onResume(); + if (!isViewInitialized) { + initSearchAndDial(); // 初始化搜索和拨号功能 + checkContactPermission(); // 检查权限并加载数据 + isViewInitialized = true; + } + } - @Override - public void afterTextChanged(Editable s) { - } - }); + // 初始化搜索框和拨号按钮 + private void initSearchAndDial() { + // 显示搜索相关控件 + searchEditText.setVisibility(View.VISIBLE); + btnDial.setVisibility(View.VISIBLE); + // 搜索框防抖监听 + searchEditText.addTextChangedListener(new DebounceTextWatcher(300) { + @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; + } + Intent intent = new Intent(Intent.ACTION_CALL); + intent.setData(android.net.Uri.parse("tel:" + phoneNumber)); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } + }); + } + + // 权限检查 + private void checkContactPermission() { if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) { ActivityCompat.requestPermissions(requireActivity(), new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_READ_CONTACTS); } else { - readContacts(); + loadContacts(); } - - Button btnDial = view.findViewById(R.id.btn_dial); - btnDial.setOnClickListener(new View.OnClickListener(){ - @Override - public void onClick(View p1) { - - String phoneNumber = searchEditText.getText().toString().replaceAll("\\s", ""); - //phoneNumber = "+8616769764848"; - ToastUtils.show(phoneNumber); - Intent intent = new Intent(Intent.ACTION_CALL); - intent.setData(android.net.Uri.parse("tel:" + phoneNumber)); - // 添加 FLAG_ACTIVITY_NEW_TASK 标志 - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(intent); - } - }); } + // 加载联系人（延迟到首次可见时） + private void loadContacts() { + // 若有缓存，直接复用 + if (!sCachedOriginalList.isEmpty() && !sCachedFilteredList.isEmpty()) { + originalContactList.clear(); + originalContactList.addAll(sCachedOriginalList); + contactList.clear(); + contactList.addAll(sCachedFilteredList); + contactAdapter.notifyDataSetChanged(); + recyclerView.setVisibility(View.VISIBLE); // 显示列表 + isDataLoaded = true; + return; + } + + // 无缓存时异步加载 + if (!isDataLoaded) { + recyclerView.setVisibility(View.GONE); // 加载中隐藏列表 + + executor.execute(new Runnable() { + @Override + public void run() { + // 子线程读取联系人 + final List 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(); + LogUtils.d(TAG, String.format("联系人加载完成，共%d条数据", contactList.size())); + + // 数据加载后显示列表 + recyclerView.setVisibility(View.VISIBLE); + isDataLoaded = true; + } + }); + } + }); + } + } + + // 子线程读取联系人 + private List readContactsInBackground() { + List tempList = new ArrayList(); + 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()); + } + } catch (Exception e) { + LogUtils.d(TAG, "读取联系人失败：" + e); + } finally { + if (cursor != null) { + cursor.close(); // 关闭游标，避免内存泄漏 + } + } + return tempList; + } + + // 过滤联系人 + private void filterContacts(String query) { + contactList.clear(); + if (query.isEmpty()) { + contactList.addAll(originalContactList); + sCachedFilteredList.clear(); + 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.clear(); + sCachedFilteredList.addAll(contactList); + } + contactAdapter.notifyDataSetChanged(); + // 过滤后确保列表可见 + recyclerView.setVisibility(View.VISIBLE); + } + + // 权限回调 @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (requestCode == REQUEST_READ_CONTACTS) { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - readContacts(); + loadContacts(); // 授权后加载联系人 + } else { + ToastUtils.show("请授予联系人权限以查看联系人列表"); + recyclerView.setVisibility(View.VISIBLE); // 显示空列表 } } } - private void readContacts() { - contactList.clear(); - originalContactList.clear(); - Cursor cursor = requireContext().getContentResolver().query( - ContactsContract.CommonDataKinds.Phone.CONTENT_URI, - null, - null, - null, - ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + " ASC"); + // 防抖TextWatcher（Java 7实现） + public abstract static class DebounceTextWatcher implements TextWatcher { + private final long debounceDelay; + private Handler handler = new Handler(Looper.getMainLooper()); + private Runnable pendingRunnable; - if (cursor != null) { - while (cursor.moveToNext()) { - String name = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME)); - String number = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER)); - ContactModel contact = new ContactModel(name, number); - contactList.add(contact); - originalContactList.add(contact); - } - cursor.close(); - contactAdapter.notifyDataSetChanged(); + public DebounceTextWatcher(long debounceDelay) { + this.debounceDelay = debounceDelay; } - } - private void filterContacts(String query) { - contactList.clear(); - if (query.isEmpty()) { - contactList.addAll(originalContactList); - } else { - for (ContactModel contact : originalContactList) { - if (contact.getName().toLowerCase().contains(query.toLowerCase()) || - contact.getPinyin().toLowerCase().contains(query.toLowerCase()) || - contact.getNumber().toLowerCase().contains(query.toLowerCase())) { - contactList.add(contact); + @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); + } + + // 资源释放 + @Override + public void onDestroy() { + super.onDestroy(); + executor.shutdown(); // 关闭线程池 + mainHandler.removeCallbacksAndMessages(null); // 清除未执行任务 + } + + // Fragment隐藏/显示时的处理 + @Override + public void onHiddenChanged(boolean hidden) { + super.onHiddenChanged(hidden); + if (!hidden && isDataLoaded) { + // 复用缓存数据并显示列表 + contactList.clear(); + contactList.addAll(sCachedFilteredList); + contactAdapter.notifyDataSetChanged(); + recyclerView.setVisibility(View.VISIBLE); } - contactAdapter.notifyDataSetChanged(); } } 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 index a448180..a5cf183 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/fragments/LogFragment.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.fragments; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/20 12:58:15 * @Describe 应用日志 */ 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 index d58d82d..bd08e58 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/handlers/MainServiceHandler.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/handlers/MainServiceHandler.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.handlers; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/14 03:51:40 */ import android.os.Handler; 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 index 4c87528..61bb49f 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/receivers/MainReceiver.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.receivers; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 06:58:04 * @Describe 主要广播接收器 */ 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 index 7670c9b..4a4fdd7 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/AssistantService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.services; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/14 03:38:31 * @Describe 守护进程服务 */ 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 index 5f0bbda..d171dfc 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.services; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 06:56:41 * @Describe 拨号主服务 * 参考: 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 index 9d694b7..ab30735 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.threads; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/14 03:46:44 */ import android.content.Context; 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 index 93e814c..e1076f2 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java @@ -1,9 +1,9 @@ package cc.winboll.studio.contacts.utils; /** - * @Author ZhanGSKen - * @Date 2025/03/06 21:08:16 - * @Describe ContactUtils + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/08/30 14:32 + * @Describe 联系人工具集 */ import android.content.ContentResolver; import android.content.Context; 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 index f13ab4a..e6a9529 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/EditTextIntUtils.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/EditTextIntUtils.java @@ -3,7 +3,7 @@ import android.widget.EditText; import cc.winboll.studio.libappbase.LogUtils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/04/13 00:59:13 * @Describe Int类型数字输入框工具集 */ 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 index 6d66b11..e218e12 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/IntUtils.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/IntUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/04/13 01:16:28 * @Describe Int数字操作工具集 */ 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 index 6a4c536..4e5250e 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/PhoneUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/26 15:21:48 * @Describe PhoneUtils */ 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 index 3403c76..98fc976 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/utils/RegexPPiUtils.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/utils/RegexPPiUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/09 19:00:21 * @Describe .* 前置预防针 regex pointer preventive injection 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 index 94710a5..6d1e9f6 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/views/DuInfoTextView.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/views/DuInfoTextView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 21:11:03 * @Describe 云盾防御信息 */ 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 index 28d5d86..fb13ae3 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/04 10:51:50 * @Describe CustomHorizontalScrollView */ diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/views/ScrollDoView.java b/contacts/src/main/java/cc/winboll/studio/contacts/views/ScrollDoView.java index 3166065..252a2af 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/views/ScrollDoView.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/views/ScrollDoView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/19 14:04:20 * @Describe 云盾滑视度热备控件 */ 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 index 94707e6..b9482a6 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidget.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.widgets; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/17 14:49:31 * @Describe APPStatusWidget */ 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 index c65cf63..3525067 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidgetClickListener.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/widgets/APPStatusWidgetClickListener.java @@ -1,7 +1,7 @@ package cc.winboll.studio.contacts.widgets; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/17 14:59:55 * @Describe WidgetButtonClickListener */ diff --git a/contacts/src/main/res/values/strings.xml b/contacts/src/main/res/values/strings.xml index 8817cbe..a994a7c 100644 --- a/contacts/src/main/res/values/strings.xml +++ b/contacts/src/main/res/values/strings.xml @@ -2,6 +2,6 @@ Contacts - https://gitea.winboll.cc/Studio/BoBullToon/archive/main.zip + https://gitee.com/zhangsken/bobulltoon/repository/archive/main.zip diff --git a/jc/src/main/java/cc/winboll/studio/jc/App.java b/jc/src/main/java/cc/winboll/studio/jc/App.java index 69b2ce4..e4ff3f9 100644 --- a/jc/src/main/java/cc/winboll/studio/jc/App.java +++ b/jc/src/main/java/cc/winboll/studio/jc/App.java @@ -1,7 +1,7 @@ package cc.winboll.studio.jc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/11/28 15:42:47 * @Describe 全局应用类 */ diff --git a/jcndk/src/cc/winboll/studio/jcndk/FileUtils.java b/jcndk/src/cc/winboll/studio/jcndk/FileUtils.java index bdbee09..f08c863 100644 --- a/jcndk/src/cc/winboll/studio/jcndk/FileUtils.java +++ b/jcndk/src/cc/winboll/studio/jcndk/FileUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.jcndk; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/08 16:31:28 * @Describe 文件工具类 */ diff --git a/jcndk/src/cc/winboll/studio/jcndk/services/JCMainService.java b/jcndk/src/cc/winboll/studio/jcndk/services/JCMainService.java index 00bf332..f963e09 100644 --- a/jcndk/src/cc/winboll/studio/jcndk/services/JCMainService.java +++ b/jcndk/src/cc/winboll/studio/jcndk/services/JCMainService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.jcndk.services; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/09 11:19:28 * @Describe JC 主服务类 */ diff --git a/libaes/build.gradle b/libaes/build.gradle index 2ada4d3..c5e54e4 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -21,8 +21,8 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:libapputils:15.8.4' - api 'cc.winboll.studio:libappbase:15.8.4' + api 'cc.winboll.studio:libapputils:15.8.5' + api 'cc.winboll.studio:libappbase:15.9.5' // 吐司类库 api 'com.github.getActivity:ToastUtils:10.5' diff --git a/libaes/build.properties b/libaes/build.properties index 75ec85f..b928936 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jun 28 12:59:30 HKT 2025 -stageCount=3 +#Sun Aug 31 05:00:43 CST 2025 +stageCount=4 libraryProject=libaes baseVersion=15.9 -publishVersion=15.9.2 +publishVersion=15.9.3 buildCount=0 -baseBetaVersion=15.9.3 +baseBetaVersion=15.9.4 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java index 8339cad..4436433 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.activitys; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/13 18:58:54 * @Describe 可以加入Fragment的有抽屉的活动窗口抽象类 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java index 568d1d3..eaf61db 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.beans; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/14 02:42:57 * @Describe 主题元素项目类 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/beans/DrawerMenuBean.java b/libaes/src/main/java/cc/winboll/studio/libaes/beans/DrawerMenuBean.java index 004ef64..fd9c862 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/beans/DrawerMenuBean.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/beans/DrawerMenuBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.beans; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/14 01:53:34 * @Describe 抽屉菜单项目类 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java index b7017fa..a605d79 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java @@ -10,7 +10,7 @@ import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity; import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/15 00:58:10 * @Describe 第二级窗口 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryFragment.java index 29240e5..c0ddc14 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryFragment.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.unittests; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 02:36:34 * @Describe SecondaryLibraryFragment */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java index aa6bf69..23f0dee 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.unittests; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:27:50 * @Describe TestAButtonFragment */ 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 faa4e28..9359246 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 @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.unittests; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:14:00 * @Describe TestASupportToolbarActivity */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java index 30c9261..64d8ce0 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAToolbarActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.unittests; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:16:07 * @Describe TestAToolbarActivity */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java index 23e3295..e9d1b65 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.unittests; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/06/30 15:00:51 */ import android.app.Activity; diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java index ab9449d..a4a3350 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.unittests; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:35:56 * @Describe TestViewPageFragment */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java index 964898a..e705f3c 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/11/29 22:52:09 * @Describe AES 主题工具集 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AppVersionUtils.java b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AppVersionUtils.java index 11cf967..e4ac66b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AppVersionUtils.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AppVersionUtils.java @@ -2,7 +2,7 @@ package cc.winboll.studio.libaes.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/12 14:45:35 * @Describe 应用版本工具集 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AButton.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AButton.java index 4838725..5c9c111 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AButton.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AButton.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:41:22 * @Describe AButton */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/ACard.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/ACard.java index 7c69ad2..4f627f8 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/ACard.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/ACard.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:44:27 * @Describe ACard */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java index 4a4e7a2..432fbde 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:46:30 * @Describe AOneHundredPercantClickToCommitSeekBar */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTSCard.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTSCard.java index 9ff4c86..a7120ea 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTSCard.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTSCard.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:49:23 * @Describe AOneHundredPercantClickToStartCard */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java index 8e4439f..c384919 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:54:40 * @Describe ASupportToolbar */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/ATickProgressBar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/ATickProgressBar.java index 4b574a8..ddba22b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/ATickProgressBar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/ATickProgressBar.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:56:38 * @Describe ATickProgressBar */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java index f1c9248..39b9249 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/16 01:58:01 * @Describe AToolbar */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java index 451e58c..94248e8 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/APPInfo.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/20 14:19:02 * @Describe 应用信息类 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java index bf223ad..dc11ae5 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/24 15:08:52 * @Describe WinBoLL应用介绍视图 */ @@ -239,7 +239,7 @@ public class AboutView extends LinearLayout { //.addItem(versionElement) //.addItem(adsElement) //.addGroup("Connect with us") - .addEmail("ZhanGSKen") + .addEmail("ZhanGSKen") .addWebsite(mszHomePage) .addItem(elementGitWeb) .addItem(elementAppUpdate); diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java index 640e1fd..36fb68b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/28 19:12:12 * @Describe 应用主要服务组件类守护进程服务组件类 */ diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java index a468bdf..86fd15e 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/EWUIStatusIconDrawable.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libaes.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/28 19:11:27 * @Describe WinBoLL UI 状态图标枚举 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/AppUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/AppUtils.java index 1a0ceba..1d04756 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/AppUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/AppUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/15 20:05:03 * @Describe AppUtils */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/BaseBean.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/BaseBean.java index 82505d8..e1b5e7b 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/BaseBean.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/BaseBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/15 11:11:52 * @Describe Json Bean 基础类。 */ 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 9baedc9..5b97af6 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/CrashHandler.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/12 13:22:12 * @Describe 异常处理类 */ 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 9f498f3..616139e 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/05 10:10:23 * @Describe 全局应用类 */ 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 ff926a5..b4ecda5 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/11 00:14:05 */ import android.app.Activity; 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 1fa8afa..fe68a7b 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalCrashReportView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/11 20:18:30 * @Describe 应用崩溃报告视图 */ 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 7d11bca..4525cc2 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/12 13:44:06 * @Describe LogUtils * @Describe 应用日志类 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsBean.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsBean.java index ce73245..1a9d211 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsBean.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/23 15:39:07 * @Describe LogUtils 数据配置类。 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsClassTAGBean.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsClassTAGBean.java index bd79833..af9c57d 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsClassTAGBean.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtilsClassTAGBean.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/04 14:17:02 * @Describe 日志类class TAG 标签数据类 */ 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 c37f385..5a104ce 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/12 14:36:18 * @Describe 日志视图类，继承 RelativeLayout 类。 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogViewThread.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogViewThread.java index 3e992aa..bccbe03 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogViewThread.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogViewThread.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/12 14:43:50 * @Describe 日志视图线程类 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/UTF8FileUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/UTF8FileUtils.java index 7a86d72..5c797fd 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/UTF8FileUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/UTF8FileUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/19 14:30:57 * @Describe UTF-8编码文件工具类 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java index 767d570..029b1ee 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/LogonActivity.java @@ -17,7 +17,7 @@ import java.security.PrivateKey; import java.security.PublicKey; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/06/04 13:29 * @Describe 用户登录框 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java index c4e93e7..fe929f4 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/activities/YunActivity.java @@ -15,7 +15,7 @@ import android.widget.RadioButton; import cc.winboll.studio.libappbase.LogView; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/06/04 11:06 * @Describe 云宝云 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java index 51facb9..2971d8a 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.dialogs; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/28 17:40:47 * @Date 2024/08/12 14:46:25 * @Describe 询问用户确定与否的选择框 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/APPModel.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/APPModel.java index 84b93d8..a26f8ed 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/APPModel.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/APPModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 10:28:08 * @Describe 应用调试模型 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java index 675f40b..6ec5398 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/ResponseData.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/06/05 11:26 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java index 3affb45..4410e0a 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/UserInfoModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/06/04 19:14 */ import android.util.JsonReader; diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLModel.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLModel.java index d5d71b0..5ca5257 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLModel.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.models; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/05/10 10:16 * @Describe WinBoLLModel */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLNewsBean.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLNewsBean.java index 56cbd80..de2b03d 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLNewsBean.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/models/WinBoLLNewsBean.java @@ -5,7 +5,7 @@ import cc.winboll.studio.libappbase.BaseBean; import java.io.IOException; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/05/10 09:36 * @Describe WinBoLL 应用消息数据模型 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/MyBroadcastReceiver.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/MyBroadcastReceiver.java index 620734c..bcd970e 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/MyBroadcastReceiver.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/MyBroadcastReceiver.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.receiver; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/13 21:19:09 * @Describe MyBroadcastReceiver */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOS.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOS.java index c64a2e6..6d80d25 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOS.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOS.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.sos; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 09:36:29 * @Describe WinBoLL 应用 SOS 机理保护类 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterService.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterService.java index d98f1d5..7c7c1fa 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterService.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterService.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.sos; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/27 14:00:21 * @Describe Simple Operate Signal Service Center. * 简单操作信号服务中心 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceModel.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceModel.java index 131769e..f2cfc40 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceModel.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceModel.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.sos; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/02 09:49:45 * @Describe SOSCenterServiceModel * Simple Operate Signal Service Model. diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceReceiver.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceReceiver.java index ca1765b..ec3341b 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceReceiver.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSCenterServiceReceiver.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.sos; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/27 14:04:35 * @Describe SOSCenterServiceReceiver */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSObject.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSObject.java index 7465b24..5f19563 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSObject.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/sos/SOSObject.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.sos; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/27 14:12:05 * @Describe SOSBean */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java index b56f263..babe0a9 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/FileUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/06/04 20:15 * @Describe 文件操作类 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java index e5c58c3..19e4deb 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/RSAUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/06/04 13:36 * @Describe RSA加密工具 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ServiceUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ServiceUtils.java index 5006999..6d1385c 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ServiceUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ServiceUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/17 19:38:20 * @Describe 服务工具集 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ToastUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ToastUtils.java index 83ff87f..05be500 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ToastUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/ToastUtils.java @@ -3,7 +3,7 @@ import android.content.Context; import android.widget.Toast; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/12 12:02:31 */ public class ToastUtils { diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java index 7858da2..8e609b3 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/utils/YunUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/06/04 17:21 * @Describe 应用登录与接口工具 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java index 16f28dd..ce7c8eb 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/12 12:29:01 * @Describe 水平布局的 ListView */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidget.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidget.java index 3323df6..aa2476b 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidget.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidget.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.widgets; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/17 20:32:12 */ import android.app.PendingIntent; diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidgetClickListener.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidgetClickListener.java index a4fdc38..911b1d6 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidgetClickListener.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/StatusWidgetClickListener.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.widgets; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/02/17 20:33:53 * @Describe APPWidgetClickListener */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBoLLActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBoLLActivity.java index a1e8c83..0aaf6fd 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBoLLActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBoLLActivity.java @@ -2,7 +2,7 @@ package cc.winboll.studio.libappbase.winboll; import android.app.Activity; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/05/10 09:34 * @Describe WinBoLL 窗口操作接口 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java index 7c48c10..623e73e 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/LogActivity.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/25 20:34:47 * @Describe 应用日志窗口 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java index 2990cc0..892f35f 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/25 04:29:19 */ import android.app.Activity; diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLL.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLL.java index b0ee734..f94db1d 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLL.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLL.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/05/10 10:13 * @Describe WinBoLL 系列应用通用管理类 */ diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java index 8e4f94c..220294d 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libappbase.winboll; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/05/10 10:02 * @Describe 应用活动窗口管理器 * 参考 ： diff --git a/libapputils/build.gradle b/libapputils/build.gradle index 37bf086..3e2a2bc 100644 --- a/libapputils/build.gradle +++ b/libapputils/build.gradle @@ -21,7 +21,7 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:libappbase:15.8.2' + api 'cc.winboll.studio:libappbase:15.9.5' // 二维码类库 api 'com.google.zxing:core:3.4.1' diff --git a/libapputils/build.properties b/libapputils/build.properties index 0dee644..d28973e 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jun 03 15:05:42 HKT 2025 -stageCount=5 +#Mon Sep 01 07:56:11 HKT 2025 +stageCount=7 libraryProject=libapputils baseVersion=15.8 -publishVersion=15.8.4 +publishVersion=15.8.6 buildCount=0 -baseBetaVersion=15.8.5 +baseBetaVersion=15.8.7 diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/git/IAPPFiles.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/git/IAPPFiles.java index 02cca75..f481f43 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/git/IAPPFiles.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/git/IAPPFiles.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/09 12:30:59 * @Describe 应用文件接口基础类 */ diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/BBMorseCodeUtils.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/BBMorseCodeUtils.java index 7e02d33..248c2fa 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/BBMorseCodeUtils.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/BBMorseCodeUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/03/23 16:17:54 * @Describe 哔哔振动响铃工具集 */ diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/FileUtils.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/FileUtils.java index f377a4b..1da64f9 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/FileUtils.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/FileUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/07/19 14:30:57 * @Describe 文件工具类 */ diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/MD5Utils.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/MD5Utils.java index 66c1e75..d2a97db 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/MD5Utils.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/MD5Utils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/19 15:26:58 */ import java.math.BigInteger; diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/PrefUtils.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/PrefUtils.java index ca83164..7eb4df6 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/PrefUtils.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/PrefUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/11/28 15:03:12 * @Describe 应用变量保存工具 */ diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/QRCodeGenerator.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/QRCodeGenerator.java index 3435c48..e3f5e08 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/QRCodeGenerator.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/QRCodeGenerator.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/17 20:49:55 * @Describe 二维码工具 */ diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/RegexPPiUtils.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/RegexPPiUtils.java new file mode 100644 index 0000000..d17ac7d --- /dev/null +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/RegexPPiUtils.java @@ -0,0 +1,32 @@ +package cc.winboll.studio.libapputils.utils; + +/** + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/09/01 07:49 + * @Describe .* 前置预防针 + regex pointer preventive injection + 简称 RegexPPi + */ +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RegexPPiUtils { + + public static final String TAG = "RegexPPiUtils"; + + // + // 检验文本是否满足适合正则表达式模式计算 + // + public static boolean isPPiOK(String text) { + //String text = "这里是一些任意的文本内容"; + String regex = ".*"; + Pattern pattern = Pattern.compile(regex); + Matcher matcher = pattern.matcher(text); + /*if (matcher.matches()) { + System.out.println("文本满足该正则表达式模式"); + } else { + System.out.println("文本不满足该正则表达式模式"); + }*/ + return matcher.matches(); + } +} diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/ServiceUtils.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/ServiceUtils.java index 7d40dc3..8dcbada 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/ServiceUtils.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/ServiceUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/08 20:09:02 * @Describe 应用服务组件工具类 */ diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/UriUtils.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/UriUtils.java index 23c2dfe..327b662 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/UriUtils.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/utils/UriUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.utils; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Describe Uri 资源管理工具类 */ import android.content.ContentResolver; diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/views/SimpleWebView.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/views/SimpleWebView.java index 27e38be..ee88f54 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/views/SimpleWebView.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/views/SimpleWebView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/03 11:05:45 * @Describe 简单网页视图类 */ diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/views/StringToQrCodeView.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/views/StringToQrCodeView.java index 61bc27d..2247242 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/views/StringToQrCodeView.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/views/StringToQrCodeView.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libapputils.views; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/12/19 13:49:14 * @Describe 把字符串转化为二维码的视图 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/JCCommandThread.java b/libjc/src/main/java/cc/winboll/studio/libjc/JCCommandThread.java index 6b8b94f..fe57092 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/JCCommandThread.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/JCCommandThread.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/07 17:34:56 * @Describe JC命令行执行类 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorStream.java b/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorStream.java index 483572b..856af32 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorStream.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorStream.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/07 13:46:40 * @Describe JC 错误输出流 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorThread.java b/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorThread.java index 1eb5ed7..c95a4e9 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorThread.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/JCErrorThread.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/07 13:51:14 * @Describe 错误输出流进程 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputStream.java b/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputStream.java index 1853a69..5e88842 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputStream.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputStream.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/07 12:32:19 * @Describe 控制台输出流接口类 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputThread.java b/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputThread.java index 84301dd..0cd9d66 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputThread.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/JCOutputThread.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/07 13:27:26 * @Describe JC输出流进程 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/Main.java b/libjc/src/main/java/cc/winboll/studio/libjc/Main.java index 9cf0d31..be98c86 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/Main.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/Main.java @@ -10,7 +10,7 @@ public class Main { public final static String TAG = "Main"; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/09 17:03:50 * @Describe 当前源码实例的运行模式。 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/TestClassA.java b/libjc/src/main/java/cc/winboll/studio/libjc/TestClassA.java index a385192..ec18fa2 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/TestClassA.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/TestClassA.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/06 11:14:19 * @Describe 测试类A */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/TestClassB.java b/libjc/src/main/java/cc/winboll/studio/libjc/TestClassB.java index a9b79a3..c167f6c 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/TestClassB.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/TestClassB.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/09 08:49:08 * @Describe 测试类B */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/bean/BaseBean.java b/libjc/src/main/java/cc/winboll/studio/libjc/bean/BaseBean.java index 2b4109f..ef809a8 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/bean/BaseBean.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/bean/BaseBean.java @@ -1,7 +1,7 @@ package main.java.cc.winboll.studio.libjc.bean; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/23 15:40:30 * @Describe Json Bean 基础类。 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/cmd/ListJarClassHasMain.java b/libjc/src/main/java/cc/winboll/studio/libjc/cmd/ListJarClassHasMain.java index 60e8a35..49265c4 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/cmd/ListJarClassHasMain.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/cmd/ListJarClassHasMain.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc.cmd; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/11 12:43:29 * @Describe 列举定义了main函数的所有类。 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/net/MesaageBean.java b/libjc/src/main/java/cc/winboll/studio/libjc/net/MesaageBean.java index 5fa15f4..71e40eb 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/net/MesaageBean.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/net/MesaageBean.java @@ -5,7 +5,7 @@ import java.io.IOException; import main.java.cc.winboll.studio.libjc.bean.BaseBean; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/09 20:07:06 * @Describe 消息类 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/util/FileUtils.java b/libjc/src/main/java/cc/winboll/studio/libjc/util/FileUtils.java index f4f06ec..d5113a3 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/util/FileUtils.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/util/FileUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc.util; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2024/08/12 13:46:32 * @Describe 文件处理工具 */ diff --git a/libjc/src/main/java/cc/winboll/studio/libjc/util/LogUtils.java b/libjc/src/main/java/cc/winboll/studio/libjc/util/LogUtils.java index 7156e72..ca3e3d7 100644 --- a/libjc/src/main/java/cc/winboll/studio/libjc/util/LogUtils.java +++ b/libjc/src/main/java/cc/winboll/studio/libjc/util/LogUtils.java @@ -1,7 +1,7 @@ package cc.winboll.studio.libjc.util; /** - * @Author ZhanGSKen + * @Author ZhanGSKen * @Date 2025/01/06 18:47:05 * @Describe 日志类 */ diff --git a/midiplayer/.gitignore b/midiplayer/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/midiplayer/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/midiplayer/README.md b/midiplayer/README.md new file mode 100644 index 0000000..68ee43e --- /dev/null +++ b/midiplayer/README.md @@ -0,0 +1,34 @@ +# Midi Player + +#### 介绍 +Midi 音乐播放器 + +#### 软件架构 +适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。 +也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。 + + +#### Gradle 编译说明 +调试版编译命令 ：gradle assembleBetaDebug +阶段版编译命令 ：bash .winboll/bashPublishAPKAddTag.sh miniplayer + +#### 使用说明 + +#### 参与贡献 + +1. Fork 本仓库 +2. 新建 Feat_xxx 分支 +3. 提交代码 : ZhanGSKen(ZhanGSKen) +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/midiplayer/app_update_description.txt b/midiplayer/app_update_description.txt new file mode 100644 index 0000000..e69de29 diff --git a/midiplayer/build.gradle b/midiplayer/build.gradle new file mode 100644 index 0000000..4bb3bf4 --- /dev/null +++ b/midiplayer/build.gradle @@ -0,0 +1,73 @@ +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 { + compileSdkVersion 32 + buildToolsVersion "32.0.0" + + defaultConfig { + applicationId "cc.winboll.studio.midiplayer" + minSdkVersion 26 + targetSdkVersion 30 + versionCode 1 + // versionName 更新后需要手动设置 + // .winboll/winbollBuildProps.properties 文件的 stageCount=0 + // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" + versionName "15.0" + if(true) { + versionName = genVersionName("${versionName}") + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + api fileTree(dir: 'libs', include: ['*.jar']) + + // SSH + api 'com.jcraft:jsch:0.1.55' + // Html 解析 + api 'org.jsoup:jsoup:1.13.1' + // 二维码类库 + api 'com.google.zxing:core:3.4.1' + api 'com.journeyapps:zxing-android-embedded:3.6.0' + // 应用介绍页类库 + api 'io.github.medyo:android-about-page:2.0.0' + // 吐司类库 + api 'com.github.getActivity:ToastUtils:10.5' + // 网络连接类库 + api 'com.squareup.okhttp3:okhttp:4.4.1' + // AndroidX 类库 + api 'androidx.appcompat:appcompat:1.1.0' + api 'com.google.android.material:material:1.4.0' + //api 'androidx.viewpager:viewpager:1.0.0' + //api 'androidx.vectordrawable:vectordrawable:1.1.0' + //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' + //api 'androidx.fragment:fragment:1.1.0' + + api 'cc.winboll.studio:libaes:15.9.2' + api 'cc.winboll.studio:libapputils:15.8.4' + api 'cc.winboll.studio:libappbase:15.8.4' +} diff --git a/midiplayer/build.properties b/midiplayer/build.properties new file mode 100644 index 0000000..1a8dc1c --- /dev/null +++ b/midiplayer/build.properties @@ -0,0 +1,8 @@ +#Created by .winboll/winboll_app_build.gradle +#Tue Sep 02 12:52:51 GMT 2025 +stageCount=1 +libraryProject= +baseVersion=15.0 +publishVersion=15.0.0 +buildCount=2 +baseBetaVersion=15.0.1 diff --git a/midiplayer/proguard-rules.pro b/midiplayer/proguard-rules.pro new file mode 100644 index 0000000..64b4a05 --- /dev/null +++ b/midiplayer/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/midiplayer/src/beta/AndroidManifest.xml b/midiplayer/src/beta/AndroidManifest.xml new file mode 100644 index 0000000..ee78d9f --- /dev/null +++ b/midiplayer/src/beta/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/midiplayer/src/beta/res/values/strings.xml b/midiplayer/src/beta/res/values/strings.xml new file mode 100644 index 0000000..a7c572e --- /dev/null +++ b/midiplayer/src/beta/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + MidiPlayer + + + diff --git a/midiplayer/src/main/AndroidManifest.xml b/midiplayer/src/main/AndroidManifest.xml new file mode 100644 index 0000000..9d2c79e --- /dev/null +++ b/midiplayer/src/main/AndroidManifest.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/midiplayer/src/main/assets/midi/SuperMarioBrothers.mid b/midiplayer/src/main/assets/midi/SuperMarioBrothers.mid new file mode 100644 index 0000000..8ea4281 Binary files /dev/null and b/midiplayer/src/main/assets/midi/SuperMarioBrothers.mid differ diff --git a/midiplayer/src/main/assets/midi/Twinkle Twinkle Little Star.mid b/midiplayer/src/main/assets/midi/Twinkle Twinkle Little Star.mid new file mode 100644 index 0000000..38e1ee9 Binary files /dev/null and b/midiplayer/src/main/assets/midi/Twinkle Twinkle Little Star.mid differ diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/App.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/App.java new file mode 100644 index 0000000..86a9c55 --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/App.java @@ -0,0 +1,345 @@ +package cc.winboll.studio.midiplayer; + +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 com.hjq.toast.ToastUtils; +import com.hjq.toast.style.WhiteToastStyle; +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 head = new LinkedHashMap(); + 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/midiplayer/src/main/java/cc/winboll/studio/midiplayer/AssetMidiCopier.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/AssetMidiCopier.java new file mode 100644 index 0000000..0e62b99 --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/AssetMidiCopier.java @@ -0,0 +1,137 @@ +package cc.winboll.studio.midiplayer; + +/** + * @Author ZhanGSKen + * @Date 2025/06/29 10:56 + * @Describe 用于将assets/midi目录下的文件拷贝到内部存储 + */ +import android.content.Context; +import android.content.res.AssetManager; +import android.util.Log; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + +public class AssetMidiCopier { + public static final String TAG = "AssetMidiCopier"; + + private Context mContext; + + public AssetMidiCopier(Context context) { + mContext = context; + } + + /** + * 拷贝assets/midi目录下所有文件到内部存储的midi文件夹 + * @return 拷贝是否成功 + */ + public boolean copyMidiFiles() { + AssetManager assetManager = mContext.getAssets(); + String[] midiFiles; + + try { + // 获取assets/midi目录下的所有文件 + midiFiles = assetManager.list("midi"); + if (midiFiles == null || midiFiles.length == 0) { + Log.d(TAG, "assets/midi目录下没有文件"); + return false; + } + + // 获取内部存储的目标目录（/data/data/包名/files/midi） + File targetDir = new File(mContext.getFilesDir(), "midi"); + if (!targetDir.exists()) { + // 创建目录（包括父目录） + if (!targetDir.mkdirs()) { + Log.e(TAG, "创建目标目录失败: " + targetDir.getAbsolutePath()); + return false; + } + } + + // 逐个拷贝文件 + for (String fileName : midiFiles) { + // 跳过目录，只处理文件 + if (fileName.contains("/")) { + continue; + } + + // 源文件路径（assets/midi/文件名） + String sourcePath = "midi/" + fileName; + // 目标文件路径 + File targetFile = new File(targetDir, fileName); + + // 如果文件已存在，跳过拷贝 + if (targetFile.exists()) { + Log.d(TAG, "文件已存在，跳过: " + fileName); + continue; + } + + // 执行拷贝 + if (!copySingleFile(assetManager, sourcePath, targetFile)) { + Log.e(TAG, "拷贝文件失败: " + fileName); + return false; + } + } + + Log.d(TAG, "所有MIDI文件拷贝完成，共" + midiFiles.length + "个文件"); + return true; + + } catch (IOException e) { + Log.e(TAG, "拷贝过程发生错误: " + e.getMessage()); + e.printStackTrace(); + return false; + } + } + + /** + * 拷贝单个assets文件到目标路径 + */ + private boolean copySingleFile(AssetManager assetManager, String sourcePath, File targetFile) { + InputStream in = null; + FileOutputStream out = null; + + try { + // 打开assets中的源文件 + in = assetManager.open(sourcePath); + // 创建目标文件输出流 + out = new FileOutputStream(targetFile); + + // 缓冲区 + byte[] buffer = new byte[1024]; + int length; + // 读写文件 + while ((length = in.read(buffer)) != -1) { + out.write(buffer, 0, length); + } + + // 刷新输出流，确保数据写入 + out.flush(); + return true; + + } catch (IOException e) { + Log.e(TAG, "拷贝单个文件错误: " + e.getMessage()); + return false; + + } finally { + // 关闭流 + try { + if (in != null) { + in.close(); + } + if (out != null) { + out.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + /** + * 获取内部存储中MIDI文件的目录 + */ + public File getMidiTargetDir() { + return new File(mContext.getFilesDir(), "midi"); + } +} + diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MainActivity.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MainActivity.java new file mode 100644 index 0000000..c8dd5ca --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MainActivity.java @@ -0,0 +1,78 @@ +package cc.winboll.studio.midiplayer; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.LogView; +import com.hjq.toast.ToastUtils; +import java.io.File; + +public class MainActivity extends WinBoLLActivity { + + LogView mLogView; + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @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"); + copyAssetsMidiFiles(); + } + + public void onOpenMidiPlayer(View view) { + App.getWinBoLLActivityManager().startWinBoLLActivity(this, MidiPlayerActivity.class); + } + + @Override + protected void onResume() { + super.onResume(); + mLogView.start(); + } + + // 在需要拷贝的地方调用（如Activity的onCreate中） + private void copyAssetsMidiFiles() { + // 新建拷贝工具类实例 + final AssetMidiCopier copier = new AssetMidiCopier(this); + + // 开启子线程执行拷贝（避免主线程阻塞） + new Thread(new Runnable() { + @Override + public void run() { + final boolean success = copier.copyMidiFiles(); + // 拷贝结果可通过Handler通知主线程更新UI + runOnUiThread(new Runnable() { + @Override + public void run() { + if (success) { + // 拷贝成功，获取目标目录 + File midiDir = copier.getMidiTargetDir(); + LogUtils.d(TAG, "文件保存路径: " + midiDir.getAbsolutePath()); + // 可在这里加载MIDI文件 + } else { + // 拷贝失败，提示用户 + } + } + }); + } + }).start(); + } + +} diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiParser.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiParser.java new file mode 100644 index 0000000..8adf9d1 --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiParser.java @@ -0,0 +1,420 @@ +package cc.winboll.studio.midiplayer; + +/** + * @Author ZhanGSKen + * @Date 2025/06/29 10:26 + * @Describe MIDI文件解析器，用于解析MIDI文件并提取轨道信息 + */ +import cc.winboll.studio.libappbase.LogUtils; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +public class MidiParser { + public static final String TAG = "MidiParser"; + private static final Charset US_ASCII = Charset.forName("US-ASCII"); + + private InputStream mInputStream; + private int mTrackCount; // 轨道数量 + private int mTicksPerBeat; // 每拍的ticks数（从文件头解析） + + public MidiParser(File file) throws IOException { + this.mInputStream = new FileInputStream(file); + } + + /** + * 解析MIDI文件，返回包含轨道和每拍ticks数的结果（支持速度控制） + */ + public MidiPlayer.MidiParseResult parseWithTicks() throws IOException { + try { + // 1. 验证MIDI文件头（MThd） + if (!verifyHeader()) { + LogUtils.d(TAG, "不是有效的MIDI文件"); + return null; + } + + // 2. 读取文件头信息（包含每拍ticks数） + readHeaderInfo(); + + // 3. 解析每个轨道（包含事件的deltaTicks） + MidiPlayer.MidiTrack[] tracks = new MidiPlayer.MidiTrack[mTrackCount]; + for (int i = 0; i < mTrackCount; i++) { + tracks[i] = parseTrackWithTicks(); + } + + // 返回解析结果（轨道数组 + 每拍ticks数） + return new MidiPlayer.MidiParseResult(tracks, mTicksPerBeat); + } finally { + if (mInputStream != null) { + mInputStream.close(); + } + } + } + + /** + * 原始解析方法（兼容旧逻辑） + */ + public MidiTrack[] parse() throws IOException { + try { + if (!verifyHeader()) { + LogUtils.d(TAG, "不是有效的MIDI文件"); + return null; + } + + readHeaderInfo(); + MidiTrack[] tracks = new MidiTrack[mTrackCount]; + for (int i = 0; i < mTrackCount; i++) { + tracks[i] = parseTrack(); + } + return tracks; + } finally { + if (mInputStream != null) { + mInputStream.close(); + } + } + } + + /** + * 验证MIDI文件头（必须以"MThd"开头） + */ + private boolean verifyHeader() throws IOException { + byte[] header = new byte[4]; + int read = mInputStream.read(header); + if (read != 4) { + LogUtils.d(TAG, "文件头读取不完整，读取字节数: " + read); + return false; + } + String headerStr = new String(header, US_ASCII); + boolean isValid = "MThd".equals(headerStr); + if (!isValid) { + LogUtils.d(TAG, "无效的文件头标识: " + headerStr + + " (十六进制: " + bytesToHex(header) + ")"); + } + return isValid; + } + + /** + * 读取MIDI文件头信息（提取每拍ticks数） + */ + private void readHeaderInfo() throws IOException { + // 1. 读取头长度（4字节，标准MIDI固定为6） + int headerLength = readInt(); + LogUtils.d(TAG, "MIDI文件头长度: " + headerLength); + + // 2. 读取头数据（共6字节） + byte[] headerData = new byte[6]; + int read = mInputStream.read(headerData); + if (read != 6) { + LogUtils.d(TAG, "文件头数据不完整，预期6字节，实际读取: " + read); + throw new IOException("无效的MIDI文件头数据"); + } + + // 3. 解析头信息（格式类型、轨道数、每拍ticks数） + int formatType = ((headerData[0] & 0xFF) << 8) | (headerData[1] & 0xFF); + mTrackCount = ((headerData[2] & 0xFF) << 8) | (headerData[3] & 0xFF); + mTicksPerBeat = ((headerData[4] & 0xFF) << 8) | (headerData[5] & 0xFF); // 存储每拍ticks数 + + LogUtils.d(TAG, "MIDI文件格式: " + formatType); + LogUtils.d(TAG, "时间分隔符(每拍 ticks): " + mTicksPerBeat); + LogUtils.d(TAG, "解析到轨道数量: " + mTrackCount); + + // 4. 处理扩展头 + if (headerLength > 6) { + long skipped = mInputStream.skip(headerLength - 6); + LogUtils.d(TAG, "跳过扩展头字节数: " + skipped); + } + } + + /** + * 解析单个轨道（包含事件的deltaTicks，用于速度控制） + */ + private MidiPlayer.MidiTrack parseTrackWithTicks() throws IOException { + // 1. 读取轨道头（MTrk） + byte[] trackHeader = new byte[4]; + int headerRead = mInputStream.read(trackHeader); + if (headerRead != 4) { + LogUtils.d(TAG, "轨道头读取不完整，实际读取: " + headerRead + "字节"); + return new MidiPlayer.MidiTrack(new ArrayList()); + } + + // 2. 验证轨道头标识 + String headerStr = new String(trackHeader, US_ASCII); + if (!"MTrk".equals(headerStr)) { + LogUtils.d(TAG, "无效的轨道头标识: " + headerStr); + return new MidiPlayer.MidiTrack(new ArrayList()); + } + + // 3. 读取轨道长度 + int trackLength = readInt(); + LogUtils.d(TAG, "解析轨道，长度: " + trackLength + "字节"); + + // 4. 读取完整轨道数据 + byte[] trackData = new byte[trackLength]; + int totalRead = 0; + while (totalRead < trackLength) { + int bytesRead = mInputStream.read(trackData, totalRead, trackLength - totalRead); + if (bytesRead == -1) { + LogUtils.d(TAG, "轨道数据读取提前结束，已读取: " + totalRead); + break; + } + totalRead += bytesRead; + } + + // 5. 解析轨道事件（包含deltaTicks） + List events = new ArrayList(); + if (totalRead == trackLength) { + parseEventsWithTicks(events, trackData); + } else { + LogUtils.d(TAG, "轨道数据不完整，跳过事件解析"); + } + + return new MidiPlayer.MidiTrack(events); + } + + /** + * 解析轨道事件（提取deltaTicks，用于计算播放延迟） + */ + private void parseEventsWithTicks(List events, byte[] trackData) { + int offset = 0; + while (offset < trackData.length) { + // 1. 读取deltaTicks（事件间隔，单位ticks） + long deltaTicks = readVariableLength(trackData, offset); + int deltaSize = getVariableLengthSize(deltaTicks); + offset += deltaSize; + + if (offset >= trackData.length) { + break; + } + + // 2. 读取事件状态字节 + int statusByte = trackData[offset] & 0xFF; + offset++; + + // 3. 确定事件数据长度 + int dataLength = getEventDataLength(statusByte); + if (offset + dataLength > trackData.length) { + LogUtils.d(TAG, "事件数据不完整，状态字节: 0x" + Integer.toHexString(statusByte)); + break; + } + + // 4. 提取事件数据（状态字节+数据字节） + byte[] eventData = new byte[1 + dataLength]; + eventData[0] = (byte) statusByte; + System.arraycopy(trackData, offset, eventData, 1, dataLength); + offset += dataLength; + + // 5. 存储事件（包含deltaTicks） + events.add(new MidiPlayer.MidiEvent(eventData, (int) deltaTicks)); + } + + LogUtils.d(TAG, "轨道事件解析完成，事件数量: " + events.size()); + } + + /** + * 原始轨道解析方法（兼容旧逻辑） + */ + private MidiTrack parseTrack() throws IOException { + // 1. 读取轨道头（MTrk） + byte[] trackHeader = new byte[4]; + int headerRead = mInputStream.read(trackHeader); + if (headerRead != 4) { + LogUtils.d(TAG, "轨道头读取不完整，实际读取: " + headerRead + "字节"); + return new MidiTrack(); + } + + // 2. 验证轨道头标识 + String headerStr = new String(trackHeader, US_ASCII); + if (!"MTrk".equals(headerStr)) { + LogUtils.d(TAG, "无效的轨道头标识: " + headerStr + + " (十六进制: " + bytesToHex(trackHeader) + ")"); + return new MidiTrack(); + } + + // 3. 读取轨道长度 + int trackLength = readInt(); + LogUtils.d(TAG, "解析轨道，长度: " + trackLength + "字节"); + + // 4. 读取完整轨道数据 + byte[] trackData = new byte[trackLength]; + int totalRead = 0; + while (totalRead < trackLength) { + int bytesRead = mInputStream.read(trackData, totalRead, trackLength - totalRead); + if (bytesRead == -1) { + LogUtils.d(TAG, "轨道数据读取提前结束，已读取: " + totalRead + "，预期: " + trackLength); + break; + } + totalRead += bytesRead; + } + + // 5. 解析轨道事件 + MidiTrack track = new MidiTrack(); + if (totalRead == trackLength) { + parseEvents(track, trackData); + } else { + LogUtils.d(TAG, "轨道数据不完整，跳过事件解析"); + } + + return track; + } + + /** + * 原始事件解析方法（兼容旧逻辑） + */ + private void parseEvents(MidiTrack track, byte[] trackData) { + int offset = 0; + while (offset < trackData.length) { + // 1. 读取可变长度时间戳（MIDI事件时间差） + long deltaTime = readVariableLength(trackData, offset); + offset += getVariableLengthSize(deltaTime); + + if (offset >= trackData.length) { + break; + } + + // 2. 读取事件状态字节 + int statusByte = trackData[offset] & 0xFF; + offset++; + + // 3. 确定事件数据长度 + int dataLength = getEventDataLength(statusByte); + if (offset + dataLength > trackData.length) { + LogUtils.d(TAG, "事件数据不完整，状态字节: 0x" + Integer.toHexString(statusByte) + + "，剩余字节: " + (trackData.length - offset)); + break; + } + + // 4. 提取完整事件（状态字节+数据字节） + byte[] event = new byte[1 + dataLength]; + event[0] = (byte) statusByte; + System.arraycopy(trackData, offset, event, 1, dataLength); + offset += dataLength; + + track.addEvent(event); + } + + LogUtils.d(TAG, "轨道事件解析完成，事件数量: " + track.getEventCount()); + } + + /** + * 根据状态字节获取事件数据长度 + */ + private int getEventDataLength(int statusByte) { + int eventType = statusByte >> 4; + switch (eventType) { + case 0x8: // 音符关闭 + case 0x9: // 音符开启 + case 0xA: // 触后 + case 0xB: // 控制器 + case 0xE: // 弯音 + return 2; + case 0xC: // 程序变更 + case 0xD: // 通道触后 + return 1; + case 0xF: // 系统事件 + if (statusByte == 0xFF) { // 元事件 + return 1; + } else if (statusByte == 0xF0 || statusByte == 0xF7) { // 系统专属事件 + return 0; + } + default: + return 0; + } + } + + /** + * 读取可变长度整数（MIDI事件时间差deltaTicks） + */ + private long readVariableLength(byte[] data, int offset) { + long value = 0; + int b; + int i = 0; + do { + b = data[offset + i] & 0xFF; + value = (value << 7) | (b & 0x7F); + i++; + } while ((b & 0x80) != 0 && i < 4); // 最多4字节 + return value; + } + + /** + * 获取可变长度整数的字节数 + */ + private int getVariableLengthSize(long value) { + if (value < 0x80) return 1; + if (value < 0x4000) return 2; + if (value < 0x200000) return 3; + return 4; + } + + /** + * 读取无符号短整型（2字节，大端序） + */ + private int readUnsignedShort() throws IOException { + int b1 = mInputStream.read() & 0xFF; + int b2 = mInputStream.read() & 0xFF; + return (b1 << 8) | b2; + } + + /** + * 读取整型（4字节，大端序） + */ + private int readInt() throws IOException { + int b1 = mInputStream.read() & 0xFF; + int b2 = mInputStream.read() & 0xFF; + int b3 = mInputStream.read() & 0xFF; + int b4 = mInputStream.read() & 0xFF; + return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4; + } + + /** + * 字节数组转十六进制字符串（调试用） + */ + private String bytesToHex(byte[] bytes) { + StringBuilder sb = new StringBuilder(); + for (byte b : bytes) { + sb.append(String.format("%02X ", b)); + } + return sb.toString().trim(); + } + + /** + * 旧轨道类（兼容旧逻辑） + */ + /*public static class MidiTrack { + private List events = new ArrayList(); + private boolean isMuted = false; + private int currentIndex = 0; + + public void addEvent(byte[] event) { + events.add(event); + } + + public int getEventCount() { + return events.size(); + } + + public void setMute(boolean mute) { + isMuted = mute; + } + + public boolean hasNextEvent() { + return currentIndex < events.size(); + } + + public byte[] nextEvent() { + if (currentIndex < events.size()) { + return events.get(currentIndex++); + } + return null; + } + + public void reset() { + currentIndex = 0; + } + }*/ +} + diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiPlayer.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiPlayer.java new file mode 100644 index 0000000..f58c044 --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiPlayer.java @@ -0,0 +1,655 @@ +package cc.winboll.studio.midiplayer; + +/** + * @Author ZhanGSKen + * @Date 2025/06/29 10:13 + * @Describe MidiPlayer + */ +import android.content.Context; +import android.media.midi.MidiDevice; +import android.media.midi.MidiDeviceInfo; +import android.media.midi.MidiInputPort; +import android.media.midi.MidiManager; +import android.os.Build; +import android.os.Handler; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import cc.winboll.studio.libappbase.LogUtils; + +/** + * MIDI播放器核心类，支持加载MIDI文件、连接合成器、控制播放轨道及事件解析 + * 需Android 6.0（API 23）及以上版本 + */ +public class MidiPlayer { + + public static final String TAG = "MidiPlayer"; + + // 上下文与系统服务 + private final Context mContext; + private MidiManager mMidiManager; + + // MIDI设备与端口 + private MidiDevice mMidiDevice; + private MidiInputPort mInputPort; + private boolean isSynthConnected = false; + + // 线程与Handler + private ExecutorService mExecutor; + private final Handler mHandler = new Handler(); + + // 播放数据与状态 + private MidiTrack[] mTracks; + private boolean isPlaying = false; + private int mCurrentTrack = -1; // -1表示播放所有轨道 + private int mTicksPerBeat; // 每拍的ticks数（从MIDI文件解析） + private long startTime; // 播放开始时间（用于日志） + + // 音色库管理 + private final SoundFontManager mSoundFontManager; + + // 连接回调接口 + public interface OnSynthConnectedListener { + void onConnected(boolean success); + } + private OnSynthConnectedListener mConnectionListener; + + + /** + * MIDI事件类，存储事件数据及时间间隔 + */ + public static class MidiEvent { + public byte[] data; // 事件指令数据 + public int deltaTicks; // 与上一事件的时间间隔（ticks） + + public MidiEvent(byte[] data, int deltaTicks) { + this.data = data; + this.deltaTicks = deltaTicks; + } + } + + + /** + * MIDI轨道类，包含事件列表及播放状态 + */ + public static class MidiTrack { + private final List events; + private boolean isMuted = false; + private int currentIndex = 0; + + public MidiTrack(List events) { + this.events = events; + } + + public boolean hasNextEvent() { + return currentIndex < events.size(); + } + + public MidiEvent nextEvent() { + return currentIndex < events.size() ? events.get(currentIndex++) : null; + } + + public void reset() { + currentIndex = 0; + } + + public void setMute(boolean mute) { + isMuted = mute; + } + + public boolean isMuted() { + return isMuted; + } + } + + + /** + * MIDI解析结果类，包含轨道数组与每拍ticks数 + */ + public static class MidiParseResult { + public MidiTrack[] tracks; + public int ticksPerBeat; + + public MidiParseResult(MidiTrack[] tracks, int ticksPerBeat) { + this.tracks = tracks; + this.ticksPerBeat = ticksPerBeat; + } + } + + + // 构造方法 + public MidiPlayer(Context context) { + mContext = context; + mSoundFontManager = new SoundFontManager(context); + // 初始化MIDI服务（需API 23+） + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + mMidiManager = (MidiManager) context.getSystemService(Context.MIDI_SERVICE); + } + } + + + // 设置合成器连接回调 + public void setOnSynthConnectedListener(OnSynthConnectedListener listener) { + mConnectionListener = listener; + } + + + /** + * 加载MIDI文件并解析为轨道 + * @param file MIDI文件 + * @return 是否加载成功 + */ + public boolean loadMidiFile(File file) { + try { + MidiParser parser = new MidiParser(file); + MidiParseResult result = parser.parseWithTicks(); + mTracks = result.tracks; + mTicksPerBeat = result.ticksPerBeat; + return mTracks != null && mTracks.length > 0; + } catch (IOException e) { + LogUtils.d(TAG, "加载MIDI文件失败: " + e.getMessage()); + return false; + } + } + + + /** + * 加载音色库文件 + * @param soundFontFile 音色库文件 + * @return 是否加载成功 + */ + public boolean loadSoundFont(File soundFontFile) { + return mSoundFontManager.loadSoundFont(soundFontFile); + } + + + /** + * 开始播放MIDI文件 + */ + public void start() { + LogUtils.d(TAG, "start()"); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + LogUtils.d(TAG, "需Android 6.0及以上版本"); + notifyConnectionResult(false); + return; + } + if (isPlaying || mTracks == null || mMidiManager == null) { + return; + } + + isPlaying = true; + getExecutor().execute(new Runnable() { + @Override + public void run() { + LogUtils.d(TAG, "开始连接合成器"); + isSynthConnected = false; + connectToSynth(); + + // 等待合成器连接（最多3秒） + int waitCount = 0; + while (!isSynthConnected && waitCount < 30) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + break; + } + waitCount++; + } + + if (!isSynthConnected || mInputPort == null) { + LogUtils.d(TAG, "合成器连接失败"); + isPlaying = false; + notifyConnectionResult(false); + return; + } + + notifyConnectionResult(true); + playTracksWithSpeedControl(); + } + }); + } + + + /** + * 带速度控制的轨道播放逻辑 + */ + private void playTracksWithSpeedControl() { + LogUtils.d(TAG, "开始播放，每拍ticks数: " + mTicksPerBeat); + if (mInputPort == null || mTracks == null || mTicksPerBeat <= 0) { + return; + } + + startTime = System.currentTimeMillis(); + int trackCount = mTracks.length; + long[] trackNextEventTime = new long[trackCount]; // 各轨道下一事件的播放时间（ms） + + // 初始化轨道状态 + for (int i = 0; i < trackCount; i++) { + mTracks[i].reset(); + trackNextEventTime[i] = 0; + } + + // 默认BPM（可通过MIDI文件中的tempo事件动态调整） + int bpm = 120; + double msPerTick = (60.0 / bpm) * 1000 / mTicksPerBeat; + + // 循环播放事件 + while (isPlaying) { + // 找到最早需要播放的事件时间 + long earliestTime = Long.MAX_VALUE; + for (int i = 0; i < trackCount; i++) { + if ((mCurrentTrack == -1 || mCurrentTrack == i) + && !mTracks[i].isMuted() + && mTracks[i].hasNextEvent()) { + earliestTime = Math.min(earliestTime, trackNextEventTime[i]); + } + } + + if (earliestTime == Long.MAX_VALUE) { + LogUtils.d(TAG, "所有轨道事件播放完毕"); + break; + } + + // 计算等待时间并休眠 + long currentTime = System.currentTimeMillis() - startTime; + long delay = earliestTime - currentTime; + if (delay > 0) { + try { + Thread.sleep(delay); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + break; + } + } + + // 播放所有到达时间点的事件 + for (int i = 0; i < trackCount; i++) { + if ((mCurrentTrack == -1 || mCurrentTrack == i) + && !mTracks[i].isMuted() + && mTracks[i].hasNextEvent() + && trackNextEventTime[i] == earliestTime) { + + MidiEvent event = mTracks[i].nextEvent(); + if (event != null) { + try { + logMidiEventDetails(i, event); + mInputPort.send(event.data, 0, event.data.length); + // 更新下一事件时间 + trackNextEventTime[i] = earliestTime + (long) (event.deltaTicks * msPerTick); + } catch (IOException e) { + LogUtils.d(TAG, "发送事件失败: " + e.getMessage()); + } + } + } + } + } + + isPlaying = false; + LogUtils.d(TAG, "播放结束"); + } + + + /** + * 解析MIDI事件并输出详细日志 + */ + private void logMidiEventDetails(int trackIndex, MidiEvent event) { + // 无效事件增加原始数据日志，便于调试 + if (event.data == null || event.data.length < 2) { + String dataStr = (event.data != null) ? Arrays.toString(event.data) : "null"; + LogUtils.d(TAG, "轨道[" + trackIndex + "] 无效事件: 数据长度不足 (" + + (event.data != null ? event.data.length : 0) + "字节)，原始数据: " + dataStr); + return; + } + + int statusByte = event.data[0] & 0xFF; + int eventType = statusByte & 0xF0; + int channel = (statusByte & 0x0F) + 1; // 通道号1-16 + + StringBuilder log = new StringBuilder(); + log.append("轨道[").append(trackIndex).append("] 事件类型: "); + + switch (eventType) { + case 0x90: // 音符开启 + if (event.data.length >= 3) { + int pitch = event.data[1] & 0xFF; + int velocity = event.data[2] & 0xFF; + log.append("音符开启 | 通道: ").append(channel) + .append(" | 音高: ").append(pitch).append(" (").append(getNoteName(pitch)).append(")") + .append(" | 力度: ").append(velocity) + .append(" | 间隔ticks: ").append(event.deltaTicks) + .append(" | 播放时间: ").append(System.currentTimeMillis() - startTime).append("ms"); + } else { + log.append("音符开启 (数据不完整) | 长度: ").append(event.data.length); + } + break; + + case 0x80: // 音符关闭 + if (event.data.length >= 3) { + int pitch = event.data[1] & 0xFF; + int velocity = event.data[2] & 0xFF; + log.append("音符关闭 | 通道: ").append(channel) + .append(" | 音高: ").append(pitch).append(" (").append(getNoteName(pitch)).append(")") + .append(" | 力度: ").append(velocity) + .append(" | 间隔ticks: ").append(event.deltaTicks) + .append(" | 播放时间: ").append(System.currentTimeMillis() - startTime).append("ms"); + } else { + log.append("音符关闭 (数据不完整) | 长度: ").append(event.data.length); + } + break; + + case 0xB0: // 控制变化 + if (event.data.length >= 3) { + int controlNumber = event.data[1] & 0xFF; + int controlValue = event.data[2] & 0xFF; + log.append("控制变化 | 通道: ").append(channel) + .append(" | 控制器: ").append(controlNumber).append(" (").append(getControlName(controlNumber)).append(")") + .append(" | 数值: ").append(controlValue); + } else { + log.append("控制变化 (数据不完整) | 长度: ").append(event.data.length); + } + break; + + case 0xC0: // 程序改变（乐器切换） + if (event.data.length >= 2) { + int program = event.data[1] & 0xFF; + // 增加乐器编号有效性校验日志 + String instrumentName = getInstrumentName(program); + if (program < 0 || program >= 128) { + instrumentName += " (超出GM标准范围0-127)"; + } + log.append("程序改变 | 通道: ").append(channel) + .append(" | 乐器编号: ").append(program).append(" (").append(instrumentName).append(")"); + } else { + log.append("程序改变 (数据不完整) | 长度: ").append(event.data.length); + } + break; + + case 0xD0: // 通道触后事件 + log.append("通道触后 | 通道: ").append(channel) + .append(" | 压力值: ").append(event.data[1] & 0xFF); + break; + + case 0xF0: // 系统专属事件(SysEx) + log.append("系统专属事件(SysEx) | 长度: ").append(event.data.length) + .append(" | 首字节: 0x").append(Integer.toHexString(event.data[0] & 0xFF)); + break; + + default: + log.append("未知类型 (0x").append(Integer.toHexString(eventType)).append(") | 通道: ").append(channel) + .append("，原始数据: ").append(Arrays.toString(event.data)); + break; + } + + LogUtils.d(TAG, log.toString()); + } + + + /** + * 音高转音符名称（如60→C4） + */ + private String getNoteName(int pitch) { + if (pitch < 0 || pitch > 127) return "无效音高"; + String[] noteNames = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"}; + int octave = (pitch / 12) - 1; // C4对应60 + return noteNames[pitch % 12] + octave; + } + + + /** + * MIDI控制器编号转名称 + */ + private String getControlName(int controlNumber) { + switch (controlNumber) { + case 0: return "Bank Select (MSB)"; + case 1: return "Modulation Wheel"; + case 7: return "音量控制"; + case 10: return "声像控制"; + case 11: return "表达控制"; + case 64: return "延音踏板"; + case 121: return "重置所有控制器"; + default: return "未知控制器"; + } + } + + + /** + * 乐器编号转名称（GM标准） + */ + private String getInstrumentName(int program) { + String[] instruments = { + "钢琴", "明亮钢琴", "电钢琴", "Honky-tonk钢琴", "电钢琴", "羽管键琴", + "击弦古钢琴", "颤音琴", "竖琴", "管风琴", "手风琴", "acoustic贝斯", + "电贝斯(指弹)", "电贝斯(拨片)", "小提琴", "大提琴" + }; + if (program < 0 || program >= 128) { + return "无效编号"; + } + if (program < instruments.length) { + return instruments[program]; + } else { + return "乐器 " + program; + } + } + + + /** + * 连接MIDI合成器 + */ + public void connectToSynth() { + if (mMidiManager == null) return; + closeMidiResources(); + searchSynthInDevices(); + } + + /** + * 搜索并选择可用的MIDI设备 + */ + private void searchSynthInDevices() { + MidiDeviceInfo[] devices = mMidiManager.getDevices(); + if (devices == null || devices.length == 0) { + LogUtils.d(TAG, "未检测到MIDI设备"); + isSynthConnected = false; + return; + } + + // 优先选择合成器类型（3），其次选择有输入端口的设备 + MidiDeviceInfo targetDevice = null; + for (MidiDeviceInfo device : devices) { + if (device.getType() == 3) { + targetDevice = device; + break; + } + if (targetDevice == null && device.getInputPortCount() > 0) { + targetDevice = device; + } + } + + if (targetDevice != null) { + LogUtils.d(TAG, "尝试打开设备: 设备ID=" + targetDevice.getId() + "，名称=" + targetDevice.getProperties().getString(MidiDeviceInfo.PROPERTY_NAME)); + mMidiManager.openDevice(targetDevice, new MidiManager.OnDeviceOpenedListener() { + @Override + public void onDeviceOpened(MidiDevice device) { + setupMidiDevice(device); + } + }, mHandler); + } else { + LogUtils.d(TAG, "未找到可用设备（无合成器或带输入端口的设备）"); + isSynthConnected = false; + } + } + + + /** + * 初始化MIDI设备并打开输入端口 + */ + private void setupMidiDevice(MidiDevice device) { + if (device == null) { + LogUtils.d(TAG, "打开MIDI设备失败: 设备为null"); + isSynthConnected = false; + return; + } + + mMidiDevice = device; + try { + // 从设备信息中获取输入端口数量 + MidiDeviceInfo deviceInfo = device.getInfo(); + if (deviceInfo.getInputPortCount() > 0) { + mInputPort = device.openInputPort(0); + isSynthConnected = (mInputPort != null); + LogUtils.d(TAG, isSynthConnected ? "成功打开输入端口（端口0）" : "输入端口为null，打开失败"); + } else { + LogUtils.d(TAG, "设备无输入端口，无法接收MIDI事件"); + isSynthConnected = false; + } + } catch (Exception e) { + LogUtils.d(TAG, "打开端口失败: " + e.getMessage()); + isSynthConnected = false; + } + } + + + /** + * 关闭MIDI设备及端口资源 + */ + private void closeMidiResources() { + if (mInputPort != null) { + try { + mInputPort.close(); + } catch (IOException e) { + LogUtils.d(TAG, "关闭输入端口失败: " + e.getMessage()); + } + mInputPort = null; + } + if (mMidiDevice != null) { + try { + mMidiDevice.close(); + } catch (IOException e) { + LogUtils.d(TAG, "关闭MIDI设备失败: " + e.getMessage()); + } + mMidiDevice = null; + } + } + + + /** + * 通知合成器连接结果 + */ + private void notifyConnectionResult(final boolean success) { + if (mConnectionListener != null) { + mHandler.post(new Runnable() { + @Override + public void run() { + mConnectionListener.onConnected(success); + } + }); + } + } + + + /** + * 设置指定轨道静音状态 + * @param trackIndex 轨道索引 + * @param mute 是否静音 + */ + public void setTrackMute(int trackIndex, boolean mute) { + if (mTracks == null) { + LogUtils.d(TAG, "设置静音失败：未加载MIDI轨道"); + return; + } + if (trackIndex >= 0 && trackIndex < mTracks.length) { + mTracks[trackIndex].setMute(mute); + LogUtils.d(TAG, "轨道[" + trackIndex + "] 静音状态: " + (mute ? "已静音" : "正常播放")); + } else { + LogUtils.d(TAG, "设置静音失败：无效轨道索引 " + trackIndex + "（总轨道数：" + mTracks.length + "）"); + } + } + + + /** + * 切换当前播放轨道（-1表示所有轨道） + * @param trackIndex 轨道索引 + */ + public void setCurrentTrack(int trackIndex) { + if (mTracks == null) { + LogUtils.d(TAG, "切换轨道失败：未加载MIDI轨道"); + return; + } + // 校验轨道索引有效性 + if (trackIndex == -1 || (trackIndex >= 0 && trackIndex < mTracks.length)) { + mCurrentTrack = trackIndex; + LogUtils.d(TAG, "切换当前播放轨道: " + (trackIndex == -1 ? "所有轨道" : "轨道[" + trackIndex + "]")); + } else { + LogUtils.d(TAG, "切换轨道失败：无效轨道索引 " + trackIndex + "（总轨道数：" + mTracks.length + "）"); + } + } + + + /** + * 获取轨道总数 + * @return 轨道数量 + */ + public int getTrackCount() { + return mTracks != null ? mTracks.length : 0; + } + + + /** + * 暂停播放 + */ + public void pause() { + boolean wasPlaying = isPlaying; + isPlaying = false; + LogUtils.d(TAG, "播放暂停: " + (wasPlaying ? "已暂停当前播放" : "当前未在播放")); + } + + + /** + * 停止播放并释放所有资源 + */ + public void stop() { + boolean wasPlaying = isPlaying; + isPlaying = false; + isSynthConnected = false; + closeMidiResources(); + if (mExecutor != null) { + mExecutor.shutdownNow(); + mExecutor = null; + } + LogUtils.d(TAG, "播放停止: " + (wasPlaying ? "已终止播放并释放资源" : "当前未在播放")); + } + + + /** + * 获取线程池（单例） + */ + private ExecutorService getExecutor() { + if (mExecutor == null || mExecutor.isShutdown() || mExecutor.isTerminated()) { + mExecutor = Executors.newSingleThreadExecutor(); + } + return mExecutor; + } + + + /** + * 检查合成器是否已连接 + * @return 连接状态 + */ + public boolean isSynthConnected() { + return isSynthConnected; + } + + + /** + * 获取当前MIDI输入端口 + * @return 输入端口 + */ + public MidiInputPort getInputPort() { + return mInputPort; + } +} diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiPlayerActivity.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiPlayerActivity.java new file mode 100644 index 0000000..e206ac6 --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiPlayerActivity.java @@ -0,0 +1,437 @@ +package cc.winboll.studio.midiplayer; + +/** + * @Author ZhanGSKen&豆包大模型 + * @Date 2025/06/29 10:10 + * @Describe Midi 播放窗口 + */ +import android.app.Activity; +import android.content.Context; +import android.media.midi.MidiInputPort; +import android.os.Build; +import android.os.Bundle; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.ListView; +import android.widget.SeekBar; +import android.widget.TextView; +import cc.winboll.studio.libappbase.LogUtils; +import com.hjq.toast.ToastUtils; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public class MidiPlayerActivity extends WinBoLLActivity { + + public static final String TAG = "MidiPlayerActivity"; + + private MidiPlayer mMidiPlayer; + private Button mPlayBtn, mPauseBtn, mStopBtn, mTestBtn; + private ListView mTrackListView; + private ListView mFileListView; + private TrackAdapter mTrackAdapter; + private TextView mFileNameTv; + private List mMidiFileList = new ArrayList<>(); + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_midi_player); + + // 初始化控件 + mPlayBtn = (Button) findViewById(R.id.btn_play); + mPauseBtn = (Button) findViewById(R.id.btn_pause); + mStopBtn = (Button) findViewById(R.id.btn_stop); + mTestBtn = (Button) findViewById(R.id.btn_test); + mTrackListView = (ListView) findViewById(R.id.lv_tracks); + mFileListView = (ListView) findViewById(R.id.lv_midi_files); + mFileNameTv = (TextView) findViewById(R.id.tv_file_name); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + initMidiPlayer(); + loadMidiFileList(); + initControlButtons(); + initTestButton(); + } else { + mFileNameTv.setText("当前设备不支持MIDI播放（需Android 6.0及以上）"); + disableButtons(); + } + + copyAssetsMidiFiles(); + } + + // 初始化测试按钮及1分钟测试逻辑 + private void initTestButton() { + mTestBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + testMidiOutput(); + } + }); + } + + /** + * 1分钟MIDI测试序列：包含多样音符组合，验证输出功能 + */ + private void testMidiOutput() { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + ToastUtils.show("测试需要Android 6.0及以上"); + return; + } + + if (mMidiPlayer == null) { + initMidiPlayer(); + } + + new Thread(new Runnable() { + @Override + public void run() { + // 确保合成器连接 + if (!mMidiPlayer.isSynthConnected()) { + LogUtils.d(TAG, "测试：连接合成器中..."); + mMidiPlayer.connectToSynth(); + + // 最多等待3秒连接 + int waitCount = 0; + while (!mMidiPlayer.isSynthConnected() && waitCount < 30) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + waitCount++; + } + } + + final MidiInputPort inputPort = mMidiPlayer.getInputPort(); + if (inputPort == null) { + LogUtils.d(TAG, "测试失败：无可用输入端口"); + runOnUiThread(new Runnable() { + @Override + public void run() { + ToastUtils.show("测试失败：未找到输入端口"); + } + }); + return; + } + + try { + runOnUiThread(new Runnable() { + @Override + public void run() { + ToastUtils.show("开始1分钟测试音符..."); + } + }); + + // 测试序列定义：[音高, 力度, 时长(毫秒)] + int[][] noteSequence = { + // 0-10秒：低音区短音符 + {48, 64, 200}, {50, 64, 200}, {52, 64, 200}, {53, 64, 200}, + {55, 64, 200}, {57, 64, 200}, {59, 64, 200}, {60, 64, 400}, + + // 10-20秒：中音区连音 + {60, 72, 300}, {62, 72, 300}, {64, 72, 300}, {65, 72, 300}, + {67, 72, 300}, {69, 72, 300}, {71, 72, 300}, {72, 72, 600}, + + // 20-30秒：高音区跳音 + {72, 80, 150}, {76, 80, 150}, {79, 80, 150}, {84, 80, 300}, + {79, 80, 150}, {76, 80, 150}, {72, 80, 150}, {69, 80, 450}, + + // 30-40秒：和弦组合 + {60, 64, 400}, {64, 64, 400}, {67, 64, 400}, // C和弦 + {62, 64, 400}, {65, 64, 400}, {69, 64, 400}, // Dm和弦 + {64, 64, 400}, {67, 64, 400}, {71, 64, 400}, // Em和弦 + + // 40-50秒：渐强长音 + {55, 40, 1000}, {55, 60, 1000}, {55, 80, 1000}, {55, 100, 1000}, + + // 50-60秒：快速音阶 + {50, 70, 100}, {52, 70, 100}, {53, 70, 100}, {55, 70, 100}, + {57, 70, 100}, {59, 70, 100}, {60, 70, 100}, {62, 70, 100}, + {64, 70, 100}, {65, 70, 100}, {67, 70, 100}, {69, 70, 100}, + {71, 70, 100}, {72, 90, 500} + }; + + // 发送测试序列 + for (int[] note : noteSequence) { + if (!mMidiPlayer.isSynthConnected()) { + LogUtils.d(TAG, "连接已断开，停止测试"); + break; + } + + int pitch = note[0]; + int velocity = note[1]; + int duration = note[2]; + + // 发送音符开启事件 + byte[] noteOn = new byte[]{(byte) 0x90, (byte) pitch, (byte) velocity}; + inputPort.send(noteOn, 0, noteOn.length); + //LogUtils.d(TAG, "测试音符：音高=" + pitch + ", 力度=" + velocity + ", 时长=" + duration + "ms"); + + // 等待音符时长 + Thread.sleep(duration); + + // 发送音符关闭事件 + byte[] noteOff = new byte[]{(byte) 0x80, (byte) pitch, 0}; + inputPort.send(noteOff, 0, noteOff.length); + } + + runOnUiThread(new Runnable() { + @Override + public void run() { + ToastUtils.show("1分钟测试完成"); + } + }); + + } catch (final Exception e) { + LogUtils.d(TAG, "测试出错：" + e.getMessage()); + runOnUiThread(new Runnable() { + @Override + public void run() { + ToastUtils.show("测试出错：" + e.getMessage()); + } + }); + } + } + }).start(); + } + + // 拷贝Assets中的MIDI文件到本地 + private void copyAssetsMidiFiles() { + final AssetMidiCopier copier = new AssetMidiCopier(this); + new Thread(new Runnable() { + @Override + public void run() { + final boolean success = copier.copyMidiFiles(); + runOnUiThread(new Runnable() { + @Override + public void run() { + if (success) { + File midiDir = copier.getMidiTargetDir(); + LogUtils.d(TAG, "MIDI文件拷贝成功，路径：" + midiDir.getAbsolutePath()); + // 重新加载文件列表 + loadMidiFileList(); + } else { + ToastUtils.show("MIDI文件拷贝失败"); + } + } + }); + } + }).start(); + } + + // 初始化MIDI播放器 + private void initMidiPlayer() { + mMidiPlayer = new MidiPlayer(this); + mMidiPlayer.setOnSynthConnectedListener(new MidiPlayer.OnSynthConnectedListener() { + @Override + public void onConnected(final boolean success) { + runOnUiThread(new Runnable() { + @Override + public void run() { + if (success) { + ToastUtils.show("MIDI合成器连接成功"); + } else { + ToastUtils.show("未找到MIDI合成器，请安装第三方合成器应用"); + } + } + }); + } + }); + } + + // 加载本地MIDI文件列表 + private void loadMidiFileList() { + File midiDir = new File(getFilesDir(), "midi"); + if (!midiDir.exists()) { + midiDir.mkdirs(); + mFileNameTv.setText("midi目录已创建，等待文件拷贝..."); + return; + } + + mMidiFileList.clear(); + File[] files = midiDir.listFiles(); + if (files != null) { + for (File file : files) { + String name = file.getName().toLowerCase(); + if (name.endsWith(".mid") || name.endsWith(".midi")) { + mMidiFileList.add(file); + } + } + } + + if (mMidiFileList.isEmpty()) { + mFileNameTv.setText("midi目录中无可用文件"); + } else { + showFileList(); + mFileNameTv.setText("找到" + mMidiFileList.size() + "个MIDI文件"); + } + } + + // 显示MIDI文件列表 + private void showFileList() { + List fileNameList = new ArrayList<>(); + for (File file : mMidiFileList) { + fileNameList.add(file.getName()); + } + + ArrayAdapter adapter = new ArrayAdapter( + this, + android.R.layout.simple_list_item_1, + fileNameList + ); + mFileListView.setAdapter(adapter); + + mFileListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + mMidiPlayer.stop(); + File selectedFile = mMidiFileList.get(position); + boolean loaded = mMidiPlayer.loadMidiFile(selectedFile); + if (loaded) { + mFileNameTv.setText("当前文件：" + selectedFile.getName()); + initTrackList(); + ToastUtils.show("已加载：" + selectedFile.getName()); + } else { + mFileNameTv.setText("文件加载失败：" + selectedFile.getName()); + } + } + }); + } + + // 初始化轨道列表 + private void initTrackList() { + mTrackAdapter = new TrackAdapter(this, mMidiPlayer); + mTrackListView.setAdapter(mTrackAdapter); + } + + // 初始化播放控制按钮 + private void initControlButtons() { + mPlayBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mMidiPlayer != null) { + mMidiPlayer.start(); + } + } + }); + + mPauseBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mMidiPlayer != null) { + mMidiPlayer.pause(); + } + } + }); + + mStopBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mMidiPlayer != null) { + mMidiPlayer.stop(); + } + } + }); + } + + // 禁用所有按钮（低版本设备） + private void disableButtons() { + mPlayBtn.setEnabled(false); + mPauseBtn.setEnabled(false); + mStopBtn.setEnabled(false); + mTestBtn.setEnabled(false); + } + + // 轨道列表适配器 + private class TrackAdapter extends android.widget.BaseAdapter { + private Context mContext; + private MidiPlayer mPlayer; + + public TrackAdapter(Context context, MidiPlayer player) { + mContext = context; + mPlayer = player; + } + + @Override + public int getCount() { + return mPlayer != null ? mPlayer.getTrackCount() : 0; + } + + @Override + public Object getItem(int position) { + return null; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(final int position, View convertView, ViewGroup parent) { + View view = getLayoutInflater().inflate(R.layout.item_track, parent, false); + TextView trackNameTv = (TextView) view.findViewById(R.id.tv_track_name); + final Button muteBtn = (Button) view.findViewById(R.id.btn_mute); + SeekBar volumeSb = (SeekBar) view.findViewById(R.id.sb_volume); + + trackNameTv.setText("轨道 " + (position + 1)); + muteBtn.setText("静音"); + + // 静音按钮逻辑 + muteBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + boolean isMuted = muteBtn.isSelected(); + mPlayer.setTrackMute(position, !isMuted); + muteBtn.setSelected(!isMuted); + muteBtn.setText(isMuted ? "静音" : "已静音"); + } + }); + + // 音量条（预留逻辑） + volumeSb.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + // 可添加音量控制逻辑（如发送MIDI音量事件） + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) {} + + @Override + public void onStopTrackingTouch(SeekBar seekBar) {} + }); + + return view; + } + } + + // 日志查看按钮点击事件 + public void onLog(View view) { + App.getWinBoLLActivityManager().startLogActivity(this); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (mMidiPlayer != null) { + mMidiPlayer.stop(); + } + } +} + diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiTrack.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiTrack.java new file mode 100644 index 0000000..307ffcb --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/MidiTrack.java @@ -0,0 +1,78 @@ +package cc.winboll.studio.midiplayer; + +/** + * @Author ZhanGSKen + * @Date 2025/06/29 10:24 + * @Describe Midi轨道类，用于存储和管理单条Midi轨道的事件 + */ +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public class MidiTrack { + public static final String TAG = "MidiTrack"; + + // 轨道事件列表（存储Midi事件字节数组） + private List mEvents = new ArrayList<>(); + // 事件迭代器（用于播放时遍历事件） + private Iterator mEventIterator; + // 轨道是否静音 + private boolean isMuted = false; + + public MidiTrack() { + } + + /** + * 添加Midi事件到轨道 + */ + public void addEvent(byte[] event) { + mEvents.add(event); + } + + /** + * 重置轨道播放状态（回到起始位置） + */ + public void reset() { + mEventIterator = mEvents.iterator(); + } + + /** + * 判断是否有下一个事件 + */ + public boolean hasNextEvent() { + // 如果静音，返回false不播放事件 + if (isMuted) { + return false; + } + // 初始化迭代器（首次使用或重置后） + if (mEventIterator == null) { + reset(); + } + return mEventIterator.hasNext(); + } + + /** + * 获取下一个Midi事件 + */ + public byte[] nextEvent() { + if (mEventIterator == null) { + reset(); + } + return mEventIterator.next(); + } + + /** + * 设置轨道静音状态 + */ + public void setMute(boolean mute) { + isMuted = mute; + } + + /** + * 获取轨道事件数量 + */ + public int getEventCount() { + return mEvents.size(); + } +} + diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/SoundFontManager.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/SoundFontManager.java new file mode 100644 index 0000000..7ce4bde --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/SoundFontManager.java @@ -0,0 +1,59 @@ +package cc.winboll.studio.midiplayer; + +/** + * @Author ZhanGSKen + * @Date 2025/06/29 10:12 + * @Describe SoundFontManager + */ +import android.content.Context; +import android.util.Log; +import cc.winboll.studio.libappbase.LogUtils; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; + +// 简化版：实际需使用SoundFont解析库（如Audiokit、FluidSynth） +public class SoundFontManager { + + public static final String TAG = "SoundFontManager"; + + private Context mContext; + private File mSoundFontFile; + + public SoundFontManager(Context context) { + mContext = context; + } + + // 加载SoundFont文件（.sf2格式） + public boolean loadSoundFont(File file) { + if (!file.exists() || !file.getName().endsWith(".sf2")) { + LogUtils.d(TAG, "无效的SoundFont文件"); + return false; + } + // 复制到应用私有目录（可选） + try { + File dest = new File(mContext.getFilesDir(), "custom_soundfont.sf2"); + FileInputStream fis = new FileInputStream(file); + FileOutputStream fos = new FileOutputStream(dest); + byte[] buffer = new byte[1024]; + int len; + while ((len = fis.read(buffer)) != -1) { + fos.write(buffer, 0, len); + } + fis.close(); + fos.close(); + mSoundFontFile = dest; + return true; + } catch (IOException e) { + LogUtils.d(TAG, "复制SoundFont失败: " + e.getMessage()); + return false; + } + } + + // 获取加载的SoundFont路径（供合成器使用） + public String getSoundFontPath() { + return mSoundFontFile != null ? mSoundFontFile.getAbsolutePath() : null; + } +} + diff --git a/midiplayer/src/main/java/cc/winboll/studio/midiplayer/WinBoLLActivity.java b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/WinBoLLActivity.java new file mode 100644 index 0000000..09983cd --- /dev/null +++ b/midiplayer/src/main/java/cc/winboll/studio/midiplayer/WinBoLLActivity.java @@ -0,0 +1,60 @@ +package cc.winboll.studio.midiplayer; + +/** + * @Author ZhanGSKen + * @Date 2025/06/29 10:40 + * @Describe WinBoLLActivity + */ +import android.app.Activity; +import android.os.Bundle; +import android.view.MenuItem; +import androidx.appcompat.app.AppCompatActivity; +import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; + +public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity { + + public static final String TAG = "WinBoLLActivity"; + + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onResume() { + super.onResume(); + LogUtils.d(TAG, String.format("onResume %s", getTag())); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + /*if (item.getItemId() == R.id.item_log) { + GlobalApplication.getWinBoLLActivityManager().startLogActivity(this); + return true; + } else if (item.getItemId() == R.id.item_home) { + GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class); + return true; + }*/ + // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 + return super.onOptionsItemSelected(item); + } + + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + GlobalApplication.getWinBoLLActivityManager().add(this); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + GlobalApplication.getWinBoLLActivityManager().registeRemove(this); + } +} diff --git a/midiplayer/src/main/res/drawable-v24/ic_launcher_foreground.xml b/midiplayer/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7bd21d --- /dev/null +++ b/midiplayer/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/midiplayer/src/main/res/drawable/ic_launcher_background.xml b/midiplayer/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/midiplayer/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/midiplayer/src/main/res/layout/activity_main.xml b/midiplayer/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..65a4964 --- /dev/null +++ b/midiplayer/src/main/res/layout/activity_main.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + +