<powerbell>APK 15.0.3 release Publish.

<powerbell>APK 15.0.2 release Publish.
内容提供配置调整
2025-03-25 02:43:07 +08:00 · 2025-03-25 02:42:42 +08:00 · 2025-03-25 02:42:10 +08:00 · 2025-03-25 02:36:56 +08:00 · 2025-03-25 02:34:56 +08:00 · 2025-03-25 02:30:45 +08:00
80 changed files with 1259 additions and 1426 deletions
--- a/aes/build.gradle
+++ b/aes/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.aes"
-        minSdkVersion 26
-        targetSdkVersion 29
+        minSdkVersion 24
+        targetSdkVersion 30
        versionCode 1
        // versionName 更新后需要手动设置 
        // 项目模块目录的 build.gradle 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0" 
+        versionName "7.6" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
@@ -41,9 +41,29 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
+    
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 }

 dependencies {
 	api project(':libaes')
+    
+    //api 'cc.winboll.studio:winboll-shared:1.6.5'
+    api 'io.github.medyo:android-about-page:2.0.0'
+    api 'com.github.getActivity:ToastUtils:10.5'
+    api 'com.jcraft:jsch:0.1.55'
+    api 'org.jsoup:jsoup:1.13.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.fragment:fragment:1.0.0'
+    api 'com.google.android.material:material:1.0.0'
+    
+    api 'cc.winboll.studio:libapputils:9.2.1'
+    api 'cc.winboll.studio:libappbase:1.0.3'
+    
    api fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/aes/build.properties
+++ b/aes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 14:31:58 HKT 2025
+#Sun Jan 19 04:58:59 GMT 2025
 stageCount=3
 libraryProject=libaes
-baseVersion=15.0
-publishVersion=15.0.2
-buildCount=0
-baseBetaVersion=15.0.3
+baseVersion=7.6
+publishVersion=7.6.2
+buildCount=4
+baseBetaVersion=7.6.3
--- a/aes/src/main/AndroidManifest.xml
+++ b/aes/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
        android:allowBackup="true"
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
-        android:theme="@style/MyAESTheme"
+        android:theme="@style/WinBoll.SupportThemeNoActionBar"
        android:requestLegacyExternalStorage="true"
        android:supportsRtl="true">

--- a/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
+++ b/aes/src/main/java/cc/winboll/studio/aes/MainActivity.java
@@ -5,219 +5,12 @@ package cc.winboll.studio.aes;
 * @Date 2024/06/13 19:05:52
 * @Describe 应用主窗口
 */
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Toast;
-import android.widget.Toolbar;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.aes.R;
-import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libaes.beans.DrawerMenuBean;
-import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
-import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
-import cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity;
-import cc.winboll.studio.libaes.unittests.TestAButtonFragment;
-import cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity;
-import cc.winboll.studio.libaes.unittests.TestAToolbarActivity;
-import cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity;
-import cc.winboll.studio.libaes.unittests.TestViewPageFragment;
-import cc.winboll.studio.libaes.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.app.AboutActivityFactory;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import com.a4455jkjh.colorpicker.ColorPickerDialog;
-import java.util.ArrayList;
-
-public class MainActivity extends DrawerFragmentActivity implements IWinBollActivity {
+import cc.winboll.studio.libaes.unittests.LibraryActivity;

+public class MainActivity extends LibraryActivity {
+    
    public static final String TAG = "MainActivity";
-
-    TestAButtonFragment mTestAButtonFragment;
-    TestViewPageFragment mTestViewPageFragment;
-
-    @Override
-    public APPInfo getAppInfo() {
-        String szBranchName = "aes";
-
-        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
-        appInfo.setAppName("AES");
-        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
-        appInfo.setAppDescription("AES Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=AES");
-        appInfo.setAppAPKName("AES");
-        appInfo.setAppAPKFolderName("AES");
-        return appInfo;
-        //return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return null;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (mTestAButtonFragment == null) {
-            mTestAButtonFragment = new TestAButtonFragment();
-            addFragment(mTestAButtonFragment);
-        }
-        showFragment(mTestAButtonFragment);
-        //setSubtitle(TAG);
-    }
-
-    @Override
-    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.initDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "initDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
-        super.reinitDrawerMenuItemList(listDrawerMenu);
-        LogUtils.d(TAG, "reinitDrawerMenuItemList");
-        //listDrawerMenu.clear();
-        // 添加抽屉菜单项
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
-        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
-        notifyDrawerMenuDataChanged();
-    }
-
-    @Override
-    public DrawerFragmentActivity.ActivityType initActivityType() {
-        return DrawerFragmentActivity.ActivityType.Main;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_library, menu);
-        if(App.isDebuging()) {
-            getMenuInflater().inflate(cc.winboll.studio.libapputils.R.menu.toolbar_studio_debug, menu);
-        }
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        super.onItemClick(parent, view, position, id);
-        switch (position) {
-            case 0 : {
-                    if (mTestAButtonFragment == null) {
-                        mTestAButtonFragment = new TestAButtonFragment();
-                        addFragment(mTestAButtonFragment);
-                    }
-                    showFragment(mTestAButtonFragment);
-                    break;
-                }
-            case 1 : {
-                    if (mTestViewPageFragment == null) {
-                        mTestViewPageFragment = new TestViewPageFragment();
-                        addFragment(mTestViewPageFragment);
-                    }
-                    showFragment(mTestViewPageFragment);
-                    break;
-                }
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int nItemId = item.getItemId();
-//        if (item.getItemId() == R.id.item_log) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
-//        } else 
-        if (nItemId == R.id.item_atoast) {
-            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
-        } else if (nItemId == R.id.item_atoolbar) {
-            Intent intent = new Intent(this, TestAToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_asupporttoolbar) {
-            Intent intent = new Intent(this, TestASupportToolbarActivity.class);
-            startActivity(intent);
-
-        } else if (nItemId == R.id.item_colordialog) {
-            ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary));
-            dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
-
-                    @Override
-                    public void beforeColorChanged() {
-                    }
-
-                    @Override
-                    public void onColorChanged(int color) {
-
-                    }
-
-                    @Override
-                    public void afterColorChanged() {
-                    }
-
-
-                });
-            dlg.show();
-
-        } else if (nItemId ==  R.id.item_dialogstoragepath) {
-            final StoragePathDialog dialog = new StoragePathDialog(this, 0);
-            dialog.setOnOKClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        dialog.dismiss();
-                    }
-                });
-            dialog.show();
-
-        } else if (nItemId ==  R.id.item_localfileselectdialog) {
-            final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this);
-            dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() {
-                    @Override
-                    public void onOKClick(String sz) {
-                        Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
-                        //dialog.dismiss();
-                    }
-                });
-            dialog.open();
-
-        } else if (nItemId ==  R.id.item_secondarylibraryactivity) {
-            Intent intent = new Intent(this, SecondaryLibraryActivity.class);
-            startActivity(intent);
-        } else if (nItemId ==  R.id.item_drawerfragmentactivity) {
-            Intent intent = new Intent(this, TestDrawerFragmentActivity.class);
-            startActivity(intent);
-        } 
-        else if (nItemId ==  R.id.item_about) {
-            AboutActivityFactory.showAboutActivity(this, getAppInfo());
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
+    
+    
+    
 }
--- a/aes/src/main/res/values/colors.xml
+++ b/aes/src/main/res/values/colors.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#FF00B322</color>
-    <color name="colorPrimaryDark">#FF005C12</color>
-    <color name="colorAccent">#FF8DFFA2</color>
-    <color name="colorText">#FFFFFB8D</color>
-</resources>
--- a/aes/src/main/res/values/styles.xml
+++ b/aes/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MyAESTheme" parent="AESTheme">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
    </style>
 </resources>
--- a/androidxdemo/build.gradle
+++ b/androidxdemo/build.gradle
@@ -18,8 +18,15 @@ def genVersionName(def versionName){
 }

 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+	productFlavors {
+		beta {
+		}
+		stage {
+		}
+	}
+
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"

    defaultConfig {
        applicationId "cc.winboll.studio.androidxdemo"
@@ -29,7 +36,7 @@ android {
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
+        versionName "1.0"
        if(true) {
            versionName = genVersionName("${versionName}")
        }
@@ -47,26 +54,23 @@ dependencies {
    api fileTree(dir: 'libs', include: ['*.jar'])
    
    // SSH
-    api 'com.jcraft:jsch:0.1.55'
+    implementation 'com.jcraft:jsch:0.1.55'
    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.jsoup:jsoup:1.13.1'
    // 二维码类库
-    api 'com.google.zxing:core:3.4.1'
-    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
    // 应用介绍页类库
-    api 'io.github.medyo:android-about-page:2.0.0'
+    implementation 'io.github.medyo:android-about-page:2.0.0'
    // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
+    implementation 'com.github.getActivity:ToastUtils:10.5'
    // 网络连接类库
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'com.google.android.material:material:1.4.0'
-    //api 'androidx.viewpager:viewpager:1.0.0'
-    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    // Android 类库
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
+    implementation 'com.google.android.material:material:1.4.0'
 }
--- a/androidxdemo/build.properties
+++ b/androidxdemo/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:19:57 GMT 2025
+#Tue Mar 11 18:25:43 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=15.0
-publishVersion=15.0.0
-buildCount=8
-baseBetaVersion=15.0.1
+baseVersion=1.0
+publishVersion=1.0.0
+buildCount=4
+baseBetaVersion=1.0.1
--- a/androidxdemo/src/main/AndroidManifest.xml
+++ b/androidxdemo/src/main/AndroidManifest.xml
@@ -8,9 +8,9 @@
        android:icon="@mipmap/ic_launcher"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
+        android:theme="@style/AppTheme"
        android:resizeableActivity="true"
-        android:name=".App">
+        android:name=".GlobalApplication">

        <activity
            android:name=".MainActivity"
@@ -34,4 +34,4 @@

    </application>

-</manifest>
+</manifest>
--- a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java
+++ b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java
@@ -1,6 +1,7 @@
 package cc.winboll.studio.androidxdemo;

 import android.app.Activity;
+import android.app.Application;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -21,7 +22,6 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -39,15 +39,15 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;

-public class App extends GlobalApplication {
+public class GlobalApplication extends Application {

    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());

    @Override
    public void onCreate() {
        super.onCreate();
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
+        CrashHandler.getInstance().registerGlobal(this);
+        CrashHandler.getInstance().registerPart(this);
    }

    public static void write(InputStream input, OutputStream output) throws IOException {
@@ -252,7 +252,7 @@ public class App extends GlobalApplication {

            private static String getKernel() {
                try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
+                    return GlobalApplication.toString(new FileInputStream("/proc/version")).trim();
                } catch (Throwable e) {
                    return e.getMessage();
                }
@@ -331,4 +331,4 @@ public class App extends GlobalApplication {
            restart();
        }
    }
-}
+}
--- a/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/MainActivity.java
+++ b/androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/MainActivity.java
@@ -3,26 +3,17 @@ package cc.winboll.studio.androidxdemo;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogView;

 public class MainActivity extends AppCompatActivity {
-
-    LogView mLogView;
-
+    
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
-
+		
 		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
+        
    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-}
+    
+}
--- a/androidxdemo/src/main/res/layout/activity_main.xml
+++ b/androidxdemo/src/main/res/layout/activity_main.xml
@@ -34,18 +34,5 @@

 	</LinearLayout>

-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
 </LinearLayout>

--- a/androidxdemo/src/main/res/values/styles.xml
+++ b/androidxdemo/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>

    <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
        <!-- Customize your theme here. -->
        <item name="colorPrimary">@color/colorPrimary</item>
        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
--- a/libaes/build.gradle
+++ b/libaes/build.gradle
@@ -4,12 +4,14 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'

 android {
+    namespace 'cc.winboll.studio.libaes'
+    
    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    buildToolsVersion "33.0.3"

    defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 29
+        minSdkVersion 24
+        targetSdkVersion 30
    }
    buildTypes {
        release {
@@ -17,39 +19,30 @@ 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.6.5'
    
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    api 'com.github.getActivity:XXPermissions:18.63'
-    // 下拉控件
-    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    // 拼音搜索
-    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
-    api 'com.github.open-android:pinyin4j:2.5.0'
-    // SSH
-    api 'com.jcraft:jsch:0.1.55'
-    // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
-    // 二维码类库
-    api 'com.google.zxing:core:3.4.1'
-    api 'com.journeyapps:zxing-android-embedded:3.6.0'
-    // 应用介绍页类库
    api 'io.github.medyo:android-about-page:2.0.0'
-    // 吐司类库
    api 'com.github.getActivity:ToastUtils:10.5'
-    // 网络连接类库
+    api 'com.jcraft:jsch:0.1.55'
+    api 'org.jsoup:jsoup:1.13.1'
    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'com.google.android.material:material:1.4.0'
-    //api 'androidx.viewpager:viewpager:1.0.0'
-    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
    
-    api 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.fragment:fragment:1.0.0'
+    api 'com.google.android.material:material:1.0.0'
+    
+    // https://github.com/baoyongzhang/android-PullRefreshLayout
+    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    
+    api 'cc.winboll.studio:libapputils:9.2.1'
+    api 'cc.winboll.studio:libappbase:1.0.3'
+    
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/libaes/build.properties
+++ b/libaes/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 14:31:58 HKT 2025
+#Sun Jan 19 04:58:59 GMT 2025
 stageCount=3
 libraryProject=libaes
-baseVersion=15.0
-publishVersion=15.0.2
-buildCount=0
-baseBetaVersion=15.0.3
+baseVersion=7.6
+publishVersion=7.6.2
+buildCount=4
+baseBetaVersion=7.6.3
--- a/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java
@@ -16,6 +16,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -26,20 +27,18 @@ import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.beans.DrawerMenuBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libaes.views.ADrawerMenuListView;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.log.LogUtils;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
-import cc.winboll.studio.libaes.winboll.IWinBollActivity;
-import androidx.appcompat.widget.Toolbar;

-public abstract class DrawerFragmentActivity extends AppCompatActivity implements IWinBollActivity,AdapterView.OnItemClickListener {
+public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {

    public static final String TAG = "DrawerFragmentActivity";

    static final String SHAREDPREFERENCES_NAME = "SHAREDPREFERENCES_NAME";
    static final String DRAWER_THEME_TYPE = "DRAWER_THEME_TYPE";

-    //protected Context mContext;
+    protected Context mContext;
    ActivityType mActivityType;
    ActionBarDrawerToggle mActionBarDrawerToggle;
    DrawerLayout mDrawerLayout;
@@ -59,7 +58,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement

    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        //mContext = this;
+        mContext = this;
        mThemeType = getThemeType();
        setThemeStyle();
        super.onCreate(savedInstanceState);
@@ -73,7 +72,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
        super.onDestroy();
    }

-    /*@Override
+    @Override
    public Intent getIntent() {
        // TODO: Implement this method
        return super.getIntent();
@@ -81,7 +80,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement

    public Context getContext() {
        return this.mContext;
-    }*/
+    }

    @Override
    public MenuInflater getMenuInflater() {
@@ -89,20 +88,20 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
        return super.getMenuInflater();
    }

-    /*public void setSubtitle(CharSequence context) {
+    public void setSubtitle(CharSequence context) {
        // TODO: Implement this method
        getSupportActionBar().setSubtitle(context);
-    }*/
+    }

    @Override
    public void recreate() {
        super.recreate();
    }

-    /*@Override
+    @Override
    public boolean moveTaskToBack(boolean nonRoot) {
        return super.moveTaskToBack(nonRoot);
-    }*/
+    }

    @Override
    public void startActivity(Intent intent) {
@@ -114,7 +113,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
        super.startActivityForResult(intent, requestCode, options);
    }

-    /*@Override
+    @Override
    public FragmentManager getSupportFragmentManager() {
        return super.getSupportFragmentManager();
    }
@@ -132,7 +131,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
    public void setTitle(int resId) {
        // TODO: Implement this method
        getSupportActionBar().setTitle(resId);
-    }*/
+    }

    @Override
    public SharedPreferences getSharedPreferences(String name, int mode) {
@@ -152,7 +151,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement

    void setThemeStyle() {
        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        setTheme(AESThemeUtil.getThemeTypeID(this));
    }

    boolean checkThemeStyleChange() {
@@ -164,7 +163,7 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
         */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(this));
    }

    @Override
--- a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESThemeBean.java
@@ -8,7 +8,7 @@ package cc.winboll.studio.libaes.beans;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libappbase.BaseBean;
+import cc.winboll.studio.libapputils.bean.BaseBean;
 import java.io.IOException;

 public class AESThemeBean extends BaseBean {
@@ -16,7 +16,7 @@ public class AESThemeBean extends BaseBean {
    public static final String TAG = "AESThemeBean";

    public enum ThemeType {
-        AES("默认主题"),
+        DEFAULT("默认主题"),
        DEPTH("深奥主题"),
        SKY("天空主题"),
        GOLDEN("辉煌主题"),
@@ -42,7 +42,7 @@ public class AESThemeBean extends BaseBean {
    }
    
    // 保存当前主题
-    int currentThemeStyleID = getThemeStyleID(ThemeType.AES);
+    int currentThemeStyleID = getThemeStyleID(ThemeType.DEFAULT);
    
    public AESThemeBean() {
    }
@@ -99,7 +99,7 @@ public class AESThemeBean extends BaseBean {
    }

    public static int getThemeStyleID(ThemeType themeType) {
-        int themeStyleID = R.style.AESTheme;
+        int themeStyleID = R.style.DefaultAESTheme;
        if (AESThemeBean.ThemeType.DEPTH == themeType) {
            themeStyleID = R.style.DepthAESTheme;
        } else if (AESThemeBean.ThemeType.SKY == themeType) {
@@ -110,15 +110,15 @@ public class AESThemeBean extends BaseBean {
            themeStyleID = R.style.MemorAESTheme;
        } else if (AESThemeBean.ThemeType.TAO == themeType) {
            themeStyleID = R.style.TaoAESTheme;
-        } else if (AESThemeBean.ThemeType.AES == themeType) {
-            themeStyleID = R.style.AESTheme;
+        } else if (AESThemeBean.ThemeType.DEFAULT == themeType) {
+            themeStyleID = R.style.DefaultAESTheme;
        }
        //LogUtils.d(TAG, "themeStyleID " + Integer.toString(themeStyleID));
        return themeStyleID;
    }

    public static AESThemeBean.ThemeType getThemeStyleType(int nThemeStyleID) {
-        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.AES;
+        AESThemeBean.ThemeType themeStyle = AESThemeBean.ThemeType.DEFAULT;
        if (R.style.DepthAESTheme == nThemeStyleID) {
            themeStyle = AESThemeBean.ThemeType.DEPTH ;
        } else if (R.style.SkyAESTheme == nThemeStyleID) {
@@ -129,8 +129,8 @@ public class AESThemeBean extends BaseBean {
            themeStyle = AESThemeBean.ThemeType.MEMOR ;
        } else if (R.style.TaoAESTheme == nThemeStyleID) {
            themeStyle = AESThemeBean.ThemeType.TAO ;
-        } else if (R.style.AESTheme == nThemeStyleID) {
-            themeStyle = AESThemeBean.ThemeType.AES;
+        } else if (R.style.DefaultAESTheme == nThemeStyleID) {
+            themeStyle = AESThemeBean.ThemeType.DEFAULT;
        }
        //LogUtils.d(TAG, "themeStyle " + Integer.toString(themeStyle.ordinal()));
        return themeStyle;
--- a/libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/dialogs/LocalFileSelectDialog.java
@@ -5,7 +5,7 @@ import android.content.DialogInterface;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
-import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.log.LogUtils;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.text.Collator;
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/LibraryActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/LibraryActivity.java
@@ -0,0 +1,170 @@
+package cc.winboll.studio.libaes.unittests;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2024/06/14 03:43:23
+ * @Describe AES类库主窗口
+ */
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Toast;
+import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
+import cc.winboll.studio.libaes.beans.DrawerMenuBean;
+import cc.winboll.studio.libaes.dialogs.LocalFileSelectDialog;
+import cc.winboll.studio.libaes.dialogs.StoragePathDialog;
+import cc.winboll.studio.libapputils.log.LogUtils;
+import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import java.util.ArrayList;
+
+public class LibraryActivity extends DrawerFragmentActivity {
+
+    public static final String TAG = "LibraryActivity";
+
+    TestAButtonFragment mTestAButtonFragment;
+    TestViewPageFragment mTestViewPageFragment;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (mTestAButtonFragment == null) {
+            mTestAButtonFragment = new TestAButtonFragment();
+            addFragment(mTestAButtonFragment);
+        }
+        showFragment(mTestAButtonFragment);
+        setSubtitle(TAG);
+    }
+
+    @Override
+    public void initDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.initDrawerMenuItemList(listDrawerMenu);
+        LogUtils.d(TAG, "initDrawerMenuItemList");
+        //listDrawerMenu.clear();
+        // 添加抽屉菜单项
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public void reinitDrawerMenuItemList(ArrayList<DrawerMenuBean> listDrawerMenu) {
+        super.reinitDrawerMenuItemList(listDrawerMenu);
+        LogUtils.d(TAG, "reinitDrawerMenuItemList");
+        //listDrawerMenu.clear();
+        // 添加抽屉菜单项
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestAButtonFragment.TAG));
+        listDrawerMenu.add(new DrawerMenuBean(R.drawable.ic_launcher, TestViewPageFragment.TAG));
+        notifyDrawerMenuDataChanged();
+    }
+
+    @Override
+    public DrawerFragmentActivity.ActivityType initActivityType() {
+        return DrawerFragmentActivity.ActivityType.Main;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_library, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        super.onItemClick(parent, view, position, id);
+        switch (position) {
+            case 0 : {
+                    if (mTestAButtonFragment == null) {
+                        mTestAButtonFragment = new TestAButtonFragment();
+                        addFragment(mTestAButtonFragment);
+                    }
+                    showFragment(mTestAButtonFragment);
+                    break;
+                }
+            case 1 : {
+                    if (mTestViewPageFragment == null) {
+                        mTestViewPageFragment = new TestViewPageFragment();
+                        addFragment(mTestViewPageFragment);
+                    }
+                    showFragment(mTestViewPageFragment);
+                    break;
+                }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int nItemId = item.getItemId();
+//        if (item.getItemId() == R.id.item_log) {
+//            WinBollActivityManager.getInstance(this).startWinBollActivity(getApplicationContext(), LogActivity.class);
+//        } else 
+        if (nItemId == R.id.item_atoast) {
+            Toast.makeText(getApplication(), "item_testatoast", Toast.LENGTH_SHORT).show();
+        } else if (nItemId == R.id.item_atoolbar) {
+            Intent intent = new Intent(this, TestAToolbarActivity.class);
+            startActivity(intent);
+
+        } else if (nItemId == R.id.item_asupporttoolbar) {
+            Intent intent = new Intent(this, TestASupportToolbarActivity.class);
+            startActivity(intent);
+
+        } else if (nItemId == R.id.item_colordialog) {
+            ColorPickerDialog dlg = new ColorPickerDialog(this, getResources().getColor(R.color.colorPrimary));
+            dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
+
+                    @Override
+                    public void beforeColorChanged() {
+                    }
+
+                    @Override
+                    public void onColorChanged(int color) {
+
+                    }
+
+                    @Override
+                    public void afterColorChanged() {
+                    }
+
+
+                });
+            dlg.show();
+
+        } else if (nItemId ==  R.id.item_dialogstoragepath) {
+            final StoragePathDialog dialog = new StoragePathDialog(this, 0);
+            dialog.setOnOKClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                    }
+                });
+            dialog.show();
+
+        } else if (nItemId ==  R.id.item_localfileselectdialog) {
+            final LocalFileSelectDialog dialog = new LocalFileSelectDialog(this);
+            dialog.setOnOKClickListener(new LocalFileSelectDialog.OKClickListener() {
+                    @Override
+                    public void onOKClick(String sz) {
+                        Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
+                        //dialog.dismiss();
+                    }
+                });
+            dialog.open();
+
+        } else if (nItemId ==  R.id.item_secondarylibraryactivity) {
+            Intent intent = new Intent(this, SecondaryLibraryActivity.class);
+            startActivity(intent);
+        } else if (nItemId ==  R.id.item_drawerfragmentactivity) {
+            Intent intent = new Intent(this, TestDrawerFragmentActivity.class);
+            startActivity(intent);
+        } 
+//        else if (nItemId ==  R.id.item_about) {
+//            Intent intent = new Intent(this, AboutActivity.class);
+//            startActivity(intent);
+//        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/SecondaryLibraryActivity.java
@@ -6,47 +6,18 @@ import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import androidx.appcompat.app.AppCompatActivity;
-import android.widget.Toolbar;
-import cc.winboll.studio.libaes.winboll.IWinBollActivity;

 /**
 * @Author ZhanGSKen@QQ.COM
 * @Date 2024/06/15 00:58:10
 * @Describe 第二级窗口
 */
-public class SecondaryLibraryActivity extends DrawerFragmentActivity implements IWinBollActivity {
+public class SecondaryLibraryActivity extends DrawerFragmentActivity {

    public static final String TAG = "SecondaryLibraryActivity";

    SecondaryLibraryFragment mSecondaryLibraryFragment;

-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return null;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return null;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -72,7 +43,7 @@ public class SecondaryLibraryActivity extends DrawerFragmentActivity implements
    public boolean onOptionsItemSelected(MenuItem item) {
        int nItemId = item.getItemId();
        if (nItemId == R.id.item_test) {
-            Toast.makeText(getApplicationContext(), "item_test", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplication(), "item_test", Toast.LENGTH_SHORT).show();
        }
        return super.onOptionsItemSelected(item);
    }
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java
@@ -9,11 +9,11 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.views.AButton;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libapputils.log.LogUtils;

 public class TestAButtonFragment extends Fragment {

@@ -28,7 +28,7 @@ public class TestAButtonFragment extends Fragment {
                @Override
                public void onClick(View view) {
                    LogUtils.d(TAG, "onClick");
-                    ToastUtils.show("AButton");
+                    Toast.makeText(getActivity(), "AButton", Toast.LENGTH_SHORT).show();
                }

            });
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestDrawerFragmentActivity.java
@@ -4,57 +4,26 @@ package cc.winboll.studio.libaes.unittests;
 * @Author ZhanGSKen@QQ.COM
 * @Date 2024/06/30 15:00:51
 */
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.Toast;
-import android.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.beans.DrawerMenuBean;
-import cc.winboll.studio.libaes.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.bean.APPInfo;
+import cc.winboll.studio.libapputils.log.LogUtils;
 import java.util.ArrayList;

-public class TestDrawerFragmentActivity extends DrawerFragmentActivity implements IWinBollActivity {
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return null;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return null;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
+public class TestDrawerFragmentActivity extends DrawerFragmentActivity {

    public static final String TAG = "TestDrawerFragmentActivity";

    TestFragment1 mTestFragment1;
    TestFragment2 mTestFragment2;

-
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -97,7 +66,7 @@ public class TestDrawerFragmentActivity extends DrawerFragmentActivity implement
        super.onItemClick(parent, view, position, id);
        switch (position) {
            case 0 : {
-                    Toast.makeText(getApplicationContext(), "0", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(), "0", Toast.LENGTH_SHORT).show();
                    //LogUtils.d(TAG, "MenuItem 1");
                    showFragment(mTestFragment1);
                    break;
--- a/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java
@@ -5,7 +5,6 @@ package cc.winboll.studio.libaes.unittests;
 * @Date 2024/07/16 01:35:56
 * @Describe TestViewPageFragment
 */
-import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -18,17 +17,12 @@ import androidx.viewpager.widget.ViewPager;
 import cc.winboll.studio.libaes.ImagePagerAdapter;
 import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.util.ArrayList;
 import java.util.List;

 public class TestViewPageFragment extends Fragment implements ViewPager.OnPageChangeListener, View.OnClickListener {

    public static final String TAG = "TestViewPageFragment";
-    
-    Context mContext;
-    LogView mLogView;

    private ViewPager viewPager;
    private List<View> views; //用来存放放进ViewPager里面的布局
@@ -42,10 +36,6 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
        mView = inflater.inflate(R.layout.fragment_viewpage, container, false);
-        mContext = getActivity();
-        
-        mLogView = mView.findViewById(R.id.logview);
-        mLogView.start();

        //viewPager = findViewById(R.id.activitymainViewPager1);
        initData();
@@ -70,13 +60,12 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
        initPoint();//初始化页面下方的点
        viewPager.setOnPageChangeListener(this);
        initAOHPCTCSeekBar();
-        initAOHPCTCSeekBar2();
    }

    //初始化所要显示的布局
    void initData() {
        ViewPager viewPager = mView.findViewById(R.id.fragmentviewpageViewPager1);
-        LayoutInflater inflater = LayoutInflater.from(mContext);
+        LayoutInflater inflater = LayoutInflater.from(getActivity());
        View view1 = inflater.inflate(R.layout.viewpage_atickprogressbar, viewPager, false);
        View view2 = inflater.inflate(R.layout.viewpage_acard, viewPager, false);
        View view3 = inflater.inflate(R.layout.viewpage_aohpctccard, viewPager, false);
@@ -196,31 +185,14 @@ public class TestViewPageFragment extends Fragment implements ViewPager.OnPageCh
    }

    void initAOHPCTCSeekBar() {
-        AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1);
-        seekbar.setThumb(mContext.getDrawable(R.drawable.ic_launcher));
-        //seekbar.setThumbOffset(200);
-        //seekbar.setThumbOffset(1);
-        seekbar.setBlurRightDP(50);
+        AOHPCTCSeekBar seekbar = mView.findViewById(R.id.fragmentviewpageAOHPCTCSeekBar1);
+        seekbar.setThumb(getActivity().getDrawable(R.drawable.ic_launcher));
+        seekbar.setThumbOffset(10);
        seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {

                @Override
                public void onOHPCommit() {
-                    ToastUtils.show("onOHPCommit");
-                }
-            });
-    }
-    
-    void initAOHPCTCSeekBar2() {
-        AOHPCTCSeekBar seekbar = views.get(3).findViewById(R.id.fragmentviewpageAOHPCTCSeekBar2);
-        seekbar.setThumb(mContext.getDrawable(R.drawable.ic_call));
-        //seekbar.setThumbOffset(200);
-        //seekbar.setThumbOffset(1);
-        seekbar.setBlurRightDP(50);
-        seekbar.setOnOHPCListener(new AOHPCTCSeekBar.OnOHPCListener() {
-
-                @Override
-                public void onOHPCommit() {
-                    ToastUtils.show("onOHPCommit 2");
+                    Toast.makeText(getActivity(), "onOHPCommit ", Toast.LENGTH_SHORT).show();
                }
            });
    }
--- a/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/utils/AESThemeUtil.java
@@ -11,8 +11,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.R;
-import cc.winboll.studio.libaes.activitys.DrawerFragmentActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
+import cc.winboll.studio.libapputils.app.WinBollActivity;

 public class AESThemeUtil {

@@ -25,7 +25,7 @@ public class AESThemeUtil {

    public static <T extends Context> int getThemeTypeID(T context) {
        AESThemeBean bean = AESThemeBean.loadBean(context, AESThemeBean.class);
-        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES): bean.getCurrentThemeTypeID();
+        return bean == null ? AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT): bean.getCurrentThemeTypeID();
    }
    
    public static <T extends Context> void saveThemeStyleID(T context, int nThemeTypeID) {
@@ -41,9 +41,9 @@ public class AESThemeUtil {
        activity.setTheme(getThemeTypeID(activity));
    }

-    /*public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
+    public static <T extends WinBollActivity> void applyWinBollTheme(T activity) {
        activity.setTheme(getThemeTypeID(activity.getApplicationContext()));
-    }*/
+    }

    public static <T extends Activity> void applyAppTheme(Activity activity, AESThemeBean.ThemeType themeType) {
        activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
@@ -53,9 +53,9 @@ public class AESThemeUtil {
        activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
    }

-    /*public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
+    public static <T extends WinBollActivity> void applyWinBollTheme(Activity activity, AESThemeBean.ThemeType themeType) {
        activity.setTheme(AESThemeBean.getThemeStyleID(themeType));
-    }*/
+    }

    public static <T extends Activity> void inflateMenu(T activity, Menu menu) {
        activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
@@ -65,9 +65,9 @@ public class AESThemeUtil {
        activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
    }

-    /*public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
+    public static <T extends WinBollActivity> void inflateWinBollMenu(T activity, Menu menu) {
        activity.getMenuInflater().inflate(R.menu.toolbar_apptheme, menu);
-    }*/
+    }

    public static <T extends Activity> boolean onAppThemeItemSelected(T activity, MenuItem item) {
        int nThemeStyleID;
@@ -92,7 +92,7 @@ public class AESThemeUtil {
            saveThemeStyleID(activity, nThemeStyleID);
            return true;
        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
            saveThemeStyleID(activity, nThemeStyleID);
            return true;
        }
@@ -123,7 +123,7 @@ public class AESThemeUtil {
            saveThemeStyleID(activity, nThemeStyleID);
            return true;
        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
            saveThemeStyleID(activity, nThemeStyleID);
            return true;
        }
@@ -131,7 +131,7 @@ public class AESThemeUtil {
        return false;
    }

-    public static <T extends AppCompatActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
+    public static <T extends WinBollActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
        int nThemeStyleID;
        if (R.id.item_depththeme == item.getItemId()) {
            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
@@ -154,38 +154,7 @@ public class AESThemeUtil {
            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
            return true;
        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        }
-
-        return false;
-    }
-    
-    public static <T extends DrawerFragmentActivity> boolean onWinBollThemeItemSelected(T activity, MenuItem item) {
-        int nThemeStyleID;
-        if (R.id.item_depththeme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEPTH);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_skytheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.SKY);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_goldentheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.GOLDEN);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_memortheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.MEMOR);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_taotheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.TAO);
-            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
-            return true;
-        } else if (R.id.item_defaulttheme == item.getItemId()) {
-            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.AES);
+            nThemeStyleID = AESThemeBean.getThemeStyleID(AESThemeBean.ThemeType.DEFAULT);
            saveThemeStyleID(activity.getApplicationContext(), nThemeStyleID);
            return true;
        }
--- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AOHPCTCSeekBar.java
@@ -6,30 +6,24 @@ package cc.winboll.studio.libaes.views;
 * @Describe AOneHundredPercantClickToCommitSeekBar
 */
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.SeekBar;
-import cc.winboll.studio.libappbase.LogUtils;

 public class AOHPCTCSeekBar extends SeekBar {

    public static final String TAG = "AOHPCTCSeekBar";

-    volatile int thumbWidth = 1;
-    volatile int progressBarWidth = 1;
-    // 设置按钮模糊右边边缘像素
-    volatile int blurRightDP = 1;
-    // 是否从起点拉动的标志
-    volatile boolean isStartSeek = false;
-
+    // 可开始拉动的起始位置(百分比值)
+    static final int ENABLE_POST_PERCENT_X = 20;
+    // 最小拉动值，滑块拉动值要超过这个值，确定事件才会提交。
+    static final int TO_MIN_VALUE = 15;
    // 外部接口对象，确定事件提交会调用该对象的方法
    OnOHPCListener mOnOHPCListener;
-
-
-    public void setBlurRightDP(int blurRight) {
-        this.blurRightDP = blurRight;
-    }
+    // 是否从起点拉动的标志
+    boolean mIsStartTo = false;
+    // 拉动的滑动值
+    int mnTo = 0;

    public void setOnOHPCListener(OnOHPCListener listener) {
        mOnOHPCListener = listener;
@@ -41,68 +35,83 @@ public class AOHPCTCSeekBar extends SeekBar {

    public AOHPCTCSeekBar(Context context) {
        super(context);
-        initView(context);
    }

    public AOHPCTCSeekBar(Context context, AttributeSet attrs) {
        super(context, attrs);
-        initView(context);
+
+        //LogUtils.d(TAG, "AOHPCTCSeekBar(...)");
+
+        // 获得TypedArray
+        //TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AToolbar);
+        // 获得attrs.xml里面的属性值,格式为:名称_属性名,后面是默认值
+        //int colorBackgroud = a.getColor(R.styleable.ACard_backgroudColor, context.getColor(R.color.colorACardBackgroung));
+        //int centerColor = a.getColor(R.styleable.AToolbar_centerColor, context.getColor(R.color.colorAToolbarCenterColor));
+        //int endColor = a.getColor(R.styleable.AToolbar_endColor, context.getColor(R.color.colorAToolbarEndColor));
+        //float tSize = a.getDimension(R.styleable.CustomView_tSize, 35);
+        //p.setColor(tColor);
+        //p.setTextSize(tSize);
+        //Drawable drawable = context.getDrawable(R.drawable.frame_atoolbar);
+
+        //setBackground(context.getDrawable(R.drawable.acard_frame_main));
+
+        // 返回一个绑定资源结束的信号给资源
+        //a.recycle();
    }

    public AOHPCTCSeekBar(Context context, AttributeSet attrs, int defStyleAttr) {
        super(context, attrs, defStyleAttr);
-        initView(context);
    }

-    void initView(Context context) {
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
    }

    @Override
    public boolean dispatchTouchEvent(MotionEvent event) {
        if (event.getAction() == MotionEvent.ACTION_DOWN) {
-            if (thumbWidth + blurRightDP > event.getX() && event.getX() > 0) {
-                getParent().requestDisallowInterceptTouchEvent(true);
-                isStartSeek = true;
+            //LogUtils.d(TAG, "ACTION_DOWN");
+            // 有效的拖动起始位置(ENABLE_POST_PERCENT_X)%
+            int nEnablePostX = ((getRight() - getLeft()) * ENABLE_POST_PERCENT_X / 100) + getLeft();
+
+            if ((getLeft() < event.getX())
+                && (event.getX() < nEnablePostX)) {
+                //LogUtils.d(TAG, "event.getX() is " + Float.toString(event.getX()));
+                mIsStartTo = true;
+                return super.dispatchTouchEvent(event);
+            }
+            if (!mIsStartTo) {
+                resetView();
+                return false;
            }
        } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-            if (isStartSeek) {
-                super.dispatchTouchEvent(event);
+            //LogUtils.d(TAG, "ACTION_MOVE");
+            if (mIsStartTo) {
+                mnTo++;
            }
-        } else if (event.getAction() == MotionEvent.ACTION_UP 
-                   || event.getAction() == MotionEvent.ACTION_CANCEL) {
-            getParent().requestDisallowInterceptTouchEvent(false);
-            if (getProgress() == progressBarWidth) {
+        } else if (event.getAction() == MotionEvent.ACTION_UP) {
+            //LogUtils.d(TAG, Integer.toString(getProgress()));
+            // 提交100%确定事件
+            if ((getProgress() == 100) && (mnTo > TO_MIN_VALUE)) {
+                //LogUtils.d(TAG, "Commit mnTo is " + Integer.toString(mnTo));
                mOnOHPCListener.onOHPCommit();
+                //resetView();
+                //return true;
            }
-            // 重置控件状态
-            setProgress(0);
-            isStartSeek = false;
+            resetView();
+            return false;
        }
-        return true;
+        //LogUtils.d(TAG, "dispatchTouchEvent End");
+        return super.dispatchTouchEvent(event);
    }

-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        int width = MeasureSpec.getSize(widthMeasureSpec);
-        //int height = MeasureSpec.getSize(heightMeasureSpec);
-        //LogUtils.d(TAG, String.format("width %d height %d", width, height));
-
-        // 获取SeekBar的图标宽度
-        Drawable thumbDrawable = getThumb();
-        if (thumbDrawable != null) {
-            // 获取图标宽度
-            thumbWidth = thumbDrawable.getIntrinsicWidth();
-        }
-
-        // 获取进度条宽度
-        progressBarWidth = width;
-
-        //LogUtils.d(TAG, String.format("thumbWidth %d progressBarWidth %d", thumbWidth, progressBarWidth));
-
-        // 设置图标位置
-        setThumbOffset(0);
-        // 设置进度条刻度
-        setMax(progressBarWidth);
+    // 重置控件状态
+    //
+    void resetView() {
+        setProgress(0);
+        mnTo = 0;
+        mIsStartTo = false;
    }
 }
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBollActivity.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBollActivity.java
@@ -1,23 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/24 08:23:40
- * @Describe WinBoll 活动窗口通用接口
- */
-import android.content.Context;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-
-public interface IWinBollActivity {
-
-    public static final String TAG = "IWinBollActivity";
-
-    // 获取应用资源上下文
-    abstract public Context getApplicationContext();
-    abstract public APPInfo getAppInfo();
-    abstract public String getTag();
-    abstract public Toolbar initToolBar();
-    abstract public boolean isEnableDisplayHomeAsUp();
-    abstract public boolean isAddWinBollToolBar();
-}
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/MyActivityLifecycleCallbacks.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/MyActivityLifecycleCallbacks.java
@@ -1,97 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/24 08:24:52
- */
-import android.app.Activity;
-import android.app.Application;
-import android.content.Intent;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils; 
-
-public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
-
-    public static final String TAG = "MyActivityLifecycleCallbacks";
-
-    public String mInfo = "";
-
-    public MyActivityLifecycleCallbacks() {
-    }
-
-    void createActivityeInfo(Activity activity) {
-        StringBuilder sb = new StringBuilder();
-        Intent receivedIntent = activity.getIntent();
-        sb.append("\nCallingActivity : \n");
-        if (activity.getCallingActivity() != null) {
-            sb.append(activity.getCallingActivity().getPackageName());
-        }
-        sb.append("\nReceived Intent Package : \n");
-        sb.append(receivedIntent.getPackage());
-
-        Bundle extras = receivedIntent.getExtras();
-        if (extras != null) {
-            for (String key : extras.keySet()) {
-                sb.append("\nIntentInfo");
-                sb.append("\n键: ");
-                sb.append(key);
-                sb.append(", 值: ");
-                sb.append(extras.get(key));
-                //Log.d("IntentInfo", "键: " + key + ", 值: " + extras.get(key));
-            }
-        }
-        mInfo = sb.toString();
-        //Log.d("IntentInfo", "发送Intent的应用包名: " + senderPackage);
-    }
-
-    public void showActivityeInfo() {
-        ToastUtils.show("ActivityeInfo : " + mInfo);
-        LogUtils.d(TAG, "ActivityeInfo : " + mInfo);
-    }
-
-    @Override 
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) { 
-        // 在这里可以做一些初始化相关的操作，例如记录Activity的创建时间等 
-        //System.out.println(activity.getLocalClassName() + " was created"); 
-        LogUtils.d(TAG, activity.getLocalClassName() + " was created");
-        createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityStarted(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was started");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was started");
-        //createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityResumed(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was resumed");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was resumed");
-        //createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityPaused(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was paused");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was paused");
-    } 
-
-    @Override 
-    public void onActivityStopped(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was stopped");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was stopped");
-    } 
-
-    @Override 
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) { 
-        // 可以在这里添加保存状态的自定义逻辑 
-    } 
-
-    @Override 
-    public void onActivityDestroyed(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was destroyed");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-    } 
-}
--- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollActivityManager.java
+++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollActivityManager.java
@@ -1,318 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/24 08:25:43
- * @Describe 应用活动窗口管理器
- * 参考 ：
- * android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label
- * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
- */
-import android.app.ActivityManager;
-import android.app.TaskStackBuilder;
-import android.content.Context;
-import android.content.Intent;
-import cc.winboll.studio.libappbase.LogUtils;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-public class WinBollActivityManager {
-
-//    public static final String TAG = "WinBollActivityManager";
-//    public static final String EXTRA_TAG = "EXTRA_TAG";
-//
-//    public static enum WinBollUI_TYPE {
-//        Aplication, // 退出应用后，保持最近任务栏任务记录主窗口
-//        Service // 退出应用后，清理所有最近任务栏任务记录窗口
-//        };
-//
-//    // 应用类型标志
-//    volatile static WinBollUI_TYPE _mWinBollUI_TYPE = WinBollUI_TYPE.Service;
-//
-//    Context mContext;
-//    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
-//    static WinBollActivityManager _mWinBollActivityManager;
-//    static Map<String, IWinBollActivity> _mapIWinBollList;
-//    IWinBollActivity firstIWinBollActivity;
-//
-//    public WinBollActivityManager(Context context) {
-//        mContext = context;
-//        LogUtils.d(TAG, "WinBollActivityManager()");
-//        _mapIWinBollList = new HashMap<String, IWinBollActivity>();
-//    }
-//
-//    public static synchronized WinBollActivityManager getInstance(Context context) {
-//        LogUtils.d(TAG, "getInstance");
-//        if (_mWinBollActivityManager == null) {
-//            LogUtils.d(TAG, "_mWinBollActivityManager == null");
-//            _mWinBollActivityManager = new WinBollActivityManager(context);
-//        }
-//        return _mWinBollActivityManager;
-//    }
-//
-//    //
-//    // 设置 WinBoll 应用 UI 类型
-//    //
-//    public synchronized static void setWinBollUI_TYPE(WinBollUI_TYPE mWinBollUI_TYPE) {
-//        _mWinBollUI_TYPE = mWinBollUI_TYPE;
-//    }
-//
-//    //
-//    // 获取 WinBoll 应用 UI 类型
-//    //
-//    public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() {
-//        return _mWinBollUI_TYPE;
-//    }
-//
-//    //
-//    // 把Activity添加到管理中
-//    //
-//    public <T extends IWinBollActivity> void add(T iWinBoll) {
-//        if (isActive(iWinBoll.getTag())) {
-//            LogUtils.d(TAG, String.format("add(...) %s is active.", iWinBoll.getTag()));
-//        } else {
-//            // 设置起始活动窗口，以便最后退出时提问
-//            if (firstIWinBollActivity == null && _mapIWinBollList.size() == 0) {
-//                firstIWinBollActivity = iWinBoll;
-//            }
-//
-//            // 添加到活动窗口列表
-//            _mapIWinBollList.put(iWinBoll.getTag(), iWinBoll);
-//            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoll.getTag(), _mapIWinBollList.size()));
-//        }
-//    }
-//
-//
-//    //
-//    // activity: 为 null 时，
-//    // intent.putExtra 函数 EXTRA_TAG 参数为 tag
-//    // activity: 不为 null 时，
-//    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
-//    //
-//    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Class<T> clazz) {
-//        try {
-//            // 如果窗口已存在就重启窗口
-//            String tag = clazz.newInstance().getTag();
-//            if (isActive(tag)) {
-//                resumeActivity(context, tag);
-//                return;
-//            }
-//
-//            // 新建一个任务窗口
-//            Intent intent = new Intent(context, clazz);
-//            //打开多任务窗口 flags
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//            intent.putExtra(EXTRA_TAG, tag);
-//            mContext.startActivity(intent);
-//        } catch (InstantiationException | IllegalAccessException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    public <T extends IWinBollActivity> void startWinBollActivity(Context context, Intent intent, Class<T> clazz) {
-//        try {
-//            // 如果窗口已存在就重启窗口
-//            String tag = clazz.newInstance().getTag();
-//            if (isActive(tag)) {
-//                resumeActivity(context, tag);
-//                return;
-//            }
-//
-//            // 新建一个任务窗口
-//            //Intent intent = new Intent(context, clazz);
-//            //打开多任务窗口 flags
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//            intent.putExtra(EXTRA_TAG, tag);
-//            mContext.startActivity(intent);
-//        } catch (InstantiationException | IllegalAccessException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
-//        return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
-//    }
-//
-//    //
-//    // 判断 tag绑定的 MyActivity是否存在
-//    //
-//    public boolean isActive(String tag) {
-//        //printAvtivityListInfo();
-//        IWinBollActivity iWinBoll = getIWinBoll(tag);
-//        if (iWinBoll != null) {
-//            LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
-//            //ToastUtils.show("activity != null tag " + tag);
-//            //判断是否为 BaseActivity,如果已经销毁，则移除
-//            if (iWinBoll.getActivity().isFinishing() || iWinBoll.getActivity().isDestroyed()) {
-//                _mapIWinBollList.remove(iWinBoll.getTag());
-//                //_mWinBollActivityList.remove(activity);
-//                LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
-//                return false;
-//            } else {
-//                LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag));
-//                return true;
-//            }
-//        } else {
-//            LogUtils.d(TAG, String.format("isActive(...) activity == null\ntag : %s", tag));
-//            return false;
-//        }
-//    }
-//
-//    static IWinBollActivity getIWinBoll(String tag) {
-//        return _mapIWinBollList.get(tag);
-//    }
-//
-//    //
-//    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-//    //
-//    public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
-//        LogUtils.d(TAG, "resumeActivty");
-//        T iWinBoll = (T)getIWinBoll(tag);
-//        //LogUtils.d(TAG, "activity " + activity.getTag());
-//        if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
-//            resumeActivity(context, iWinBoll);
-//        }
-//    }
-//
-//    //
-//    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-//    //
-//    public <T extends IWinBollActivity> void resumeActivity(Context context, T iWinBoll) {
-//        ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-//        //返回启动它的根任务（home 或者 MainActivity）
-//        Intent intent = new Intent(context, iWinBoll.getClass());
-//        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
-//        stackBuilder.addNextIntentWithParentStack(intent);
-//        stackBuilder.startActivities();
-//        //moveTaskToFront(YourTaskId, 0);
-//        LogUtils.d(TAG, "am.moveTaskToFront");
-//        //ToastUtils.show("resumeActivity am.moveTaskToFront");
-//        am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
-//    }
-//
-//
-//    //
-//    // 结束所有 Activity
-//    //
-//    public void finishAll() {
-//        try {
-//            for (String key : _mapIWinBollList.keySet()) {
-//                //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
-//                IWinBollActivity iWinBoll = _mapIWinBollList.get(key);
-//                //ToastUtils.show("finishAll() activity");
-//                if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
-//                    //ToastUtils.show("activity != null ...");
-//                    if (getWinBollUI_TYPE() == WinBollUI_TYPE.Service) {
-//                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
-//                        iWinBoll.getActivity().finishAndRemoveTask();
-//                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
-//                    } else if (getWinBollUI_TYPE() == WinBollUI_TYPE.Aplication) {
-//                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
-//                        iWinBoll.getActivity().finish();
-//                        //ToastUtils.show("finishAll() activity.finish();");
-//                    } else {
-//                        LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error.");
-//                        //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error.");
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    //
-//    // 结束指定Activity
-//    //
-//    public <T extends IWinBollActivity> void finish(T iWinBoll) {
-//        try {
-//            if (iWinBoll != null && !iWinBoll.getActivity().isFinishing() && !iWinBoll.getActivity().isDestroyed()) {
-//                //根据tag 移除 MyActivity
-//                //String tag= activity.getTag();
-//                //_mWinBollActivityList.remove(tag);
-//                //ToastUtils.show("remove");
-//                //ToastUtils.show("_mWinBollActivityArrayMap.size() " + Integer.toString(_mWinBollActivityArrayMap.size()));
-//
-//                // 窗口回调规则：
-//                // [] 当前窗口位置 >> 调度出的窗口位置
-//                // ★：[0] 1 2 3 4 >> 1
-//                // ★：0 1 [2] 3 4 >> 1
-//                // ★：0 1 2 [3] 4 >> 2
-//                // ★：0 1 2 3 [4] >> 3
-//                // ★：[0] >> 直接关闭当前窗口
-//                LogUtils.d(TAG, "finish no yet.");
-//                IWinBollActivity preIWinBoll = getPreIWinBoll(iWinBoll);
-//                iWinBoll.getActivity().finish();
-//                if (preIWinBoll != null) {
-//                    resumeActivity(mContext, preIWinBoll);
-//                }
-//            }
-//
-//        } catch (Exception e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    //
-//    // 获取窗口队列中的前一个窗口
-//    //
-//    IWinBollActivity getPreIWinBoll(IWinBollActivity iWinBoll) {
-//        try {
-//            boolean bingo = false;
-//            IWinBollActivity preIWinBoll = null;
-//            for (Map.Entry<String, IWinBollActivity> entity : _mapIWinBollList.entrySet()) {
-//                if (entity.getKey().equals(iWinBoll.getTag())) {
-//                    bingo = true;
-//                    LogUtils.d(TAG, "bingo");
-//                    break;
-//                }
-//                preIWinBoll = entity.getValue();
-//            }
-//
-//            if (bingo) {
-//                return preIWinBoll;
-//            }
-//        } catch (Exception e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//
-//        return null;
-//    }
-//
-//    //
-//    // 从管理列表中移除管理项
-//    //
-//    public <T extends IWinBollActivity> boolean registeRemove(T activity) {
-//        IWinBollActivity iWinBollTest = _mapIWinBollList.get(activity.getTag());
-//        if (iWinBollTest != null) {
-//            _mapIWinBollList.remove(activity.getTag());
-//            return true;
-//        }
-//        return false;
-//    }
-//
-//    //
-//    // 打印管理列表项列表里的信息
-//    //
-//    public static void printIWinBollListInfo() {
-//        //LogUtils.d(TAG, "printAvtivityListInfo");
-//        if (!_mapIWinBollList.isEmpty()) {
-//            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBollList.size()));
-//            Iterator<Map.Entry<String, IWinBollActivity>> iterator = _mapIWinBollList.entrySet().iterator();
-//            while (iterator.hasNext()) {
-//                Map.Entry<String, IWinBollActivity> entry = iterator.next();
-//                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
-//                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
-//            }
-//            sb.append("\nMap entries end.");
-//            LogUtils.d(TAG, sb.toString());
-//        } else {
-//            LogUtils.d(TAG, "The map is empty.");
-//        }
-//    }
-}
--- a/libaes/src/main/res/drawable/ic_call.xml
+++ b/libaes/src/main/res/drawable/ic_call.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M6.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0,0 1,21 16.5V20A1,1 0,0 1,20 21A17,17 0,0 1,3 4A1,1 0,0 1,4 3H7.5A1,1 0,0 1,8.5 4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z"/>
-
-</vector>
--- a/libaes/src/main/res/layout/activity_library.xml
+++ b/libaes/src/main/res/layout/activity_library.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/activitylibraryFrameLayout1"/>
+
+</LinearLayout>
+
--- a/libaes/src/main/res/layout/fragment_viewpage.xml
+++ b/libaes/src/main/res/layout/fragment_viewpage.xml
@@ -2,7 +2,7 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:orientation="vertical"
+    android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:gravity="center_vertical">
@@ -12,49 +12,49 @@
 		android:layout_height="wrap_content"
 		android:text="AOHPCTCSeekBar"/>

-	<androidx.viewpager.widget.ViewPager
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:id="@+id/fragmentviewpageViewPager1"/>
+	<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+		android:layout_width="300dp"
+		android:layout_height="wrap_content"
+		android:id="@+id/fragmentviewpageAOHPCTCSeekBar1"/>

-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="60dp"
-		android:orientation="horizontal"
-		android:gravity="center"
-		android:id="@+id/fragmentviewpageLinearLayout1">
+    <androidx.viewpager.widget.ViewPager
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1.0"
+        android:id="@+id/fragmentviewpageViewPager1"/>

-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="5dp"
-			tools:ignore="ContentDescription"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:id="@+id/fragmentviewpageLinearLayout1">

-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="5dp"
-			tools:ignore="ContentDescription"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            tools:ignore="ContentDescription"/>

-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="5dp"
-			tools:ignore="ContentDescription"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            tools:ignore="ContentDescription"/>

-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="5dp"
-			tools:ignore="ContentDescription"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            tools:ignore="ContentDescription"/>

-	</LinearLayout>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            tools:ignore="ContentDescription"/>

-	<cc.winboll.studio.libappbase.LogView
-		android:layout_width="match_parent"
-		android:layout_height="300dp"
-		android:id="@+id/logview"/>
+    </LinearLayout>

 </LinearLayout>

--- a/libaes/src/main/res/layout/viewpage_aohpctcsb.xml
+++ b/libaes/src/main/res/layout/viewpage_aohpctcsb.xml
@@ -11,25 +11,6 @@
        android:layout_height="wrap_content"
        android:text="AOHPCTCSeekBar"/>
    
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-
-        <cc.winboll.studio.libaes.views.AOHPCTCSeekBar
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragmentviewpageAOHPCTCSeekBar1"
-            android:padding="10dp"/>
-
-        <cc.winboll.studio.libaes.views.AOHPCTCSeekBar
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:id="@+id/fragmentviewpageAOHPCTCSeekBar2"
-            android:padding="10dp"/>
-
-    </LinearLayout>
 	
 </LinearLayout>

--- a/libaes/src/main/res/menu/toolbar_library.xml
+++ b/libaes/src/main/res/menu/toolbar_library.xml
@@ -13,7 +13,7 @@
    <item
        android:id="@+id/item_localfileselectdialog"
        android:title="LocalFileSelectDialog"/>
-
+    
    <item
        android:id="@+id/item_atoolbar"
        android:title="Test AToolbar"/>
--- a/libaes/src/main/res/values/attrs.xml
+++ b/libaes/src/main/res/values/attrs.xml
@@ -32,13 +32,6 @@
        <attr name="attrASupportToolbarEndColor"/>
    </declare-styleable>
    
-    <declare-styleable name="AButton">
-        <attr name="attrAButtonTextColor" format="color" />
-        <attr name="attrAButtonPrimary" format="color" />
-        <attr name="attrAButtonPrimaryDark" format="color" />
-        <attr name="attrAButtonAccent" format="color" />
-    </declare-styleable>
-    
    <attr name="ActionSheetList" format="reference"/>
    <!--<declare-styleable name="AToolbarStyle">
 		<attr name="attrAToolbarStartColor" format="color" />
--- a/libaes/src/main/res/values/colors.xml
+++ b/libaes/src/main/res/values/colors.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
    <!-- 默认方案 -->
    <color name="colorPrimary">#FF03AB4E</color>
    <color name="colorPrimaryDark">#FF027C39</color>
    <color name="colorAccent">#FF3DDC84</color>
-	<color name="colorText">#FFFFFB8D</color>
-    <color name="colorToastFrame">#FFA9A9A9</color>
+	<color name="colorToastFrame">#FFA9A9A9</color>
    <color name="colorToastShadow">#FF000000</color>
    <color name="colorToastBackgroung">#FFFFFFFF</color>
    <color name="colorAToolbarStartColor">#FF7D3F12</color>
@@ -16,16 +14,16 @@
    <color name="colorACardShadow">@color/colorPrimaryDark</color>
    <color name="colorACardFrame">@color/colorPrimary</color>
    <color name="colorACardBackgroung">@color/colorAccent</color>
-
+    
    <color name="colorATickProgressBarBackgroung">@color/colorAccent</color>
    <color name="colorATickProgressBarProgress">@color/colorPrimary</color>
-
+    
    <color name="colorOHPCTSBackground">@color/colorAccent</color>
    <color name="colorOHPCTSSecondaryProgress">@color/colorPrimary</color>
    <color name="colorOHPCTSProgress">@color/colorPrimaryDark</color>
-
+    
    <!-- -->
-
+    
    <!-- 调试方案 
    <color name="colorPrimary">#FF727272</color>
    <color name="colorPrimaryDark">#FF444444</color>
@@ -41,5 +39,5 @@

    <color name="colorATickProgressBarBackgroung">#FF6DC4E2</color>
    <color name="colorATickProgressBarProgress">#FF22B0E1</color>
-    -->
+     -->
 </resources>
--- a/libaes/src/main/res/values/styles.xml
+++ b/libaes/src/main/res/values/styles.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    
    <style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
        <item name="colorTextColor">#FF000000</item>
-        <item name="colorPrimary">#FF03AB4E</item>
-        <item name="colorPrimaryDark">#FF027C39</item>
-        <item name="colorAccent">#FF3DDC84</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
        <item name="android:textColor">#FF000000</item>
        <item name="aToolbar">@style/AESAToolbar</item>
        <item name="aSupportToolbar">@style/AESASupportToolbar</item>
@@ -23,196 +24,158 @@
        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
    </style>
+    

-    <style name="DepthAESTheme" parent="AESTheme">
+    <style name="DefaultAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorTextColor">#FF000000</item>
+        <item name="colorPrimary">#FF03AB4E</item>
+        <item name="colorPrimaryDark">#FF027C39</item>
+        <item name="colorAccent">#FF3DDC84</item>
+        <item name="android:textColor">#FF000000</item>
+        <item name="aToolbar">@style/DefaultAToolbar</item>
+        <item name="aSupportToolbar">@style/DefaultASupportToolbar</item>
+    </style>
+
+    <style name="DefaultAToolbar">
+        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="DefaultASupportToolbar">
+        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+    
+
+    <style name="DepthAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FF2566FE</item>
        <item name="colorPrimaryDark">#FF1359FF</item>
        <item name="colorAccent">#FF8BAEFF</item>
        <item name="android:textColor">#FF000000</item>
+        <item name="aToolbar">@style/DepthAToolbar</item>
+        <item name="aSupportToolbar">@style/DepthASupportToolbar</item>
    </style>

-    <style name="SkyAESTheme" parent="AESTheme">
+    <style name="DepthAToolbar">
+        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="DepthASupportToolbar">
+        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+    
+    <style name="SkyAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FF1E98D4</item>
        <item name="colorPrimaryDark">#FF046A9C</item>
        <item name="colorAccent">#FF8CD9FF</item>
        <item name="android:textColor">#FF000000</item>
+        <item name="aToolbar">@style/SkyAToolbar</item>
+        <item name="aSupportToolbar">@style/SkyASupportToolbar</item>
    </style>

-    <style name="GoldenAESTheme" parent="AESTheme">
+    <style name="SkyAToolbar">
+        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="SkyASupportToolbar">
+        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+    
+    <style name="GoldenAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FFFFE22A</item>
        <item name="colorPrimaryDark">#FFAE9600</item>
        <item name="colorAccent">#FFFFED78</item>
        <item name="android:textColor">#FF000000</item>
+        <item name="aToolbar">@style/GoldenAToolbar</item>
+        <item name="aSupportToolbar">@style/GoldenASupportToolbar</item>
    </style>

-    <style name="MemorAESTheme" parent="AESTheme">
+    <style name="GoldenAToolbar">
+        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="GoldenASupportToolbar">
+        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+    
+    <style name="MemorAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FFCE1ED4</item>
        <item name="colorPrimaryDark">#FFB500BC</item>
        <item name="colorAccent">#FFE653EB</item>
        <item name="android:textColor">#FF000000</item>
+        <item name="aToolbar">@style/MemorAToolbar</item>
+        <item name="aSupportToolbar">@style/MemorASupportToolbar</item>
    </style>

-    <style name="TaoAESTheme" parent="AESTheme">
+    <style name="MemorAToolbar">
+        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="MemorASupportToolbar">
+        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+    
+    <style name="TaoAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
        <item name="colorTextColor">#FF000000</item>
        <item name="colorPrimary">#FF9F9F9F</item>
        <item name="colorPrimaryDark">#FF5E5E5E</item>
        <item name="colorAccent">#FFD9D9D9</item>
        <item name="android:textColor">#FF000000</item>
-    </style>
-
-    <!--<style name="AESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/AESAToolbar</item>
-    <item name="aSupportToolbar">@style/AESASupportToolbar</item>
-    </style>
-
-    <style name="AESAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="AESASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>-->
-
-    <!--<style name="DepthAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF2566FE</item>
-    <item name="colorPrimaryDark">#FF1359FF</item>
-    <item name="colorAccent">#FF8BAEFF</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/DepthAToolbar</item>
-    <item name="aSupportToolbar">@style/DepthASupportToolbar</item>
-    </style>
-
-    <style name="DepthAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="DepthASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="SkyAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF1E98D4</item>
-    <item name="colorPrimaryDark">#FF046A9C</item>
-    <item name="colorAccent">#FF8CD9FF</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/SkyAToolbar</item>
-    <item name="aSupportToolbar">@style/SkyASupportToolbar</item>
-    </style>
-
-    <style name="SkyAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="SkyASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="GoldenAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FFFFE22A</item>
-    <item name="colorPrimaryDark">#FFAE9600</item>
-    <item name="colorAccent">#FFFFED78</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/GoldenAToolbar</item>
-    <item name="aSupportToolbar">@style/GoldenASupportToolbar</item>
-    </style>
-
-    <style name="GoldenAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="GoldenASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="MemorAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FFCE1ED4</item>
-    <item name="colorPrimaryDark">#FFB500BC</item>
-    <item name="colorAccent">#FFE653EB</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/MemorAToolbar</item>
-    <item name="aSupportToolbar">@style/MemorASupportToolbar</item>
-    </style>
-
-    <style name="MemorAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="MemorASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="TaoAESTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorTextColor">#FF000000</item>
-    <item name="colorPrimary">#FF9F9F9F</item>
-    <item name="colorPrimaryDark">#FF5E5E5E</item>
-    <item name="colorAccent">#FFD9D9D9</item>
-    <item name="android:textColor">#FF000000</item>
-    <item name="aToolbar">@style/TaoAToolbar</item>
-    <item name="aSupportToolbar">@style/TaoASupportToolbar</item>
+        <item name="aToolbar">@style/TaoAToolbar</item>
+        <item name="aSupportToolbar">@style/TaoASupportToolbar</item>
    </style>

    <style name="TaoAToolbar">
-    <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrAToolbarEndColor">?attr/colorAccent</item>
+        <item name="attrAToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrAToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrAToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrAToolbarEndColor">?attr/colorAccent</item>
    </style>

    <style name="TaoASupportToolbar">
-    <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
-    <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
-    <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
-    <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
-    </style>-->
-
+        <item name="attrASupportToolbarTitleTextColor">?attr/colorTextColor</item>
+        <item name="attrASupportToolbarStartColor">?attr/colorPrimaryDark</item>
+        <item name="attrASupportToolbarCenterColor">?attr/colorPrimary</item>
+        <item name="attrASupportToolbarEndColor">?attr/colorAccent</item>
+    </style>
+    
    <!--<style name="AToolbar">
-    <item name="attrAToolbarTitleTextColor">#FF2DDA27</item>
-    <item name="attrAToolbarStartColor">#FF2DDA27</item>
-    <item name="attrAToolbarCenterColor">#FF2DDA27</item>
-    <item name="attrAToolbarEndColor">#FF2DDA27</item>
+        <item name="attrAToolbarTitleTextColor">#FF2DDA27</item>
+        <item name="attrAToolbarStartColor">#FF2DDA27</item>
+        <item name="attrAToolbarCenterColor">#FF2DDA27</item>
+		<item name="attrAToolbarEndColor">#FF2DDA27</item>
    </style>-->

    <!--对话框的样式-->
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -21,32 +21,4 @@ android {

 dependencies {
    api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.github.getActivity:XXPermissions:18.63'
-    // 下拉控件
-    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    // 拼音搜索
-    // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
-    implementation 'com.github.open-android:pinyin4j:2.5.0'
-    // SSH
-    implementation 'com.jcraft:jsch:0.1.55'
-    // Html 解析
-    implementation 'org.jsoup:jsoup:1.13.1'
-    // 二维码类库
-    implementation 'com.google.zxing:core:3.4.1'
-    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
-    // 网络连接类库
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    // Android 类库
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'androidx.fragment:fragment:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
-    
-    implementation 'cc.winboll.studio:libappbase:15.0.5'
-    implementation 'cc.winboll.studio:libapputils:15.0.2'
 }
--- a/powerbell/build.gradle
+++ b/powerbell/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.powerbell"
-        minSdkVersion 24
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
        versionCode 6
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "4.0" 
+        versionName "15.0" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
@@ -41,15 +41,35 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }

 dependencies {
-	api 'cc.winboll.studio:winboll-shared:1.8.0'
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // 应用介绍页类库
+    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:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.15'
+    api 'cc.winboll.studio:libaes:15.0.7'
+
+	/*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 'com.jcraft:jsch:0.1.55'
@@ -67,6 +87,5 @@ dependencies {
    api 'com.squareup.okhttp3:okhttp:4.4.1'
    
    api 'cc.winboll.studio:libaes:7.6.0'
-    
-    api fileTree(dir: 'libs', include: ['*.jar'])
+    */
 }
--- a/powerbell/build.properties
+++ b/powerbell/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 11:13:45 HKT 2025
-stageCount=6
+#Tue Mar 25 02:43:07 HKT 2025
+stageCount=4
 libraryProject=
-baseVersion=4.0
-publishVersion=4.0.5
+baseVersion=15.0
+publishVersion=15.0.3
 buildCount=0
-baseBetaVersion=4.0.6
+baseBetaVersion=15.0.4
--- a/powerbell/src/beta/AndroidManifest.xml
+++ b/powerbell/src/beta/AndroidManifest.xml
@@ -6,20 +6,18 @@
        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>
--- a/powerbell/src/main/AndroidManifest.xml
+++ b/powerbell/src/main/AndroidManifest.xml
@@ -2,10 +2,9 @@
 <manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="cc.winboll.studio.powerbell">
-    
-    <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.CAMERA"/>

    <!-- 运行前台服务 -->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -22,8 +21,15 @@
    <!-- 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=".GlobalApplication"
+        android:name=".App"
        android:allowBackup="true"
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
@@ -34,7 +40,8 @@

        <activity
            android:name=".MainActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">

            <intent-filter>

@@ -110,6 +117,8 @@
            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>
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/GlobalApplication.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/GlobalApplication.java
@@ -1,15 +1,14 @@
 package cc.winboll.studio.powerbell;

 import android.content.Context;
-import android.view.Gravity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 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;
+import cc.winboll.studio.libapputils.bean.DebugBean;

-public class GlobalApplication extends WinBollApplication {
+public class App extends GlobalApplication {

    public static final String TAG = "GlobalApplication";

@@ -21,13 +20,22 @@ public class GlobalApplication extends WinBollApplication {
    @Override
    public void onCreate() {
        super.onCreate();
+        // 设置应用调试标志
+        DebugBean debugBean = DebugBean.loadBean(this, DebugBean.class);
+        if (debugBean == null) {
+            //ToastUtils.show("debugBean == null");
+            setIsDebuging(this, false);
+        } else {
+            //ToastUtils.show("saveDebugStatus(" + String.valueOf(debugBean.isDebuging()) + ")");
+            setIsDebuging(this, debugBean.isDebuging());
+        }
        
        // 初始化 Toast 框架
-        ToastUtils.init(this);
+        //ToastUtils.init(this);
        // 设置 Toast 布局样式
        //ToastUtils.setView(R.layout.toast_custom_view);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);

        // 设置数据配置存储工具
        _mAppConfigUtils = getAppConfigUtils(this);
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java
+++ b/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;
-    GlobalApplication mApplication;
+    App mApplication;
    //AppConfigUtils mAppConfigUtils;
    Menu mMenu;
    Fragment mCurrentShowFragment;
@@ -48,12 +48,13 @@ public class MainActivity extends Activity {
        mLogView.updateLogView();

        _mMainActivity = MainActivity.this;
-        mApplication = (GlobalApplication) getApplication();
+        mApplication = (App) 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) {
@@ -64,8 +65,10 @@ public class MainActivity extends Activity {
        }
        showFragment(mMainViewFragment);

-        NotificationUtils notificationUtils = new NotificationUtils(this);
-        notificationUtils.createNotificationChannel();
+//        NotificationHelper notificationUtils = new NotificationHelper(this);
+//        notificationUtils.createNotificationChannels();
+
+
    }

    void showFragment(Fragment fragment) {
@@ -113,7 +116,7 @@ public class MainActivity extends Activity {
    protected void onResume() {
        super.onResume();
        // 回到窗口自动取消提醒消息
-        NotificationUtils.cancelRemindNotification(this);
+        //NotificationHelper.cancelRemindNotification(this);

        reloadBackground();
    }
@@ -140,8 +143,11 @@ 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, AboutActivity.class);
+            intent.setClass(this, BatteryReporterActivity.class);
            startActivity(intent);
        } else if (menuItemId == R.id.action_clearrecord) {
            Intent intent = new Intent();
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java
@@ -1,42 +1,65 @@
 package cc.winboll.studio.powerbell.activities;

 /**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/07/12 13:33:59
- * @Describe AboutActivity
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 01:16:32
+ * @Describe 应用介绍窗口
 */
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
-import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
 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 {

-    public static final String TAG = "AboutActivity";
+    Context mContext;

-    AToolbar mAToolbar;
+    public static final String TAG = "AboutActivity";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_about);
+        mContext = this;

        // 初始化工具栏
-        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));
+        AToolbar mAToolbar = (AToolbar) findViewById(R.id.toolbar);
        setActionBar(mAToolbar);
+        mAToolbar.setSubtitle(getString(R.string.text_about));
+        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
        getActionBar().setDisplayHomeAsUpEnabled(true);
-        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish();
-                }
-            });
+
+        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);
    }
 }
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundPictureActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundPictureActivity.java
@@ -13,6 +13,8 @@ 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;
@@ -20,8 +22,6 @@ 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);
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BatteryReporterActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BatteryReporterActivity.java
@@ -0,0 +1,51 @@
+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);
+    }
+}
+
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java
+++ b/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.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.powerbell.App;
 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;
-    GlobalApplication mApplication;
+    App mApplication;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_clearrecord);
-        mApplication = (GlobalApplication) getApplication();
+        mApplication = (App) 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);
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java
@@ -0,0 +1,61 @@
+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);
+        }
+    }
+}
+
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/beans/AppConfigBean.java
+++ b/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.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;

--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BackgroundPictureBean.java
+++ b/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.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;

 public class BackgroundPictureBean extends BaseBean {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryData.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryData.java
@@ -0,0 +1,26 @@
+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; }
+}
+
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryInfoBean.java
+++ b/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.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;

--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/beans/ControlCenterServiceBean.java
+++ b/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.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;

 public class ControlCenterServiceBean extends BaseBean {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java
@@ -1,5 +1,4 @@
 package cc.winboll.studio.powerbell.dialogs;
-import cc.winboll.studio.powerbell.R;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@@ -10,12 +9,13 @@ 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;

--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java
@@ -17,7 +17,8 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.Switch;
 import android.widget.TextView;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -27,7 +28,6 @@ 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 = GlobalApplication.getAppConfigUtils(getActivity());
+        mAppConfigUtils = App.getAppConfigUtils(getActivity());
        
        // 获取指定ID的View实例
        final View mainImageView = mView.findViewById(R.id.fragmentmainviewImageView1);
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java
+++ b/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,6 +52,13 @@ 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;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/GlobalApplicationReceiver.java
+++ b/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.GlobalApplication;
+import cc.winboll.studio.powerbell.App;
 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.NotificationUtils;
+import cc.winboll.studio.powerbell.utils.NotificationHelper;

 public class GlobalApplicationReceiver extends BroadcastReceiver {

    public static final String TAG = "GlobalApplicationReceiver";

    AppConfigUtils mAppConfigUtils;
-    GlobalApplication mGlobalApplication;
+    App mGlobalApplication;
    // 存储电量指示值，
    // 用于校验电量消息时的电量变化
    static volatile int _mnTheQuantityOfElectricityOld = -1;
@@ -24,10 +24,10 @@ public class GlobalApplicationReceiver extends BroadcastReceiver {
    // 便利封装 registerAction() 函数
    GlobalApplicationReceiver mReceiver;

-    public GlobalApplicationReceiver(GlobalApplication globalApplication) {
+    public GlobalApplicationReceiver(App globalApplication) {
        mReceiver = this;
        mGlobalApplication = globalApplication;
-        mAppConfigUtils = GlobalApplication.getAppConfigUtils(mGlobalApplication);
+        mAppConfigUtils = App.getAppConfigUtils(mGlobalApplication);
    }

    @Override
@@ -45,9 +45,9 @@ public class GlobalApplicationReceiver extends BroadcastReceiver {
            // 新电池状态标志某一个有变化就更新显示信息
            if (_mIsCharging != isCharging || _mnTheQuantityOfElectricityOld != nTheQuantityOfElectricity) {
                // 电池状态改变先取消旧的提醒消息
-                NotificationUtils.cancelRemindNotification(context);
+                //NotificationHelper.cancelRemindNotification(context);
                
-                GlobalApplication.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity);
+                App.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity);
                MainViewFragment.sendMsgCurrentValueBattery(nTheQuantityOfElectricity);
                // 保存好新的电池状态标志
                _mIsCharging = isCharging;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/MainReceiver.java
+++ b/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.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.App;
 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 = GlobalApplication.getAppConfigUtils(context).getIsEnableService();
+            boolean isEnableService = App.getAppConfigUtils(context).getIsEnableService();
            if (isEnableService) {
                if (ServiceUtils.isServiceAlive(context.getApplicationContext(), ControlCenterService.class.getName()) == false) {
                    LogUtils.d(TAG, "wakeupAndBindMain() Wakeup... ControlCenterService");
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/AssistantService.java
+++ b/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.GlobalApplication;
+import cc.winboll.studio.powerbell.App;
 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 = GlobalApplication.getAppConfigUtils(this);
+        mAppConfigUtils = App.getAppConfigUtils(this);

        //mMyBinder = new MyBinder();
        if (mMyServiceConnection == null) {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java
@@ -8,14 +8,19 @@ package cc.winboll.studio.powerbell.services;
 * Android Service之onStartCommand方法研究
 * https://blog.csdn.net/cyp331203/article/details/38920491
 */
-import cc.winboll.studio.powerbell.R;
+import android.app.Notification;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.powerbell.GlobalApplication;
+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.beans.AppConfigBean;
 import cc.winboll.studio.powerbell.beans.NotificationMessage;
 import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler;
@@ -24,11 +29,9 @@ 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.NotificationUtils;
+import cc.winboll.studio.powerbell.utils.NotificationHelper;
 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 {

@@ -43,7 +46,8 @@ public class ControlCenterService extends Service {
    AppConfigUtils mAppConfigUtils;
    AppCacheUtils mAppCacheUtils;
    // 前台服务通知工具
-    NotificationUtils mNotificationUtils;
+    NotificationHelper mNotificationHelper;
+    Notification notification;
    RemindThread mRemindThread;
    ControlCenterServiceHandler mControlCenterServiceHandler;
    MyServiceConnection mMyServiceConnection;
@@ -64,9 +68,11 @@ public class ControlCenterService extends Service {
        super.onCreate();
        _mControlCenterService = ControlCenterService.this;
        isServiceRunning = false;
-        mAppConfigUtils = GlobalApplication.getAppConfigUtils(this);
-        mAppCacheUtils = GlobalApplication.getAppCacheUtils(this);
-        mNotificationUtils = new NotificationUtils(ControlCenterService.this);
+        mAppConfigUtils = App.getAppConfigUtils(this);
+        mAppCacheUtils = App.getAppCacheUtils(this);
+        mNotificationHelper = new NotificationHelper(ControlCenterService.this);
+        
+        
        if (mMyServiceConnection == null) {
            mMyServiceConnection = new MyServiceConnection();
        }
@@ -92,10 +98,16 @@ public class ControlCenterService extends Service {
            // 唤醒守护进程
            wakeupAndBindAssistant();
            // 显示前台通知栏
-            NotificationMessage notificationMessage=createNotificationMessage();
-            //Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show();
-            mNotificationUtils.createForegroundNotification(this, notificationMessage);
-            mNotificationUtils.createRemindNotification(this, notificationMessage);
+            // 在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);

            if (mControlCenterServiceReceiver == null) {
                // 注册广播接收器
@@ -118,7 +130,7 @@ public class ControlCenterService extends Service {
    }

    NotificationMessage createNotificationMessage() {
-        String szTitle = ((GlobalApplication)getApplication()).getString(R.string.app_name);
+        String szTitle = ((App)getApplication()).getString(R.string.app_name);
        String szContent = getValuesString() + " {?} " + StringUtils.formatPCMListString(mAppCacheUtils.getArrayListBatteryInfo());
        return new NotificationMessage(szTitle, szContent);
    }
@@ -126,19 +138,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);
    }

    // 唤醒和绑定守护进程
@@ -234,10 +246,32 @@ public class ControlCenterService extends Service {
    }

    public void appenRemindMSG(String szRemindMSG) {
-        NotificationMessage notificationMessage = createNotificationMessage();
-        notificationMessage.setRemindMSG(szRemindMSG);
-        //LogUtils.d(TAG, "notificationMessage : " + notificationMessage.getRemindMSG());
-        updateRemindNotification(notificationMessage);
+        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;
    }

    //
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/RemindThread.java
+++ b/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 {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppCacheUtils.java
+++ b/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 {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java
+++ b/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.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.App;
 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 = "";

    // 保存应用实例
-    GlobalApplication mApplication;
+    App mApplication;

    AppConfigUtils(Context context) {
        mContext = context;
@@ -193,7 +193,7 @@ public class AppConfigUtils {
    //
    void saveConfigData() {
        // 更新配置先取消一下旧的的提醒消息
-        NotificationUtils.cancelRemindNotification(mContext);
+        //NotificationHelper.cancelRemindNotification(mContext);
        
        AppConfigBean.saveBean(mContext, mAppConfigBean);
        // 通知活动窗口和服务配置已更新
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/FileUtils.java
+++ b/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.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageUtils.java
+++ b/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.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationHelper.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationHelper.java
@@ -0,0 +1,150 @@
+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
+        );
+    }
+}
+
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils2.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils2.java
@@ -18,14 +18,15 @@ 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 NotificationUtils {
+public class NotificationUtils2 {

-    public static final String TAG = NotificationUtils.class.getSimpleName();
+    public static final String TAG = NotificationHelper.class.getSimpleName();

    Context mContext;
    NotificationManager mNotificationManager;
@@ -45,19 +46,53 @@ public class NotificationUtils {
    private static String _mszChannelIDRemind = "2";
    private static String _mszChannelNameRemind = "Remind";

-    public NotificationUtils(Context context) {
+//    public NotificationUtils(Context context) {
+//        mContext = context;
+//        mNotificationManager = (NotificationManager) context.getSystemService(
+//            Context.NOTIFICATION_SERVICE);
+//    }
+
+    public NotificationUtils2(Context context) {
        mContext = context;
-        mNotificationManager = (NotificationManager) context.getSystemService(
-            Context.NOTIFICATION_SERVICE);
+        mNotificationManager = context.getSystemService(NotificationManager.class);
+        //createNotificationChannels();
    }

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

    // 创建并发送服务通知
--- a/powerbell/src/main/res/drawable/divider_line.xml
+++ b/powerbell/src/main/res/drawable/divider_line.xml
@@ -0,0 +1,7 @@
+<?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>
--- a/powerbell/src/main/res/layout/activity_about.xml
+++ b/powerbell/src/main/res/layout/activity_about.xml
@@ -6,20 +6,26 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">

-	<cc.winboll.studio.libaes.views.AToolbar
+	<LinearLayout
+		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/toolbar_height"
-		android:id="@+id/toolbar"
-		style="@style/DefaultAToolbar"/>
+		android:layout_height="wrap_content">

-    <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"/>
+		<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"/>

 </LinearLayout>

--- a/powerbell/src/main/res/layout/activity_backgroundpicture.xml
+++ b/powerbell/src/main/res/layout/activity_backgroundpicture.xml
@@ -26,29 +26,27 @@
 		android:layout_height="wrap_content"
 		android:layout_below="@id/toolbar">

-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="right">
+		<RelativeLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content">

 			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="180dp"
+				android:layout_width="160dp"
 				android:layout_height="36dp"
 				android:text="Origin BG"
-				android:layout_gravity="center_vertical"
-				android:layout_margin="10dp"
-				android:id="@+id/activitybackgroundpictureAButton5"/>
+				android:id="@+id/activitybackgroundpictureAButton5"
+				android:layout_alignParentLeft="true"
+				android:layout_margin="5dp"/>

 			<cc.winboll.studio.libaes.views.AButton
-				android:layout_width="180dp"
+				android:layout_width="160dp"
 				android:layout_height="36dp"
 				android:text="Received BG"
-				android:layout_gravity="center_vertical"
-				android:layout_margin="10dp"
-				android:id="@+id/activitybackgroundpictureAButton4"/>
+				android:id="@+id/activitybackgroundpictureAButton4"
+				android:layout_alignParentRight="true"
+				android:layout_margin="5dp"/>

-		</LinearLayout>
+		</RelativeLayout>

 		<LinearLayout
 			android:orientation="horizontal"
--- a/powerbell/src/main/res/layout/activity_battery_reporter.xml
+++ b/powerbell/src/main/res/layout/activity_battery_reporter.xml
@@ -0,0 +1,24 @@
+<?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>
--- a/powerbell/src/main/res/layout/activity_main.xml
+++ b/powerbell/src/main/res/layout/activity_main.xml
@@ -33,10 +33,10 @@

 	</LinearLayout>

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

 </LinearLayout>
--- a/powerbell/src/main/res/layout/custom_notification.xml
+++ b/powerbell/src/main/res/layout/custom_notification.xml
@@ -0,0 +1,11 @@
+<?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>
+
--- a/powerbell/src/main/res/layout/custom_notification_expanded.xml
+++ b/powerbell/src/main/res/layout/custom_notification_expanded.xml
@@ -0,0 +1,17 @@
+<?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>
+
--- a/powerbell/src/main/res/layout/item_battery_report.xml
+++ b/powerbell/src/main/res/layout/item_battery_report.xml
@@ -0,0 +1,34 @@
+<?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>
--- a/powerbell/src/main/res/menu/toolbar_main.xml
+++ b/powerbell/src/main/res/menu/toolbar_main.xml
@@ -1,5 +1,8 @@
 <?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"/>
--- a/powerbell/src/main/res/values/attrs.xml
+++ b/powerbell/src/main/res/values/attrs.xml
@@ -1,9 +1,3 @@
 <?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>
--- a/powerbell/src/main/res/values/strings.xml
+++ b/powerbell/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
    <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>
--- a/powerbell/src/main/res/values/styles.xml
+++ b/powerbell/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
    </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>
--- a/powerbell/src/stage/AndroidManifest.xml
+++ b/powerbell/src/stage/AndroidManifest.xml
@@ -4,20 +4,18 @@

    <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>
Author	SHA1	Message	Date
ZhanGSKen	4ff54c785e	<powerbell>APK 15.0.3 release Publish.	2025-03-25 02:43:07 +08:00
ZhanGSKen	b961468e1e	<powerbell>APK 15.0.2 release Publish.	2025-03-25 02:42:42 +08:00
ZhanGSKen	575ef9aac0	内容提供配置调整	2025-03-25 02:42:10 +08:00
ZhanGSKen	16b118f83b	<powerbell>APK 15.0.1 release Publish.	2025-03-25 02:36:56 +08:00
ZhanGSKen	1eeba4e4c6	<powerbell>APK 15.0.0 release Publish.	2025-03-25 02:34:56 +08:00
ZhanGSKen	66eb8e06ea	应用介绍页基本调试完成	2025-03-25 02:30:45 +08:00
ZhanGSKen	51775620db	更新类库，调试应用介绍...	2025-03-24 20:24:31 +08:00
ZhanGSKen	deaa9caadd	Merge remote-tracking branch 'origin/appbase' into powerbell	2025-03-24 14:33:17 +08:00
ZhanGSKen	58af5ba074	<powerbell>APK 4.0.7 release Publish.	2025-03-22 16:06:33 +08:00
ZhanGSKen	19743d30ef	修复编译参数	2025-03-22 16:05:10 +08:00
ZhanGSKen	3c2b720e20	调整背景图片设置窗口按钮布局	2025-03-22 16:03:08 +08:00
ZhanGSKen	5a052e4b22	添加电池报告窗口雏形	2025-03-22 15:54:18 +08:00
ZhanGSKen	4ccf6824a6	<powerbell>APK 4.0.6 release Publish.	2025-03-22 06:01:46 +08:00
ZhanGSKen	508c8b0b97	适配小米15，修改通知模块。	2025-03-22 05:53:58 +08:00
ZhanGSKen	0d21994291	编译配置精简	2025-03-22 03:06:40 +08:00