<app>APK 15.0.2 release Publish.

README.md

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

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 31 02:04:47 HKT 2025
-stageCount=4
+#Mon Mar 31 19:41:19 HKT 2025
+stageCount=5
 libraryProject=libaes
 baseVersion=15.2
-publishVersion=15.2.3
+publishVersion=15.2.4
 buildCount=0
-baseBetaVersion=15.2.4
+baseBetaVersion=15.2.5

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

@@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import android.view.MenuItem;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
@@ -47,4 +48,13 @@ public class WinBollActivity extends AppCompatActivity implements IWinBollActivi
         //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
         setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if(item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

androidxdemo/build.gradle

@@ -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.2.3'
+    api 'cc.winboll.studio:libaes:15.2.4'
     api 'cc.winboll.studio:libapputils:15.2.1'
     api 'cc.winboll.studio:libappbase:15.2.2'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 31 03:57:35 GMT 2025
+#Mon Mar 31 11:42:18 GMT 2025
 stageCount=0
 libraryProject=
 baseVersion=15.0
 publishVersion=15.0.0
-buildCount=12
+buildCount=13
 baseBetaVersion=15.0.1

app/build.gradle

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.app"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 24
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "1.8" 
+        versionName "15.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,14 +41,32 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }
 
 dependencies {
-	api project(':winboll-shared')
-    api fileTree(dir: 'libs', include: ['*.jar'])
+	api fileTree(dir: 'libs', include: ['*.jar'])
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+    // 吐司类库
+    api 'com.github.getActivity:ToastUtils:10.5'
+    // 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
+    api 'cc.winboll.studio:libaes:15.2.4'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

app/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Jan 05 07:55:24 HKT 2025
-stageCount=17
-libraryProject=winboll-shared
-baseVersion=1.8
-publishVersion=1.8.16
+#Fri Apr 11 12:12:12 HKT 2025
+stageCount=3
+libraryProject=
+baseVersion=15.0
+publishVersion=15.0.2
 buildCount=0
-baseBetaVersion=1.8.17
+baseBetaVersion=15.0.3

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

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

app/src/main/AndroidManifest.xml

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

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

@@ -0,0 +1,88 @@
+package cc.winboll.studio.app;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/24 23:52:29
+ * @Describe 应用介绍窗口
+ */
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.app.R;
+import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.winboll.AboutView;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+
+public class AboutActivity extends WinBollActivity implements IWinBollActivity {
+
+    public static final String TAG = "AboutActivity";
+
+    Context mContext;
+    Toolbar mToolbar;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = this;
+        setContentView(R.layout.activity_about);
+
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(TAG);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        AboutView aboutView = CreateAboutView();
+        // 在 Activity 的 onCreate 或其他生命周期方法中调用
+//        LinearLayout layout = new LinearLayout(this);
+//        layout.setOrientation(LinearLayout.VERTICAL);
+//        // 创建布局参数（宽度和高度）
+//        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+//            ViewGroup.LayoutParams.MATCH_PARENT,
+//            ViewGroup.LayoutParams.MATCH_PARENT
+//        );
+//        addContentView(aboutView, params);
+
+        LinearLayout layout = findViewById(R.id.aboutviewroot_ll);
+        // 创建布局参数（宽度和高度）
+        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        );
+        layout.addView(aboutView, params);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    public AboutView CreateAboutView() {
+        String szBranchName = "app";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName("APP");
+        appInfo.setAppIcon(cc.winboll.studio.libaes.R.drawable.ic_winboll);
+        appInfo.setAppDescription("WinBoll APP");
+        appInfo.setAppGitName("APP");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
+        appInfo.setAppAPKName("APP");
+        appInfo.setAppAPKFolderName("APP");
+        return new AboutView(mContext, appInfo);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,66 @@
+package cc.winboll.studio.app;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/01 12:55:32
+ * @Describe 应用窗口基类
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libaes.beans.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+
+public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
+
+    public static final String TAG = "WinBollActivity";
+
+    protected volatile AESThemeBean.ThemeType mThemeType;
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        mThemeType = getThemeType();
+        super.onCreate(savedInstanceState);
+        App.getWinBollActivityManager().add(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        App.getWinBollActivityManager().registeRemove(this);
+    }
+    
+    AESThemeBean.ThemeType getThemeType() {
+        /*SharedPreferences sharedPreferences = getSharedPreferences(
+         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
+         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
+         */
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+    void setThemeStyle() {
+        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

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

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

@@ -5,10 +5,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.appcompat.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/activitymainToolbar1"/>
+    <cc.winboll.studio.libaes.views.ASupportToolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		xmlns:app="http://schemas.android.com/apk/res-auto"

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

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
-
+    <item
+        android:id="@+id/item_log"
+        android:title="Log"/>
+    <item
+        android:id="@+id/item_about"
+        android:title="About"/>
 </menu>

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

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

libaes/build.gradle

@@ -51,6 +51,6 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    api 'cc.winboll.studio:libappbase:15.2.0'
-    api 'cc.winboll.studio:libapputils:15.2.0'
+    api 'cc.winboll.studio:libapputils:15.2.1'
+    api 'cc.winboll.studio:libappbase:15.2.2'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 31 02:04:35 HKT 2025
-stageCount=4
+#Mon Mar 31 19:41:08 HKT 2025
+stageCount=5
 libraryProject=libaes
 baseVersion=15.2
-publishVersion=15.2.3
+publishVersion=15.2.4
 buildCount=0
-baseBetaVersion=15.2.4
+baseBetaVersion=15.2.5

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

@@ -282,6 +282,7 @@ public class AboutView extends LinearLayout {
             //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(true);
+            GlobalApplication.saveDebugStatus();
 
             GlobalApplication.getWinBollActivityManager().finishAll();
             context.startActivity(intent);
@@ -293,6 +294,7 @@ public class AboutView extends LinearLayout {
         if (intent != null) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             GlobalApplication.setIsDebuging(false);
+            GlobalApplication.saveDebugStatus();
 
             GlobalApplication.getWinBollActivityManager().finishAll();
             context.startActivity(intent);

powerbell/build.gradle

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.powerbell"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 6
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "4.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,39 +41,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // 吐司提示库
+	api 'cc.winboll.studio:winboll-shared:1.8.0'
+    api 'io.github.medyo:android-about-page:2.0.0'
     api 'com.github.getActivity:ToastUtils:10.5'
-    // 应用介绍页类库
-    api 'io.github.medyo:android-about-page:2.0.0'
-    // SSH
-    api 'com.jcraft:jsch:0.1.55'
-    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
-    // 二维码类库
-    api 'com.google.zxing:core:3.4.1'
-    api 'com.journeyapps:zxing-android-embedded:3.6.0'
-    // 网络连接类库
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.1.0'
-    api 'com.google.android.material:material:1.4.0'
-    //api 'androidx.viewpager:viewpager:1.0.0'
-    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libaes:15.2.3'
-    api 'cc.winboll.studio:libapputils:15.2.1'
-    api 'cc.winboll.studio:libappbase:15.2.2'
-
-	/*api 'cc.winboll.studio:winboll-shared:1.8.0'
-    api 'io.github.medyo:android-about-page:2.0.0'
     api 'com.jcraft:jsch:0.1.55'
     api 'org.jsoup:jsoup:1.13.1'
     api 'com.squareup.okhttp3:okhttp:4.4.1'
@@ -89,5 +67,6 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     
     api 'cc.winboll.studio:libaes:7.6.0'
-    */
+    
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 31 15:06:43 HKT 2025
-stageCount=1
+#Thu Jan 02 11:13:45 HKT 2025
+stageCount=6
 libraryProject=
-baseVersion=15.2
-publishVersion=15.2.0
+baseVersion=4.0
+publishVersion=4.0.5
 buildCount=0
-baseBetaVersion=15.2.1
+baseBetaVersion=4.0.6

powerbell/src/beta/AndroidManifest.xml

@@ -6,18 +6,20 @@
         tools:replace="android:icon"
         android:icon="@drawable/ic_launcher_beta">
 
+        <!-- Put flavor specific code here -->
         <provider
+            tools:replace="android:authorities"
             android:name="androidx.core.content.FileProvider"
             android:authorities="cc.winboll.studio.powerbell.beta.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 
             <meta-data
+                tools:replace="android:resource"
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider"/>
 
         </provider>
-
     </application>
 
 </manifest>

powerbell/src/main/AndroidManifest.xml

@@ -2,9 +2,10 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.powerbell">
-
-    <!-- 拍摄照片和视频 -->
-    <uses-permission android:name="android.permission.CAMERA"/>
+    
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <!-- 运行前台服务 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -21,15 +22,8 @@
     <!-- MANAGE_EXTERNAL_STORAGE -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 
-    <!-- 显示通知 -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-
-    <uses-feature android:name="android.hardware.camera"/>
-
-    <uses-feature android:name="android.hardware.camera.autofocus"/>
-
     <application
-        android:name=".App"
+        android:name=".GlobalApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -40,8 +34,7 @@
 
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTask"
-            android:exported="true">
+            android:launchMode="singleTask">
 
             <intent-filter>
 
@@ -117,8 +110,6 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
-        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReporterActivity"/>
-
         <activity android:name="cc.winboll.studio.powerbell.activities.AboutActivity"/>
 
     </application>

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

@@ -2,13 +2,14 @@ package cc.winboll.studio.powerbell;
 
 import android.content.Context;
 import android.view.Gravity;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
+import cc.winboll.studio.shared.app.WinBollApplication;
 import com.hjq.toast.ToastUtils;
+import com.hjq.toast.style.WhiteToastStyle;
 
-public class App extends GlobalApplication {
+public class GlobalApplication extends WinBollApplication {
 
     public static final String TAG = "GlobalApplication";
 
@@ -25,7 +26,7 @@ public class App extends GlobalApplication {
         ToastUtils.init(this);
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.toast_custom_view);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
 
         // 设置数据配置存储工具

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

@@ -12,14 +12,14 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.activities.AboutActivity;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
-import cc.winboll.studio.powerbell.activities.BatteryReporterActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
+import cc.winboll.studio.powerbell.utils.NotificationUtils;
+import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.shared.log.LogView;
 
 public class MainActivity extends Activity {
     public static final String TAG = "MainActivity";
@@ -28,7 +28,7 @@ public class MainActivity extends Activity {
     public static MainActivity _mMainActivity;
     LogView mLogView;
     //ArrayList<Fragment> mlistFragment;
-    App mApplication;
+    GlobalApplication mApplication;
     //AppConfigUtils mAppConfigUtils;
     Menu mMenu;
     Fragment mCurrentShowFragment;
@@ -48,13 +48,12 @@ public class MainActivity extends Activity {
         mLogView.updateLogView();
 
         _mMainActivity = MainActivity.this;
-        mApplication = (App) getApplication();
+        mApplication = (GlobalApplication) getApplication();
         //mAppConfigUtils = AppConfigUtils.getInstance(mApplication);
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
-        //mAToolbar.setSubtitle("Main");
         mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
 
         if (mMainViewFragment == null) {
@@ -65,10 +64,8 @@ public class MainActivity extends Activity {
         }
         showFragment(mMainViewFragment);
 
-//        NotificationHelper notificationUtils = new NotificationHelper(this);
-//        notificationUtils.createNotificationChannels();
-
-
+        NotificationUtils notificationUtils = new NotificationUtils(this);
+        notificationUtils.createNotificationChannel();
     }
 
     void showFragment(Fragment fragment) {
@@ -116,7 +113,7 @@ public class MainActivity extends Activity {
     protected void onResume() {
         super.onResume();
         // 回到窗口自动取消提醒消息
-        //NotificationHelper.cancelRemindNotification(this);
+        NotificationUtils.cancelRemindNotification(this);
 
         reloadBackground();
     }
@@ -143,11 +140,8 @@ public class MainActivity extends Activity {
         super.onOptionsItemSelected(item); 
         int menuItemId = item.getItemId();
         if (menuItemId == R.id.action_about) {
-            Intent intent = new Intent(this, AboutActivity.class);
-            startActivity(intent);
-        } else if (menuItemId == R.id.action_battery_reporter) {
             Intent intent = new Intent();
-            intent.setClass(this, BatteryReporterActivity.class);
+            intent.setClass(this, AboutActivity.class);
             startActivity(intent);
         } else if (menuItemId == R.id.action_clearrecord) {
             Intent intent = new Intent();

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java

@@ -1,65 +1,42 @@
 package cc.winboll.studio.powerbell.activities;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/25 01:16:32
- * @Describe 应用介绍窗口
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/07/12 13:33:59
+ * @Describe AboutActivity
  */
 import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
+import android.view.View;
 import cc.winboll.studio.libaes.views.AToolbar;
-import cc.winboll.studio.libaes.winboll.APPInfo;
-import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.powerbell.R;
 
 public class AboutActivity extends Activity {
 
-    Context mContext;
-
     public static final String TAG = "AboutActivity";
 
+    AToolbar mAToolbar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        mContext = this;
 
         // 初始化工具栏
-        AToolbar mAToolbar = (AToolbar) findViewById(R.id.toolbar);
+        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
+        setActionBar(mAToolbar);
+        //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture));
+        mAToolbar.setSubtitle(R.string.subtitle_activity_about);
+        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
+        //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
-        mAToolbar.setSubtitle(getString(R.string.text_about));
-        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
         getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        AboutView aboutView = CreateAboutView();
-        // 在 Activity 的 onCreate 或其他生命周期方法中调用
-        LinearLayout llRoot = findViewById(R.id.root_ll);
-        //layout.setOrientation(LinearLayout.VERTICAL);
-        // 创建布局参数（宽度和高度）
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        );
-        llRoot.addView(aboutView, params);
-
-    }
-
-    public AboutView CreateAboutView() {
-        String szBranchName = "powerbell";
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName(getString(R.string.app_name));
-        appInfo.setAppIcon(R.drawable.ic_launcher);
-        appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=PowerBell");
-        appInfo.setAppAPKName("PowerBell");
-        appInfo.setAppAPKFolderName("PowerBell");
-        return new AboutView(mContext, appInfo);
+        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish();
+                }
+            });
     }
 }

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundPictureActivity.java

@@ -13,8 +13,6 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -22,6 +20,8 @@ import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
 import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
+import cc.winboll.studio.shared.log.LogUtils;
+import com.hjq.toast.ToastUtils;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -84,8 +84,8 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
         setActionBar(mAToolbar);
         //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture));
         mAToolbar.setSubtitle(R.string.subtitle_activity_backgroundpicture);
-        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
+        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
         //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
         getActionBar().setDisplayHomeAsUpEnabled(true);

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BatteryReporterActivity.java

@@ -1,51 +0,0 @@
-package cc.winboll.studio.powerbell.activities;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/22 14:20:15
- */
-import android.app.Activity;
-import android.os.Bundle;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.adapters.BatteryAdapter;
-import cc.winboll.studio.powerbell.beans.BatteryData;
-import java.util.Arrays;
-import java.util.List;
-
-public class BatteryReporterActivity extends Activity {
-    public static final String TAG = "BatteryReporterActivity";
-
-    private RecyclerView rvBatteryReport;
-    private BatteryAdapter adapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_battery_reporter);
-
-        rvBatteryReport = findViewById(R.id.rvBatteryReport);
-        setupRecyclerView();
-        loadSampleData();
-    }
-
-    private void setupRecyclerView() {
-        adapter = new BatteryAdapter();
-        rvBatteryReport.setLayoutManager(new LinearLayoutManager(this));
-        rvBatteryReport.setAdapter(adapter);
-        rvBatteryReport.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
-    }
-
-    private void loadSampleData() {
-        List<BatteryData> dataList = Arrays.asList(
-            new BatteryData(95, "01:23:45", "00:05:12"),
-            new BatteryData(80, "02:15:30", "00:10:00"),
-            new BatteryData(65, "03:45:15", "00:15:30"),
-            new BatteryData(50, "05:00:00", "00:20:45")
-        );
-        adapter.updateData(dataList);
-    }
-}
-

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java

@@ -7,14 +7,14 @@ import android.view.View;
 import android.widget.TextView;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.libaes.views.AToolbar;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.GlobalApplication;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.beans.BatteryInfoBean;
 import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
+import cc.winboll.studio.shared.log.LogUtils;
+import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 
 public class ClearRecordActivity extends Activity {
@@ -23,21 +23,21 @@ public class ClearRecordActivity extends Activity {
 
     AToolbar mAToolbar;
     TextView mtvRecordText;
-    App mApplication;
+    GlobalApplication mApplication;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_clearrecord);
-        mApplication = (App) getApplication();
+        mApplication = (GlobalApplication) getApplication();
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
         //mAToolbar.setTitle(getTitle() + " - " + getString(R.string.subtitle_activity_clearrecord));
         mAToolbar.setSubtitle(R.string.subtitle_activity_clearrecord);
-        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
+        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
         //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
         getActionBar().setDisplayHomeAsUpEnabled(true);

powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java

@@ -1,61 +0,0 @@
-package cc.winboll.studio.powerbell.adapters;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/22 14:38:55
- * @Describe 电池报告数据适配器
- */
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.adapters.BatteryAdapter;
-import cc.winboll.studio.powerbell.beans.BatteryData;
-import java.util.ArrayList;
-import java.util.List;
-
-public class BatteryAdapter extends RecyclerView.Adapter<BatteryAdapter.ViewHolder> {
-    public static final String TAG = "BatteryAdapter";
-    private List<BatteryData> dataList = new ArrayList<>();
-
-    public void updateData(List<BatteryData> newData) {
-        dataList = newData;
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-            .inflate(R.layout.item_battery_report, parent, false);
-        return new ViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(ViewHolder holder, int position) {
-        BatteryData item = dataList.get(position);
-        holder.tvLevel.setText(String.format("%d%%", item.getCurrentLevel()));
-        holder.tvDischargeTime.setText("使用时间: " + item.getDischargeTime());
-        holder.tvChargeTime.setText("充电时间: " + item.getChargeTime());
-    }
-
-    @Override
-    public int getItemCount() {
-        return dataList.size();
-    }
-
-    static class ViewHolder extends RecyclerView.ViewHolder {
-        TextView tvLevel;
-        TextView tvDischargeTime;
-        TextView tvChargeTime;
-
-        ViewHolder(View itemView) {
-            super(itemView);
-            tvLevel = itemView.findViewById(R.id.tvLevel);
-            tvDischargeTime = itemView.findViewById(R.id.tvDischargeTime);
-            tvChargeTime = itemView.findViewById(R.id.tvChargeTime);
-        }
-    }
-}
-

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/AppConfigBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.shared.app.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;
 

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BackgroundPictureBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.shared.app.BaseBean;
 import java.io.IOException;
 
 public class BackgroundPictureBean extends BaseBean {

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryData.java

@@ -1,26 +0,0 @@
-package cc.winboll.studio.powerbell.beans;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/22 14:30:51
- * @Describe 电池报告数据模型
- */
-public class BatteryData {
-
-    public static final String TAG = "BatteryData";
-
-    private int currentLevel;
-    private String dischargeTime;
-    private String chargeTime;
-
-    public BatteryData(int currentLevel, String dischargeTime, String chargeTime) {
-        this.currentLevel = currentLevel;
-        this.dischargeTime = dischargeTime;
-        this.chargeTime = chargeTime;
-    }
-
-    public int getCurrentLevel() { return currentLevel; }
-    public String getDischargeTime() { return dischargeTime; }
-    public String getChargeTime() { return chargeTime; }
-}
-

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryInfoBean.java

@@ -2,7 +2,7 @@ package cc.winboll.studio.powerbell.beans;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.shared.app.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;
 

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/ControlCenterServiceBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.shared.app.BaseBean;
 import java.io.IOException;
 
 public class ControlCenterServiceBean extends BaseBean {

powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java

@@ -1,4 +1,5 @@
 package cc.winboll.studio.powerbell.dialogs;
+import cc.winboll.studio.powerbell.R;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@@ -9,13 +10,12 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.MainActivity;
-import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
 import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.io.File;
 import java.io.IOException;
 

powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java

@@ -17,8 +17,7 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.Switch;
 import android.widget.TextView;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.GlobalApplication;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -28,6 +27,7 @@ import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.views.BatteryDrawable;
 import cc.winboll.studio.powerbell.views.VerticalSeekBar;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.io.File;
 
 public class MainViewFragment extends Fragment {
@@ -78,7 +78,7 @@ public class MainViewFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mView = inflater.inflate(R.layout.fragment_mainview, container, false);
         _mMainViewFragment = MainViewFragment.this;
-        mAppConfigUtils = App.getAppConfigUtils(getActivity());
+        mAppConfigUtils = GlobalApplication.getAppConfigUtils(getActivity());
         
         // 获取指定ID的View实例
         final View mainImageView = mView.findViewById(R.id.fragmentmainviewImageView1);

powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java

@@ -4,11 +4,11 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.beans.AppConfigBean;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.BatteryUtils;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.lang.ref.WeakReference;
 
 public class ControlCenterServiceReceiver extends BroadcastReceiver {
@@ -52,13 +52,6 @@ public class ControlCenterServiceReceiver extends BroadcastReceiver {
                 appConfigBean.setCurrentValue(nTheQuantityOfElectricity);
                 appConfigBean.setIsCharging(isCharging);
                 mwrService.get().startRemindThread(appConfigBean);
-                
-                // 保存电池报告
-                // 示例数据更新逻辑
-//                List<BatteryData> newData = new ArrayList<>(adapter.getDataList());
-//                newData.add(0, new BatteryData(percentage, "00:00:00", "00:00:00"));
-//                adapter.updateData(newData);
-                
                 // 保存好新的电池状态标志
                 _mIsCharging = isCharging;
                 _mnTheQuantityOfElectricityOld = nTheQuantityOfElectricity;

powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/GlobalApplicationReceiver.java

@@ -4,18 +4,18 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.GlobalApplication;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.BatteryUtils;
-import cc.winboll.studio.powerbell.utils.NotificationHelper;
+import cc.winboll.studio.powerbell.utils.NotificationUtils;
 
 public class GlobalApplicationReceiver extends BroadcastReceiver {
 
     public static final String TAG = "GlobalApplicationReceiver";
 
     AppConfigUtils mAppConfigUtils;
-    App mGlobalApplication;
+    GlobalApplication mGlobalApplication;
     // 存储电量指示值，
     // 用于校验电量消息时的电量变化
     static volatile int _mnTheQuantityOfElectricityOld = -1;
@@ -24,10 +24,10 @@ public class GlobalApplicationReceiver extends BroadcastReceiver {
     // 便利封装 registerAction() 函数
     GlobalApplicationReceiver mReceiver;
 
-    public GlobalApplicationReceiver(App globalApplication) {
+    public GlobalApplicationReceiver(GlobalApplication globalApplication) {
         mReceiver = this;
         mGlobalApplication = globalApplication;
-        mAppConfigUtils = App.getAppConfigUtils(mGlobalApplication);
+        mAppConfigUtils = GlobalApplication.getAppConfigUtils(mGlobalApplication);
     }
 
     @Override
@@ -45,9 +45,9 @@ public class GlobalApplicationReceiver extends BroadcastReceiver {
             // 新电池状态标志某一个有变化就更新显示信息
             if (_mIsCharging != isCharging || _mnTheQuantityOfElectricityOld != nTheQuantityOfElectricity) {
                 // 电池状态改变先取消旧的提醒消息
-                //NotificationHelper.cancelRemindNotification(context);
+                NotificationUtils.cancelRemindNotification(context);
                 
-                App.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity);
+                GlobalApplication.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity);
                 MainViewFragment.sendMsgCurrentValueBattery(nTheQuantityOfElectricity);
                 // 保存好新的电池状态标志
                 _mIsCharging = isCharging;

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

@@ -9,10 +9,10 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.GlobalApplication;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
+import cc.winboll.studio.shared.log.LogUtils;
 
 public class MainReceiver extends BroadcastReceiver {
 
@@ -27,7 +27,7 @@ public class MainReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         String szAction = intent.getAction();
         if (szAction.equals(ACTION_BOOT_COMPLETED)) {
-            boolean isEnableService = App.getAppConfigUtils(context).getIsEnableService();
+            boolean isEnableService = GlobalApplication.getAppConfigUtils(context).getIsEnableService();
             if (isEnableService) {
                 if (ServiceUtils.isServiceAlive(context.getApplicationContext(), ControlCenterService.class.getName()) == false) {
                     LogUtils.d(TAG, "wakeupAndBindMain() Wakeup... ControlCenterService");

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

@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.GlobalApplication;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
@@ -29,7 +29,7 @@ public class AssistantService extends Service {
     public void onCreate() {
         //LogUtils.d(TAG, "onCreate");
         super.onCreate();
-        mAppConfigUtils = App.getAppConfigUtils(this);
+        mAppConfigUtils = GlobalApplication.getAppConfigUtils(this);
 
         //mMyBinder = new MyBinder();
         if (mMyServiceConnection == null) {

powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java

@@ -8,19 +8,14 @@ package cc.winboll.studio.powerbell.services;
  * Android Service之onStartCommand方法研究
  * https://blog.csdn.net/cyp331203/article/details/38920491
  */
-import android.app.Notification;
+import cc.winboll.studio.powerbell.R;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.widget.RemoteViews;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.powerbell.App;
-import cc.winboll.studio.powerbell.MainActivity;
-import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.GlobalApplication;
 import cc.winboll.studio.powerbell.beans.AppConfigBean;
 import cc.winboll.studio.powerbell.beans.NotificationMessage;
 import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler;
@@ -29,9 +24,11 @@ import cc.winboll.studio.powerbell.services.AssistantService;
 import cc.winboll.studio.powerbell.threads.RemindThread;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
-import cc.winboll.studio.powerbell.utils.NotificationHelper;
+import cc.winboll.studio.powerbell.utils.NotificationUtils;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
+import cc.winboll.studio.shared.log.LogUtils;
+import com.hjq.toast.ToastUtils;
 
 public class ControlCenterService extends Service {
 
@@ -46,8 +43,7 @@ public class ControlCenterService extends Service {
     AppConfigUtils mAppConfigUtils;
     AppCacheUtils mAppCacheUtils;
     // 前台服务通知工具
-    NotificationHelper mNotificationHelper;
-    Notification notification;
+    NotificationUtils mNotificationUtils;
     RemindThread mRemindThread;
     ControlCenterServiceHandler mControlCenterServiceHandler;
     MyServiceConnection mMyServiceConnection;
@@ -68,11 +64,9 @@ public class ControlCenterService extends Service {
         super.onCreate();
         _mControlCenterService = ControlCenterService.this;
         isServiceRunning = false;
-        mAppConfigUtils = App.getAppConfigUtils(this);
-        mAppCacheUtils = App.getAppCacheUtils(this);
-        mNotificationHelper = new NotificationHelper(ControlCenterService.this);
-        
-        
+        mAppConfigUtils = GlobalApplication.getAppConfigUtils(this);
+        mAppCacheUtils = GlobalApplication.getAppCacheUtils(this);
+        mNotificationUtils = new NotificationUtils(ControlCenterService.this);
         if (mMyServiceConnection == null) {
             mMyServiceConnection = new MyServiceConnection();
         }
@@ -98,16 +92,10 @@ public class ControlCenterService extends Service {
             // 唤醒守护进程
             wakeupAndBindAssistant();
             // 显示前台通知栏
-            // 在Service中
-            NotificationHelper helper = new NotificationHelper(this);
-            Intent intent = new Intent(this, MainActivity.class);
-            notification = helper.showForegroundNotification(intent, getString(R.string.app_name), "Service Running, Click to open app");
-            startForeground(NotificationHelper.FOREGROUND_NOTIFICATION_ID, notification);
-            
-//            NotificationMessage notificationMessage=createNotificationMessage();
-//            //Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show();
-//            mNotificationUtils.createForegroundNotification(this, notificationMessage);
-//            mNotificationUtils.createRemindNotification(this, notificationMessage);
+            NotificationMessage notificationMessage=createNotificationMessage();
+            //Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show();
+            mNotificationUtils.createForegroundNotification(this, notificationMessage);
+            mNotificationUtils.createRemindNotification(this, notificationMessage);
 
             if (mControlCenterServiceReceiver == null) {
                 // 注册广播接收器
@@ -130,7 +118,7 @@ public class ControlCenterService extends Service {
     }
 
     NotificationMessage createNotificationMessage() {
-        String szTitle = ((App)getApplication()).getString(R.string.app_name);
+        String szTitle = ((GlobalApplication)getApplication()).getString(R.string.app_name);
         String szContent = getValuesString() + " {?} " + StringUtils.formatPCMListString(mAppCacheUtils.getArrayListBatteryInfo());
         return new NotificationMessage(szTitle, szContent);
     }
@@ -138,19 +126,19 @@ public class ControlCenterService extends Service {
     // 更新前台通知
     //
     public void updateServiceNotification() {
-        //mNotificationUtils.updateForegroundNotification(ControlCenterService.this, createNotificationMessage());
+        mNotificationUtils.updateForegroundNotification(ControlCenterService.this, createNotificationMessage());
     }
 
     // 更新前台通知
     //
     public void updateServiceNotification(NotificationMessage notificationMessage) {
-        //mNotificationUtils.updateForegroundNotification(ControlCenterService.this, notificationMessage);
+        mNotificationUtils.updateForegroundNotification(ControlCenterService.this, notificationMessage);
     }
 
     // 更新前台通知
     //
     public void updateRemindNotification(NotificationMessage notificationMessage) {
-        //mNotificationUtils.updateRemindNotification(ControlCenterService.this, notificationMessage);
+        mNotificationUtils.updateRemindNotification(ControlCenterService.this, notificationMessage);
     }
 
     // 唤醒和绑定守护进程
@@ -246,32 +234,10 @@ public class ControlCenterService extends Service {
     }
 
     public void appenRemindMSG(String szRemindMSG) {
-        String msg = "";
-        for (int i = 0; i < 20; i++) {
-            msg += szRemindMSG;
-        }
-        NotificationHelper helper = new NotificationHelper(ControlCenterService.this);
-        Intent intent = new Intent(ControlCenterService.this, MainActivity.class);
-        helper.showTemporaryNotification(intent, getString(R.string.app_name), msg);
-        
-        
-        
-//        NotificationMessage notificationMessage = createNotificationMessage();
-//        notificationMessage.setRemindMSG(szRemindMSG);
-//        //LogUtils.d(TAG, "notificationMessage : " + notificationMessage.getRemindMSG());
-//        updateRemindNotification(notificationMessage);
-    }
-    
-    // 设置颜色背景
-    public static RemoteViews setLinearLayoutColor(RemoteViews remoteViews, int viewId, int color) {
-        remoteViews.setInt(viewId, "setBackgroundColor", color);
-        return remoteViews;
-    }
-
-    // 设置Drawable背景
-    public static RemoteViews setLinearLayoutDrawable(RemoteViews remoteViews, int viewId, int drawableRes) {
-        remoteViews.setInt(viewId, "setBackgroundResource", drawableRes);
-        return remoteViews;
+        NotificationMessage notificationMessage = createNotificationMessage();
+        notificationMessage.setRemindMSG(szRemindMSG);
+        //LogUtils.d(TAG, "notificationMessage : " + notificationMessage.getRemindMSG());
+        updateRemindNotification(notificationMessage);
     }
 
     //

powerbell/src/main/java/cc/winboll/studio/powerbell/threads/RemindThread.java

@@ -2,8 +2,8 @@ package cc.winboll.studio.powerbell.threads;
 
 import android.content.Context;
 import android.os.Message;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.lang.ref.WeakReference;
 
 public class RemindThread extends Thread {

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppCacheUtils.java

@@ -1,8 +1,8 @@
 package cc.winboll.studio.powerbell.utils;
 
 import android.content.Context;
-import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.beans.BatteryInfoBean;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.util.ArrayList;
 
 public class AppCacheUtils {

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java

@@ -2,14 +2,14 @@ package cc.winboll.studio.powerbell.utils;
 
 import android.app.Activity;
 import android.content.Context;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.GlobalApplication;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.beans.AppConfigBean;
 import cc.winboll.studio.powerbell.beans.ControlCenterServiceBean;
 import cc.winboll.studio.powerbell.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.io.File;
 
 // 应用配置工具类
@@ -42,7 +42,7 @@ public class AppConfigUtils {
     volatile String mszBackgroundFileName = "";
 
     // 保存应用实例
-    App mApplication;
+    GlobalApplication mApplication;
 
     AppConfigUtils(Context context) {
         mContext = context;
@@ -193,7 +193,7 @@ public class AppConfigUtils {
     //
     void saveConfigData() {
         // 更新配置先取消一下旧的的提醒消息
-        //NotificationHelper.cancelRemindNotification(mContext);
+        NotificationUtils.cancelRemindNotification(mContext);
         
         AppConfigBean.saveBean(mContext, mAppConfigBean);
         // 通知活动窗口和服务配置已更新

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/FileUtils.java

@@ -2,7 +2,7 @@ package cc.winboll.studio.powerbell.utils;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageUtils.java

@@ -3,7 +3,7 @@ package cc.winboll.studio.powerbell.utils;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.shared.log.LogUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationHelper.java

@@ -1,150 +0,0 @@
-package cc.winboll.studio.powerbell.utils;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/22 04:39:40
- * @Describe 通知工具类
- */
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.BitmapFactory;
-import android.os.Build;
-import android.widget.RemoteViews;
-import androidx.annotation.RequiresApi;
-import androidx.core.app.NotificationCompat;
-import cc.winboll.studio.powerbell.R;
-
-public class NotificationHelper {
-    public static final String TAG = "NotificationHelper";
-
-    // 渠道ID和名称
-    private static final String CHANNEL_ID_FOREGROUND = "foreground_channel";
-    private static final String CHANNEL_NAME_FOREGROUND = "Foreground Service";
-    private static final String CHANNEL_ID_TEMPORARY = "temporary_channel";
-    private static final String CHANNEL_NAME_TEMPORARY = "Temporary Notifications";
-
-    // 通知ID
-    public static final int FOREGROUND_NOTIFICATION_ID = 1001;
-    public static final int TEMPORARY_NOTIFICATION_ID = 2001;
-
-    private final Context mContext;
-    private final NotificationManager mNotificationManager;
-
-    public NotificationHelper(Context context) {
-        mContext = context;
-        mNotificationManager = context.getSystemService(NotificationManager.class);
-        createNotificationChannels();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private void createNotificationChannels() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            createForegroundChannel();
-            createTemporaryChannel();
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private void createForegroundChannel() {
-        NotificationChannel channel = new NotificationChannel(
-            CHANNEL_ID_FOREGROUND,
-            CHANNEL_NAME_FOREGROUND,
-            NotificationManager.IMPORTANCE_LOW
-        );
-        channel.setDescription("Persistent service notifications");
-        channel.setSound(null, null);
-        channel.enableVibration(false);
-        mNotificationManager.createNotificationChannel(channel);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private void createTemporaryChannel() {
-        NotificationChannel channel = new NotificationChannel(
-            CHANNEL_ID_TEMPORARY,
-            CHANNEL_NAME_TEMPORARY,
-            NotificationManager.IMPORTANCE_HIGH
-        );
-        channel.setDescription("Temporary alert notifications");
-        channel.setSound(null, null);
-        channel.enableVibration(true);
-        channel.setVibrationPattern(new long[]{100, 200, 300, 400});
-        channel.setBypassDnd(true);
-        mNotificationManager.createNotificationChannel(channel);
-    }
-
-    // 显示常驻通知（通常用于前台服务）
-    public Notification showForegroundNotification(Intent intent, String title, String content) {
-        PendingIntent pendingIntent = createPendingIntent(intent);
-
-        Notification notification = new NotificationCompat.Builder(mContext, CHANNEL_ID_FOREGROUND)
-            .setSmallIcon(R.drawable.ic_launcher)
-            .setLargeIcon(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.ic_launcher))
-            .setContentTitle(title)
-            .setContentText(content)
-            .setContentIntent(pendingIntent)
-            .setPriority(NotificationCompat.PRIORITY_LOW)
-            .setOngoing(true)
-            .build();
-
-        mNotificationManager.notify(FOREGROUND_NOTIFICATION_ID, notification);
-        return notification;
-    }
-
-    // 显示临时通知（自动消失）
-    public void showTemporaryNotification(Intent intent, String title, String content) {
-        PendingIntent pendingIntent = createPendingIntent(intent);
-
-        Notification notification = new NotificationCompat.Builder(mContext, CHANNEL_ID_TEMPORARY)
-            .setSmallIcon(R.drawable.ic_launcher)
-            .setLargeIcon(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.ic_launcher))
-            .setContentTitle(title)
-            .setContentText(content)
-            .setContentIntent(pendingIntent)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setAutoCancel(true)
-            .setVibrate(new long[]{100, 200, 300, 400})
-            .build();
-
-        mNotificationManager.notify(TEMPORARY_NOTIFICATION_ID, notification);
-    }
-
-    // 创建自定义布局通知（可扩展）
-    public void showCustomNotification(Intent intent, RemoteViews contentView, RemoteViews bigContentView) {
-        PendingIntent pendingIntent = createPendingIntent(intent);
-
-        Notification notification = new NotificationCompat.Builder(mContext, CHANNEL_ID_TEMPORARY)
-            .setSmallIcon(R.drawable.ic_launcher)
-            .setContentIntent(pendingIntent)
-            .setContent(contentView)
-            .setCustomBigContentView(bigContentView)
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
-            .setAutoCancel(true)
-            .build();
-
-        mNotificationManager.notify(TEMPORARY_NOTIFICATION_ID + 1, notification);
-    }
-
-    // 取消所有通知
-    public void cancelAllNotifications() {
-        mNotificationManager.cancelAll();
-    }
-
-    // 创建PendingIntent（兼容不同API版本）
-    private PendingIntent createPendingIntent(Intent intent) {
-        int flags = PendingIntent.FLAG_UPDATE_CURRENT;
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-//            flags |= PendingIntent.FLAG_IMMUTABLE;
-//        }
-        return PendingIntent.getActivity(
-            mContext,
-            0,
-            intent,
-            flags
-        );
-    }
-}
-

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils.java

@@ -18,15 +18,14 @@ import android.media.RingtoneManager;
 import android.os.Build;
 import android.view.View;
 import android.widget.RemoteViews;
-import androidx.annotation.RequiresApi;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.beans.NotificationMessage;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 
-public class NotificationUtils2 {
+public class NotificationUtils {
 
-    public static final String TAG = NotificationHelper.class.getSimpleName();
+    public static final String TAG = NotificationUtils.class.getSimpleName();
 
     Context mContext;
     NotificationManager mNotificationManager;
@@ -46,53 +45,19 @@ public class NotificationUtils2 {
     private static String _mszChannelIDRemind = "2";
     private static String _mszChannelNameRemind = "Remind";
 
-//    public NotificationUtils(Context context) {
-//        mContext = context;
-//        mNotificationManager = (NotificationManager) context.getSystemService(
-//            Context.NOTIFICATION_SERVICE);
-//    }
-
-    public NotificationUtils2(Context context) {
+    public NotificationUtils(Context context) {
         mContext = context;
-        mNotificationManager = context.getSystemService(NotificationManager.class);
-        //createNotificationChannels();
+        mNotificationManager = (NotificationManager) context.getSystemService(
+            Context.NOTIFICATION_SERVICE);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    public void createNotificationChannels() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            createServiceChannel();
-            createRemindChannel();
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private void createServiceChannel() {
-        NotificationChannel channel = new NotificationChannel(
-            _mszChannelIDService,
-            _mszChannelNameService,
-            NotificationManager.IMPORTANCE_LOW
-        );
-        channel.setDescription("Background service updates");
-        channel.setSound(null, null);
-        channel.enableVibration(false);
-        mNotificationManager.createNotificationChannel(channel);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private void createRemindChannel() {
-        NotificationChannel channel = new NotificationChannel(
-            _mszChannelIDRemind,
-            _mszChannelNameRemind,
-            NotificationManager.IMPORTANCE_HIGH
-        );
-        channel.setDescription("Critical reminders");
-        channel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM), null);
-        channel.enableVibration(true);
-        channel.setVibrationPattern(new long[]{100, 200, 300, 400});
-        channel.setBypassDnd(true);
-        channel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
-        mNotificationManager.createNotificationChannel(channel);
+    public void createNotificationChannel() {
+        NotificationChannel channel1 = new NotificationChannel(_mszChannelIDService, _mszChannelNameService, NotificationManager.IMPORTANCE_DEFAULT);
+        channel1.setSound(null, null);
+        mNotificationManager.createNotificationChannel(channel1);
+        NotificationChannel channel2 = new NotificationChannel(_mszChannelIDRemind, _mszChannelNameRemind, NotificationManager.IMPORTANCE_HIGH);
+        channel2.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE), Notification.AUDIO_ATTRIBUTES_DEFAULT);
+        mNotificationManager.createNotificationChannel(channel2);
     }
 
     // 创建并发送服务通知

powerbell/src/main/res/drawable/divider_line.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line">
-    <stroke
-        android:width="1dp"
-        android:color="#E0E0E0"/>
-</shape>

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

@@ -6,26 +6,20 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<LinearLayout
-		android:orientation="horizontal"
+	<cc.winboll.studio.libaes.views.AToolbar
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		style="@style/DefaultAToolbar"/>
 
-		<cc.winboll.studio.libaes.views.AToolbar
-			android:layout_width="match_parent"
-			android:layout_height="@dimen/toolbar_height"
-			android:id="@+id/toolbar"
-			android:gravity="center_vertical"
-			style="@style/DefaultAToolbar"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:id="@+id/root_ll"/>
+    <cc.winboll.studio.shared.view.AboutView
+        app:appname="PowerBell"
+        app:appprojectname="PowerBell"
+        app:appdescription="@string/app_description"
+        app:appicon="@drawable/ic_launcher"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/activityaboutAboutView1"/>
 
 </LinearLayout>
 

powerbell/src/main/res/layout/activity_backgroundpicture.xml

@@ -26,27 +26,29 @@
 		android:layout_height="wrap_content"
 		android:layout_below="@id/toolbar">
 
-		<RelativeLayout
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="right">
 
 			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="160dp"
+				android:layout_width="180dp"
 				android:layout_height="36dp"
 				android:text="Origin BG"
-				android:id="@+id/activitybackgroundpictureAButton5"
-				android:layout_alignParentLeft="true"
-				android:layout_margin="5dp"/>
+				android:layout_gravity="center_vertical"
+				android:layout_margin="10dp"
+				android:id="@+id/activitybackgroundpictureAButton5"/>
 
 			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="160dp"
+				android:layout_width="180dp"
 				android:layout_height="36dp"
 				android:text="Received BG"
-				android:id="@+id/activitybackgroundpictureAButton4"
-				android:layout_alignParentRight="true"
-				android:layout_margin="5dp"/>
+				android:layout_gravity="center_vertical"
+				android:layout_margin="10dp"
+				android:id="@+id/activitybackgroundpictureAButton4"/>
 
-		</RelativeLayout>
+		</LinearLayout>
 
 		<LinearLayout
 			android:orientation="horizontal"

powerbell/src/main/res/layout/activity_battery_reporter.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="电池使用报告"
-        android:textSize="24sp"
-        android:fontFamily="sans-serif-medium"
-        android:layout_marginBottom="16dp"/>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvBatteryReport"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:divider="@drawable/divider_line"
-        android:dividerHeight="1dp"/>
-
-</LinearLayout>

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

@@ -33,10 +33,10 @@
 
 	</LinearLayout>
 
-	<cc.winboll.studio.libappbase.LogView
+	<cc.winboll.studio.shared.log.LogView
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="200dp"
+		android:layout_height="100dp"
 		android:id="@+id/logview"/>
 
 </LinearLayout>

powerbell/src/main/res/layout/custom_notification.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:id="@+id/ll_notification">
-
-</LinearLayout>
-

powerbell/src/main/res/layout/custom_notification_expanded.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:id="@+id/ll_notification">
-
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="Text"
-		android:id="@+id/info_tv"/>
-
-</LinearLayout>
-

powerbell/src/main/res/layout/item_battery_report.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="12dp"
-    android:gravity="center_vertical"
-    android:background="@android:color/white">
-
-    <TextView
-        android:id="@+id/tvLevel"
-        android:layout_width="80dp"
-        android:layout_height="wrap_content"
-        android:textSize="18sp"
-        android:fontFamily="sans-serif-medium"/>
-
-    <TextView
-        android:id="@+id/tvDischargeTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:textSize="16sp"
-        android:paddingStart="16dp"/>
-
-    <TextView
-        android:id="@+id/tvChargeTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:textSize="16sp"
-        android:paddingStart="16dp"/>
-
-</LinearLayout>

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

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_battery_reporter"
-        android:title="@string/item_battery_reporter"/>
     <item
         android:id="@+id/action_clearrecord"
         android:title="@string/item_clearrecord"/>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">能源钟</string>
-    <string name="app_description">一个接收手机电量信息的应用，当电量值达到设定范围时会提醒用户。</string>
+    <string name="app_description">手机电量变化铃声提醒应用。</string>
     <string name="about_crashed">本应用崩溃了，作者水平有限，敬请谅解！</string>
     <string name="item_mainview">Main View</string>
     <string name="item_aboutview">About</string>

powerbell/src/main/res/values/attrs.xml

@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="appTheme" format="reference"/>
+    <declare-styleable name="AToolbar">
+        <attr name="attrAToolbarStartColor" format="color" />
+        <attr name="attrAToolbarCenterColor" format="color" />
+        <attr name="attrAToolbarEndColor" format="color" />
+    </declare-styleable>
 </resources>

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

@@ -25,7 +25,7 @@
     <color name="colorShuiDark">#FF0072A4</color>
     <color name="colorShuiAccent">#FF33C1FF</color>
     <color name="colorXinling">#FFFCC500</color>
-    <color name="colorPrimary">@color/colorShuiDark</color>
+    <color name="colorPrimary">@color/colorShui</color>
     <color name="colorPrimaryDark">@color/colorFeng</color>
     <color name="colorAccent">@color/colorShui</color>
     <color name="colorYellow">#FFFFFF00</color>

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

@@ -2,11 +2,10 @@
 <resources>
     <string name="app_name">PowerBell</string>
     <string name="app_projectname">PowerBell</string>
-    <string name="app_description">A mobile app that receives battery level information from a phone and alerts the user when the battery level reaches a predefined range.</string>
+    <string name="app_description">Mobile phone power change ringtone alert app.</string>
     <string name="about_crashed">This application has crashed, the author level is limited, please understand!</string>
     <string name="item_mainview">Main View</string>
     <string name="item_aboutview">About</string>
-    <string name="item_battery_reporter">Battery Reporter</string>
     <string name="item_clearrecord">Clear Record</string>
     <string name="item_changepicture">Change Picture</string>
     <string name="item_devoloperoptionsview">Developer View</string>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme_Base" parent="AESTheme">
+    <style name="AppTheme_Base" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
-    <style name="AppTheme_Default" parent="AESTheme">
+    <style name="AppTheme_Default" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -12,7 +12,6 @@
     </style>
 
     <style name="DefaultAToolbar">
-        <item name="attrAToolbarTitleTextColor">#FF000000</item>
         <item name="attrAToolbarStartColor">@color/colorShuiDark</item>
         <item name="attrAToolbarCenterColor">@color/colorShui</item>
         <item name="attrAToolbarEndColor">@color/colorShuiAccent</item>

powerbell/src/stage/AndroidManifest.xml

@@ -4,18 +4,20 @@
 
     <application>
 
+        <!-- Put flavor specific code here -->
         <provider
+            tools:replace="android:authorities"
             android:name="androidx.core.content.FileProvider"
             android:authorities="cc.winboll.studio.powerbell.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 
             <meta-data
+                tools:replace="android:resource"
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider"/>
 
         </provider>
-
     </application>
 
 </manifest>

settings.gradle-demo

@@ -2,9 +2,8 @@
 //include ':demo'
 //rootProject.name = "demo"
 
-// WinBoll-APP 项目编译设置
+// APP 项目编译设置
 //include ':app'
-//include ':winboll-shared'
 //rootProject.name = "app"
 
 // AutoInstaller 项目编译设置