<powerbell>APK 15.11.12 release Publish.

.winboll/winboll_app_build.gradle

@@ -28,12 +28,17 @@ android {
         }
     }
     buildTypes {
-        release {
-            signingConfig signingConfigs.winboll
-        }
         debug {
-            signingConfig signingConfigs.winboll
-        }
+			 signingConfig signingConfigs.winboll
+         }
+        release {
+			 signingConfig signingConfigs.winboll
+             minifyEnabled true // 开启混淆（核心开关）
+             shrinkResources true // 可选：移除无用资源（进一步减小体积）
+             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), // 官方默认规则（优化版）
+                          'proguard-rules.pro' // 自定义规则文件
+         }
+		 
     }
     
     flavorDimensions "WinBoLLApp"
@@ -71,6 +76,7 @@ android {
         // 2. 配置 Beta Debug 版应用包输出
 	    //
         if((variant.flavorName == "beta" && variant.buildType.name == "debug")
+        || (variant.flavorName == "beta" && variant.buildType.name == "release")
         || (variant.flavorName == "stage" && variant.buildType.name == "debug")
         || (variant.flavorName == "stage" && variant.buildType.name == "release")) {
             println "Project root directory: " + project.rootDir.toString()

aes/build.gradle

@@ -18,18 +18,22 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+
+    // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30）
+    compileSdkVersion 30
+
+    // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion）
+    buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版
 
     defaultConfig {
         applicationId "cc.winboll.studio.aes"
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 30
         versionCode 1
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.10" 
+        versionName "15.11" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 29 13:04:18 HKT 2025
-stageCount=3
+#Wed Nov 19 09:04:33 HKT 2025
+stageCount=5
 libraryProject=libaes
-baseVersion=15.10
-publishVersion=15.10.2
+baseVersion=15.11
+publishVersion=15.11.4
 buildCount=0
-baseBetaVersion=15.10.3
+baseBetaVersion=15.11.5

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

@@ -8,8 +8,7 @@ package cc.winboll.studio.aes;
 import android.view.Gravity;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import com.hjq.toast.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
+import cc.winboll.studio.libappbase.ToastUtils;
 
 
 public class App extends GlobalApplication {
@@ -19,15 +18,16 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+		setIsDebugging(BuildConfig.DEBUG);
 		WinBoLLActivityManager.init(this);
 
         // 初始化 Toast 框架
         ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-
     }
 
+	@Override
+	public void onTerminate() {
+		super.onTerminate();
+		ToastUtils.release();
+	}
 }

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

@@ -91,8 +91,8 @@ public class MainActivity extends DrawerFragmentActivity implements IWinBoLLActi
     @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);
+        if(App.isDebugging()) {
+            getMenuInflater().inflate(cc.winboll.studio.libaes.R.menu.toolbar_studio_debug, menu);
         }
         return super.onCreateOptionsMenu(menu);
     }

appbase/build.gradle

@@ -38,13 +38,12 @@ android {
             versionName = genVersionName("${versionName}")
         }
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
+	
+     // 确保 Java 7 兼容性（已适配项目技术栈）
+     compileOptions {
+         sourceCompatibility JavaVersion.VERSION_1_7
+         targetCompatibility JavaVersion.VERSION_1_7
+     }
 }
 
 dependencies {

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Nov 13 05:16:16 HKT 2025
-stageCount=1
+#Fri Nov 21 11:41:04 HKT 2025
+stageCount=2
 libraryProject=libappbase
 baseVersion=15.11
-publishVersion=15.11.0
+publishVersion=15.11.1
 buildCount=0
-baseBetaVersion=15.11.1
+baseBetaVersion=15.11.2

appbase/proguard-rules.pro

@@ -15,3 +15,112 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# ============================== 基础通用规则 ==============================
+# 保留系统组件
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+# 保留 WinBoLL 核心包及子类（适配你的两个包名）
+#-keep public class * extends com.winboll.WinBoLLActivity
+#-keep public class * extends com.winboll.WinBoLLFragment
+# 主包名
+-keep class cc.winboll.studio.*.** { *; }
+# beta包名
+-keep class cc.winboll.studio.*.beta.** { *; }
+-keepclassmembers class cc.winboll.studio.*.** { *; }
+-keepclassmembers class cc.winboll.studio.*.beta.** { *; }
+
+# 保留所有类中的 public static final String TAG 字段
+-keepclassmembers class * {
+    public static final java.lang.String TAG;
+}
+
+# 保留序列化类
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留 R 文件
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 保留 native 方法
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保留注解和泛型
+-keepattributes *Annotation*
+-keepattributes Signature
+
+# 屏蔽 Java 8+ 警告（适配 Java 7）
+-dontwarn java.lang.invoke.*
+-dontwarn android.support.v8.renderscript.*
+-dontwarn java.util.function.**
+
+# ============================== 第三方框架规则 ==============================
+# Retrofit + OkHttp
+-keep class retrofit2.** { *; }
+-keep interface retrofit2.** { *; }
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class okio.** { *; }
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+
+# Glide 4.x
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
+    **[] $VALUES;
+    public *;
+}
+-dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
+
+# GreenDAO 3.x
+-keepclassmembers class * extends org.greenrobot.greendao.AbstractDao {
+    public static java.lang.String TABLENAME;
+}
+-keep class **$Properties
+# 实体类包名（按实际调整）
+#-keep class cc.winboll.studio.appbase.model.** { *; }
+
+# ButterKnife 8.x
+-keep class butterknife.** { *; }
+-dontwarn butterknife.internal.**
+-keep class **$$ViewBinder { *; }
+-keepclasseswithmembernames class * {
+    @butterknife.BindView <fields>;
+    @butterknife.OnClick <methods>;
+}
+
+# EventBus 3.x
+-keepclassmembers class ** {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+# ============================== 优化与调试 ==============================
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-verbose
+-dontpreverify
+-dontusemixedcaseclassnames
+# 保留行号（便于崩溃定位）
+-keepattributes SourceFile,LineNumberTable
+

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

@@ -11,51 +11,57 @@
 		android:layout_height="wrap_content"
 		android:id="@+id/toolbar"/>
 
-	<LinearLayout
+	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:orientation="vertical"
-		android:gravity="center_vertical"
-		android:spacing="12dp">
+		android:layout_weight="1.0">
 
-		<Button
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="应用崩溃测试"
-			android:textSize="16sp"
-			android:textColor="@android:color/white"
-			android:background="#81C7F5"
-			android:paddingVertical="12dp"
-			android:layout_marginHorizontal="24dp"
-			android:onClick="onCrashTest"
-			android:layout_margin="10dp"/>
+			android:orientation="vertical"
+			android:gravity="center_vertical"
+			android:spacing="12dp">
 
-		<Button
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="应用日志测试"
-			android:textSize="16sp"
-			android:textColor="@android:color/white"
-			android:background="#81C7F5"
-			android:paddingVertical="12dp"
-			android:layout_marginHorizontal="24dp"
-			android:onClick="onLogTest"
-			android:layout_margin="10dp"/>
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用崩溃测试"
+				android:textSize="16sp"
+				android:textColor="@android:color/white"
+				android:background="#81C7F5"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onCrashTest"
+				android:layout_margin="10dp"/>
 
-		<Button
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="应用吐司测试"
-			android:textSize="16sp"
-			android:textColor="@android:color/white"
-			android:background="#81C7F5"
-			android:paddingVertical="12dp"
-			android:layout_marginHorizontal="24dp"
-			android:onClick="onToastUtilsTest"
-			android:layout_margin="10dp"/>
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用日志测试"
+				android:textSize="16sp"
+				android:textColor="@android:color/white"
+				android:background="#81C7F5"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onLogTest"
+				android:layout_margin="10dp"/>
 
-	</LinearLayout>
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="应用吐司测试"
+				android:textSize="16sp"
+				android:textColor="@android:color/white"
+				android:background="#81C7F5"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onToastUtilsTest"
+				android:layout_margin="10dp"/>
+
+		</LinearLayout>
+
+	</ScrollView>
 
 </LinearLayout>
 

build.gradle

@@ -5,6 +5,16 @@ buildscript {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
         }
+		
+        //米盟通过maven接入时，要做如下配置
+        maven {
+            url "https://repos.xiaomi.com/maven"
+            credentials {
+                username 'mimo-developer'
+                password 'AKCp8ih1PFG9tV8qaLyws67dLGZi8udFM39SfsHgihN15cgsiRvHuxj8JzFmuZjaViVeNawaA'
+            }
+        }
+		
         // Nexus Maven 库地址
         // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
@@ -40,6 +50,15 @@ allprojects {
             // 设置本地Maven仓库路径
             url 'file:///sdcard/.m2/repository/'
         }
+		
+        //米盟通过maven接入时，要做如下配置
+        maven {
+            url "https://repos.xiaomi.com/maven"
+            credentials {
+                username 'mimo-developer'
+                password 'AKCp8ih1PFG9tV8qaLyws67dLGZi8udFM39SfsHgihN15cgsiRvHuxj8JzFmuZjaViVeNawaA'
+            }
+        }
         
         // Nexus Maven 库地址
         // "WinBoLL Release"
@@ -117,4 +136,3 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-

libaes/build.gradle

@@ -4,11 +4,15 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    
+    // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30）
+    compileSdkVersion 30
+
+    // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion）
+    buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 30
     }
     buildTypes {
@@ -20,13 +24,6 @@ android {
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libapputils:15.10.2'
-	api 'cc.winboll.studio:libappbase:15.10.9'
-    
-    // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
-    
     // 权限请求框架：https://github.com/getActivity/XXPermissions
     api 'com.github.getActivity:XXPermissions:18.63'
     // 下拉控件
@@ -52,4 +49,17 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
+	
+	// 米盟
+	implementation 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
+	api 'cc.winboll.studio:libappbase:15.11.0'
+	
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 29 13:04:07 HKT 2025
-stageCount=3
+#Wed Nov 19 09:04:27 HKT 2025
+stageCount=5
 libraryProject=libaes
-baseVersion=15.10
-publishVersion=15.10.2
+baseVersion=15.11
+publishVersion=15.11.4
 buildCount=0
-baseBetaVersion=15.10.3
+baseBetaVersion=15.11.5

libaes/src/main/AndroidManifest.xml

@@ -1,9 +1,25 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
     package="cc.winboll.studio.libaes">
 
-    <application>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
+    <!-- 通过GPS得到精确位置 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <!-- 通过网络得到粗略位置 -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <application
+		android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name="cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity"
@@ -33,6 +49,18 @@
             android:name="cc.winboll.studio.libaes.winboll.WinBoLLMail"
             android:exported="true"/>
 
+
+        <provider
+			android:name="androidx.core.content.FileProvider"
+			android:authorities="${applicationId}.fileprovider"
+			android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider" />
+
+        </provider>
+
     </application>
 
-</manifest>
+</manifest>

libaes/src/main/java/cc/winboll/studio/libaes/activitys/DrawerFragmentActivity.java

@@ -31,6 +31,9 @@ import cc.winboll.studio.libappbase.LogUtils;
 import com.baoyz.widget.PullRefreshLayout;
 import java.util.ArrayList;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
+import cc.winboll.studio.libaes.views.ADsBannerView;
+import cc.winboll.studio.libappbase.LogActivity;
+import cc.winboll.studio.libappbase.ToastUtils;
 
 public abstract class DrawerFragmentActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
 
@@ -71,17 +74,22 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     @Override
     protected void onDestroy() {
         super.onDestroy();
+		// 修复：释放广告资源，避免内存泄漏
+		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+		if (adsBannerView != null) {
+			adsBannerView.releaseAdResources();
+		}
     }
 
     /*@Override
-    public Intent getIntent() {
-        // TODO: Implement this method
-        return super.getIntent();
-    }
+	 public Intent getIntent() {
+	 // TODO: Implement this method
+	 return super.getIntent();
+	 }
 
-    public Context getContext() {
-        return this.mContext;
-    }*/
+	 public Context getContext() {
+	 return this.mContext;
+	 }*/
 
     @Override
     public MenuInflater getMenuInflater() {
@@ -90,9 +98,9 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     }
 
     /*public void setSubtitle(CharSequence context) {
-        // TODO: Implement this method
-        getSupportActionBar().setSubtitle(context);
-    }*/
+	 // TODO: Implement this method
+	 getSupportActionBar().setSubtitle(context);
+	 }*/
 
     @Override
     public void recreate() {
@@ -100,9 +108,9 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     }
 
     /*@Override
-    public boolean moveTaskToBack(boolean nonRoot) {
-        return super.moveTaskToBack(nonRoot);
-    }*/
+	 public boolean moveTaskToBack(boolean nonRoot) {
+	 return super.moveTaskToBack(nonRoot);
+	 }*/
 
     @Override
     public void startActivity(Intent intent) {
@@ -115,24 +123,24 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
     }
 
     /*@Override
-    public FragmentManager getSupportFragmentManager() {
-        return super.getSupportFragmentManager();
-    }
+	 public FragmentManager getSupportFragmentManager() {
+	 return super.getSupportFragmentManager();
+	 }
 
-    public void setSubtitle(int resId) {
-        // TODO: Implement this method
-        getSupportActionBar().setSubtitle(resId);
-    }
+	 public void setSubtitle(int resId) {
+	 // TODO: Implement this method
+	 getSupportActionBar().setSubtitle(resId);
+	 }
 
-    public void setTitle(CharSequence context) {
-        // TODO: Implement this method
-        getSupportActionBar().setTitle(context);
-    }
+	 public void setTitle(CharSequence context) {
+	 // TODO: Implement this method
+	 getSupportActionBar().setTitle(context);
+	 }
 
-    public void setTitle(int resId) {
-        // TODO: Implement this method
-        getSupportActionBar().setTitle(resId);
-    }*/
+	 public void setTitle(int resId) {
+	 // TODO: Implement this method
+	 getSupportActionBar().setTitle(resId);
+	 }*/
 
     @Override
     public SharedPreferences getSharedPreferences(String name, int mode) {
@@ -175,6 +183,9 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
             for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
                 getString(i);
             }
+        } else if (R.id.item_log == item.getItemId()) {
+			ToastUtils.show("Test");
+            LogActivity.startLogActivity(this);
         } else if (R.id.item_about == item.getItemId()) {
             LogUtils.d(TAG, "onAbout");
         } else if (android.R.id.home == item.getItemId()) {
@@ -189,6 +200,11 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
         if (checkThemeStyleChange()) {
             recreate();
         }
+
+		ADsBannerView adsBannerView = findViewById(R.id.adsbanner);
+		if (adsBannerView != null) {
+			adsBannerView.resumeADs();
+		}
     }
 
     void initRootView() {

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestAButtonFragment.java

@@ -13,7 +13,7 @@ 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 com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
 
 public class TestAButtonFragment extends Fragment {
 

libaes/src/main/java/cc/winboll/studio/libaes/unittests/TestViewPageFragment.java

@@ -12,14 +12,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.Toast;
 import androidx.fragment.app.Fragment;
 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 com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
 import java.util.ArrayList;
 import java.util.List;
 

libaes/src/main/java/cc/winboll/studio/libaes/utils/MimoUtils.java

@@ -0,0 +1,33 @@
+package cc.winboll.studio.libaes.utils;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/18 15:23
+ * @Describe 米盟 MimoUtils
+ */
+public final class MimoUtils {
+	public static final String TAG = "Utils";
+
+	public static int dpToPx(Context context, float dp) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (dp * displayMetrics.density + 0.5f);
+	}
+
+	public static int pxToDp(Context context, float px) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (px / displayMetrics.density + 0.5f);
+	}
+
+	public static int pxToSp(Context context, float pxValue) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (pxValue / displayMetrics.scaledDensity + 0.5f);
+	}
+
+	public static int spToPx(Context context, float spValue) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (spValue * displayMetrics.scaledDensity + 0.5f);
+	}
+}

libaes/src/main/java/cc/winboll/studio/libaes/utils/PrefUtils.java

@@ -0,0 +1,33 @@
+package cc.winboll.studio.libaes.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/13 06:50
+ * @Describe 应用变量保存工具
+ */
+
+public class PrefUtils {
+
+    public static final String TAG = "PrefUtils";
+
+    //
+    // 保存字符串到SharedPreferences的函数
+    //
+    public static void saveString(Context context, String key, String value) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences("myPrefs", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString(key, value);
+        editor.apply();
+    }
+
+    //
+    // 从SharedPreferences读取字符串的函数
+    //
+    public static String getString(Context context, String key, String defaultValue) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences("myPrefs", Context.MODE_PRIVATE);
+        return sharedPreferences.getString(key, defaultValue);
+    }
+}

libaes/src/main/java/cc/winboll/studio/libaes/views/ADsBannerView.java

@@ -0,0 +1,485 @@
+package cc.winboll.studio.libaes.views;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
+import cc.winboll.studio.libaes.R;
+import cc.winboll.studio.libaes.utils.MimoUtils;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import com.miui.zeus.mimo.sdk.ADParams;
+import com.miui.zeus.mimo.sdk.BannerAd;
+import com.miui.zeus.mimo.sdk.MimoCustomController;
+import com.miui.zeus.mimo.sdk.MimoLocation;
+import com.miui.zeus.mimo.sdk.MimoSdk;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/18 14:41
+ * @Describe WinBoLL 横幅广告类
+ */
+public class ADsBannerView extends LinearLayout {
+
+    public static final String TAG = "ADsBannerView";
+
+	private static final String PRIVACY_FILE = "privacy_pfs";
+    private static final String PRIVACY_VALUE = "privacy_value";//0: 拒绝，1：赞同
+
+	private String BANNER_POS_ID = "802e356f1726f9ff39c69308bfd6f06a";
+    private String BANNER_POS_ID_WINBOLL_BETA = "d129ee5a263911f981a6dc7a9802e3e7";
+    private String BANNER_POS_ID_WINBOLL = "4ec30efdb32271765b9a4efac902828b";
+
+	/*
+	 private String BANNER_POS_ID = "802e356f1726f9ff39c69308bfd6f06a";
+	 private String BANNER_POS_ID_WINBOLL_BETA = "802e356f1726f9ff39c69308bfd6f06a";
+	 private String BANNER_POS_ID_WINBOLL = "802e356f1726f9ff39c69308bfd6f06a";
+	 */
+
+	Context mContext;
+	View mMianView;
+	SharedPreferences mSharedPreferences;
+	ViewGroup mContainer;
+	BannerAd mBannerAd;
+	List<BannerAd> mAllBanners = new ArrayList<>();
+	// 新增：主线程Handler，确保广告操作在主线程执行
+    private Handler mMainHandler;
+
+    public ADsBannerView(Context context) {
+		super(context);
+		this.mContext = context;
+		initView();
+	}
+
+	public ADsBannerView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		this.mContext = context;
+		initView();
+	}
+
+	public ADsBannerView(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		this.mContext = context;
+		initView();
+	}
+
+	public ADsBannerView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+		this.mContext = context;
+		initView();
+	}
+
+	void initView() {
+
+        // 初始化主线程Handler（关键：确保广告操作在主线程执行）
+        mMainHandler = new Handler(Looper.getMainLooper());
+
+        // 米盟模块：隐私协议弹窗
+        showPrivacy();
+
+		this.mMianView = inflate(this.mContext, R.layout.view_adsbanner, null);
+		mContainer = this.mMianView.findViewById(R.id.ads_container);
+		addView(this.mMianView);
+	}
+
+	Activity getActivity() {
+		try {
+			Activity activity = (Activity)this.mContext;
+			return activity;
+		} catch (Exception ex) {
+		}
+		return null;
+	}
+
+	public void resumeADs() {
+		// 修复：优化广告请求逻辑（添加生命周期判断 + 主线程执行）
+		if (getActivity() != null && !getActivity().isFinishing() && !getActivity().isDestroyed()) {
+			String privacyAgreeValue = getSharedPreferences().getString(PRIVACY_VALUE, null);
+			if (TextUtils.equals(privacyAgreeValue, String.valueOf(1))) {
+				LogUtils.i(TAG, "已同意隐私协议，开始播放米盟广告...");
+				mMainHandler.postDelayed(new Runnable() {
+						@Override
+						public void run() {
+							//ToastUtils.show("ADs run");
+							// 再次校验生命周期，避免延迟执行时Activity已销毁
+							if (getActivity() != null && !getActivity().isFinishing() && !getActivity().isDestroyed()) {
+								fetchAd();
+							}
+						}
+					}, 1000); // 延迟1秒请求广告，提升页面加载体验
+			}
+		}
+	}
+
+    /**
+     * 释放广告资源（关键：避免内存泄漏和空Context调用）
+     */
+    public void releaseAdResources() {
+        LogUtils.d(TAG, "releaseAdResources()");
+
+        // 移除Handler回调
+        if (mMainHandler != null) {
+            mMainHandler.removeCallbacksAndMessages(null);
+        }
+
+        // 销毁所有广告实例
+        if (mAllBanners != null && !mAllBanners.isEmpty()) {
+            for (BannerAd ad : mAllBanners) {
+                if (ad != null) {
+                    ad.destroy();
+                }
+            }
+            mAllBanners.clear();
+        }
+        // 置空当前广告引用
+        mBannerAd = null;
+        // 移除广告容器中的视图
+        if (mContainer != null) {
+            mContainer.removeAllViews();
+        }
+    }
+
+    /**
+     * 显示广告（核心修复：传递安全的Context + 生命周期校验）
+     */
+    private void showAd() {
+        LogUtils.d(TAG, "showAd()");
+        // 1. 生命周期校验：避免Activity已销毁时操作UI
+        if (getActivity() == null || getActivity().isFinishing() || getActivity().isDestroyed()) {
+            LogUtils.e(TAG, "showAd: Activity is finishing or destroyed");
+            return;
+        }
+        // 2. 非空校验：广告实例和容器
+        if (mBannerAd == null || mContainer == null) {
+            LogUtils.e(TAG, "showAd: BannerAd or Container is null");
+            return;
+        }
+        // 3. 创建广告容器（使用ApplicationContext避免内存泄漏）
+        final FrameLayout container = new FrameLayout(getActivity().getApplicationContext());
+        container.setPadding(0, 0, 0, MimoUtils.dpToPx(getActivity(), 10));
+        mContainer.addView(container, new FrameLayout.LayoutParams(
+							   FrameLayout.LayoutParams.MATCH_PARENT,
+							   FrameLayout.LayoutParams.WRAP_CONTENT
+						   ));
+
+//        if (mIsBiddingWin) {
+//            mBannerAd.setPrice(getPrice());
+//        }
+        // 4. 显示广告：传递ApplicationContext，避免Activity Context失效
+        mBannerAd.showAd(getActivity(), container, new BannerAd.BannerInteractionListener() {
+				@Override
+				public void onAdClick() {
+					LogUtils.d(TAG, "onAdClick");
+				}
+
+				@Override
+				public void onAdShow() {
+					LogUtils.d(TAG, "onAdShow");
+				}
+
+				@Override
+				public void onAdDismiss() {
+					LogUtils.d(TAG, "onAdDismiss");
+					// 修复：移除容器时校验Activity状态
+					if (getActivity() != null && !getActivity().isFinishing() && !getActivity().isDestroyed() && mContainer != null) {
+						mContainer.removeView(container);
+					}
+				}
+
+				@Override
+				public void onRenderSuccess() {
+					LogUtils.d(TAG, "onRenderSuccess");
+				}
+
+				@Override
+				public void onRenderFail(int code, String msg) {
+					LogUtils.e(TAG, "onRenderFail errorCode " + code + " errorMsg " + msg);
+					// 修复：渲染失败时移除容器
+					if (getActivity() != null && !getActivity().isFinishing() && !getActivity().isDestroyed() && mContainer != null) {
+						mContainer.removeView(container);
+					}
+				}
+			});
+    }
+
+    /**
+     * 请求广告（核心修复：Context安全校验 + 异常捕获 + 资源管理）
+     */
+    private void fetchAd() {
+        LogUtils.d(TAG, "fetchAd()");
+        // 1. 双重校验：Activity未销毁 + Context非空
+        if (getActivity() == null || getActivity().isFinishing() || getActivity().isDestroyed() || getActivity().getApplicationContext() == null) {
+            LogUtils.e(TAG, "fetchAd: Invalid Context or Activity state");
+            return;
+        }
+        // 2. 释放之前的广告资源，避免内存泄漏
+        if (mBannerAd != null) {
+            mBannerAd.destroy();
+        }
+        // 3. 初始化广告（使用ApplicationContext，避免Activity Context失效）
+        try {
+            mBannerAd = new BannerAd();
+            mAllBanners.add(mBannerAd);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "fetchAd: Init BannerAd failed", e);
+            return;
+        }
+        // 4. 设置下载监听
+        mBannerAd.setDownLoadListener(new BannerAd.BannerDownloadListener() {
+				@Override
+				public void onDownloadStarted() {
+					LogUtils.d(TAG, "onDownloadStarted");
+				}
+
+				@Override
+				public void onDownloadPaused() {
+					LogUtils.d(TAG, "onDownloadPaused");
+				}
+
+				@Override
+				public void onDownloadFailed(int errorCode) {
+					String msg = "onDownloadFailed, errorCode = " + errorCode;
+					LogUtils.d(TAG, msg);
+					//ToastUtils.show(msg);
+				}
+
+				@Override
+				public void onDownloadFinished() {
+					LogUtils.d(TAG, "onDownloadFinished");
+				}
+
+				@Override
+				public void onDownloadProgressUpdated(int progress) {
+					LogUtils.d(TAG, "onDownloadProgressUpdated " + progress + "%");
+				}
+
+				@Override
+				public void onInstallFailed(int errorCode) {
+					LogUtils.d(TAG, "onInstallFailed, errorCode = " + errorCode);
+				}
+
+				@Override
+				public void onInstallStart() {
+					LogUtils.d(TAG, "onInstallStart");
+				}
+
+				@Override
+				public void onInstallSuccess() {
+					LogUtils.d(TAG, "onInstallSuccess");
+				}
+
+				@Override
+				public void onDownloadCancel() {
+					LogUtils.d(TAG, "onDownloadCancel");
+				}
+			});
+
+        // 5. 构建广告参数并请求
+        String currentAD_ID = getAD_ID();
+        LogUtils.d(TAG, String.format("currentAD_ID = %s", currentAD_ID));
+        ADParams params = new ADParams.Builder().setUpId(currentAD_ID).build();
+        mBannerAd.loadAd(params, new BannerAd.BannerLoadListener() {
+				@Override
+				public void onBannerAdLoadSuccess() {
+					LogUtils.d(TAG, "onBannerAdLoadSuccess()");
+					// 修复：广告加载成功后校验Activity状态
+					if (getActivity() != null && !getActivity().isFinishing() && !getActivity().isDestroyed()) {
+						showAd();
+					}
+				}
+
+				@Override
+				public void onAdLoadFailed(int errorCode, String errorMsg) {
+					String msg = "onAdLoadFailed: errorCode = " + errorCode + ", errorMsg = " + errorMsg;
+					LogUtils.d(TAG, msg);
+					removeAllBanners();
+				}
+			});
+    }
+
+	void removeAllBanners() {
+		// 修复：加载失败时移除当前广告实例
+		if (mAllBanners.contains(mBannerAd)) {
+			mAllBanners.remove(mBannerAd);
+		}
+		mBannerAd.destroy();
+		mBannerAd = null;
+	}
+
+    /**
+     * 根据当前秒数获取广告ID（原逻辑保留）
+     */
+    private String getAD_ID() {
+        long currentSecond = System.currentTimeMillis() / 1000;
+        return (currentSecond % 2 == 0) ? BANNER_POS_ID :
+			(GlobalApplication.isDebugging() ? BANNER_POS_ID_WINBOLL_BETA : BANNER_POS_ID_WINBOLL);
+    }
+
+    /**
+     * 获取广告价格（原逻辑保留，添加空指针校验）
+     */
+    private long getPrice() {
+        if (mBannerAd == null) {
+            return 0;
+        }
+        Map<String, Object> map = mBannerAd.getMediaExtraInfo();
+        if (map == null || map.isEmpty() || !map.containsKey("price")) {
+            LogUtils.w(TAG, "getPrice: media extra info is null or no price key");
+            return 0;
+        }
+        Object priceObj = map.get("price");
+        if (priceObj instanceof Long) {
+            return (Long) priceObj;
+        } else if (priceObj instanceof Integer) {
+            return ((Integer) priceObj).longValue();
+        } else {
+            LogUtils.e(TAG, "getPrice: price type is invalid");
+            return 0;
+        }
+    }
+
+    /**
+     * 显示隐私协议弹窗（原逻辑保留，优化Context使用）
+     */
+    private void showPrivacy() {
+        // 校验Activity状态，避免弹窗泄露
+        if (getActivity() == null || getActivity().isFinishing() || getActivity().isDestroyed()) {
+            return;
+        }
+        String privacyAgreeValue = getSharedPreferences().getString(PRIVACY_VALUE, null);
+        if (TextUtils.equals(privacyAgreeValue, String.valueOf(0))) {
+            LogUtils.i(TAG, "已拒绝隐私协议，广告已处于不可用状态...");
+            Toast.makeText(getActivity().getApplicationContext(), "已拒绝隐私协议，广告已处于不可用状态", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        if (TextUtils.equals(privacyAgreeValue, String.valueOf(1))) {
+            LogUtils.i(TAG, "已同意隐私协议，开始初始化米盟SDK...");
+            initMimoSdk();
+            return;
+        }
+        LogUtils.i(TAG, "开始弹出隐私协议...");
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle("用户须知");
+        builder.setMessage("小米广告SDK隐私政策: https://dev.mi.com/distribute/doc/details?pId=1688, 请复制到浏览器查看");
+        builder.setIcon(R.drawable.ic_launcher);
+        builder.setCancelable(false); // 点击对话框以外的区域不消失
+        builder.setPositiveButton("同意", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					getSharedPreferences().edit()
+                        .putString(PRIVACY_VALUE, String.valueOf(1))
+                        .apply();
+					initMimoSdk();
+					dialog.dismiss();
+				}
+			});
+        builder.setNegativeButton("拒绝", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					getSharedPreferences().edit()
+                        .putString(PRIVACY_VALUE, String.valueOf(0))
+                        .apply();
+					dialog.dismiss();
+				}
+			});
+        AlertDialog dialog = builder.create();
+
+        // 配置弹窗位置（底部全屏）
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setGravity(Gravity.BOTTOM);
+            WindowManager m = getActivity().getWindowManager();
+            Display d = m.getDefaultDisplay();
+            WindowManager.LayoutParams p = window.getAttributes();
+            p.width = d.getWidth();
+            window.setAttributes(p);
+        }
+        dialog.show();
+    }
+
+    /**
+     * 初始化米盟SDK（核心修复：传递ApplicationContext + 异常捕获）
+     */
+    private void initMimoSdk() {
+        // 1. 安全获取ApplicationContext，避免Activity Context失效
+        Context appContext = getActivity().getApplicationContext();
+        if (appContext == null) {
+            LogUtils.e(TAG, "initMimoSdk: ApplicationContext is null");
+            return;
+        }
+        // 2. 初始化SDK，捕获异常避免崩溃
+        try {
+            MimoSdk.init(appContext, new MimoCustomController() {
+					@Override
+					public boolean isCanUseLocation() {
+						return true;
+					}
+
+					@Override
+					public MimoLocation getMimoLocation() {
+						return null;
+					}
+
+					@Override
+					public boolean isCanUseWifiState() {
+						return true;
+					}
+
+					@Override
+					public boolean alist() {
+						return true;
+					}
+				}, new MimoSdk.InitCallback() {
+					@Override
+					public void success() {
+						LogUtils.d(TAG, "MimoSdk init success");
+					}
+
+					@Override
+					public void fail(int code, String msg) {
+						LogUtils.e(TAG, "MimoSdk init fail, code=" + code + ",msg=" + msg);
+					}
+				});
+            MimoSdk.setDebugOn(true);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "initMimoSdk: init failed", e);
+        }
+    }
+
+
+    /**
+     * 获取SharedPreferences实例（原逻辑保留，添加空指针校验）
+     */
+    SharedPreferences getSharedPreferences() {
+        if (mSharedPreferences == null) {
+            // 修复：使用ApplicationContext获取SharedPreferences，避免Activity Context泄露
+            Context appContext = getActivity().getApplicationContext();
+            if (appContext != null) {
+                mSharedPreferences = appContext.getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
+            } else {
+                LogUtils.e(TAG, "getSharedPreferences: ApplicationContext is null");
+                // 降级方案：若ApplicationContext为空，使用Activity Context（仅作兼容）
+                mSharedPreferences = getActivity().getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
+            }
+        }
+        return mSharedPreferences;
+    }
+}

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

@@ -12,7 +12,6 @@ import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Message;
 import android.util.AttributeSet;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -20,11 +19,11 @@ import cc.winboll.studio.libaes.R;
 import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.libaes.models.APPInfo;
 import cc.winboll.studio.libaes.utils.AppVersionUtils;
+import cc.winboll.studio.libaes.utils.PrefUtils;
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.utils.PrefUtils;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
 import java.io.IOException;
 import mehdi.sakout.aboutpage.AboutPage;
 import mehdi.sakout.aboutpage.Element;
@@ -108,7 +107,7 @@ public class AboutView extends LinearLayout {
         mszAppDescription = mAPPInfo.getAppDescription();
         mnAppIcon = mAPPInfo.getAppIcon();
 
-        mszWinBoLLServerHost = GlobalApplication.isDebuging() ?  "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
+        mszWinBoLLServerHost = GlobalApplication.isDebugging() ?  "https://yun-preivew.winboll.cc": "https://yun.winboll.cc";
 
         try {
             mszAppVersionName = _mContext.getPackageManager().getPackageInfo(_mContext.getPackageName(), 0).versionName;
@@ -229,7 +228,7 @@ public class AboutView extends LinearLayout {
             // 定义应用调试按钮
             //
             Element elementAppMode;
-            if (GlobalApplication.isDebuging()) {
+            if (GlobalApplication.isDebugging()) {
                 elementAppMode = new Element(_mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
                 elementAppMode.setOnClickListener(mAppNormalOnClickListener);
             } else {
@@ -263,8 +262,8 @@ public class AboutView extends LinearLayout {
         if (intent != null) {
             //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            GlobalApplication.setIsDebuging(true);
-            GlobalApplication.saveDebugStatus(_mContext);
+            GlobalApplication.setIsDebugging(true);
+            GlobalApplication.saveDebugStatus((GlobalApplication)_mContext.getApplicationContext());
 
             WinBoLLActivityManager.getInstance().finishAll();
             context.startActivity(intent);
@@ -275,8 +274,8 @@ public class AboutView extends LinearLayout {
         Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
         if (intent != null) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            GlobalApplication.setIsDebuging(false);
-            GlobalApplication.saveDebugStatus(_mContext);
+            GlobalApplication.setIsDebugging(false);
+            GlobalApplication.saveDebugStatus((GlobalApplication)_mContext.getApplicationContext());
 
             WinBoLLActivityManager.getInstance().finishAll();
             context.startActivity(intent);
@@ -301,7 +300,7 @@ public class AboutView extends LinearLayout {
                         String szUrl = mszWinBoLLServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
                         // 构建包含认证信息的请求
                         String credential = "";
-                        if (GlobalApplication.isDebuging()) {
+                        if (GlobalApplication.isDebugging()) {
                             credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
                             PrefUtils.saveString(_mContext, "metDevUserName", metDevUserName.getText().toString());
                             PrefUtils.saveString(_mContext, "metDevUserPassword", metDevUserPassword.getText().toString());

libaes/src/main/res/layout/activity_drawerfragment.xml

@@ -10,7 +10,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/activitydrawerfragmentASupportToolbar1"/>
-    
+
 	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="match_parent"
@@ -19,7 +19,8 @@
 
 		<androidx.drawerlayout.widget.DrawerLayout
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_height="0dp"
+			android:layout_weight="1.0"
 			android:id="@+id/activitydrawerfragmentDrawerLayout1">
 
 			<FrameLayout
@@ -52,7 +53,13 @@
 
 		</androidx.drawerlayout.widget.DrawerLayout>
 
+		
 	</LinearLayout>
 
+	<cc.winboll.studio.libaes.views.ADsBannerView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/adsbanner"/>
+
 </LinearLayout>
 

libaes/src/main/res/layout/view_adsbanner.xml

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

libaes/src/main/res/menu/toolbar_studio_debug.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+    <!--<item android:title="@string/app_theme">
+    <menu>-->
+    <!-- 定义一组单选按钮 -->
+    <!-- checkableBehavior的可选值由三个：single设置为单选，all为多选，none为普通选项 -->
+    <!--        <group android:checkableBehavior="single">
+    <item android:id="@+id/app_defaulttheme" android:title="@string/app_defaulttheme"/>
+    <item android:id="@+id/app_skytheme" android:title="@string/app_skytheme"/>
+    <item android:id="@+id/app_goldentheme" android:title="@string/app_goldentheme"/>
+    </group>
+    </menu>
+    </item>-->
+
+    <item android:title="DebugTools">
+        <menu>
+            <item
+                android:id="@+id/item_testcrashreport"
+                android:title="Test Application Crash Report"/>
+            <item
+                android:id="@+id/item_unittest"
+                android:title="UnitTest"/>
+            <item
+                android:id="@+id/item_log"
+                android:title="APPLOG"/>
+            <item
+                android:id="@+id/item_info"
+                android:title="Info"/>
+            <item
+                android:id="@+id/item_exitdebug"
+                android:title="ExitDebug"/>
+        </menu>
+    </item>
+</menu>

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

@@ -12,5 +12,10 @@
     <string name="text_GoldenTheme">GoldenTheme</string>
     <string name="text_MemorTheme">MemorTheme</string>
     <string name="text_TaoTheme">TaoTheme</string>
-    
+
+    <string name="app_normal">Click here is switch to Normal APP</string>
+    <string name="app_debug">Click here is switch to APP DEBUG</string>
+	<string name="gitea_home">GITEA HOME</string>
+    <string name="app_update">APP UPDATE</string>
+
 </resources>

libaes/src/main/res/xml/file_provider.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path path="mimoDownload" name="files_root" />
+    <external-path path="." name="external_storage_root" />
+</paths>

libaes/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <!-- 允许 winboll.cc 及其子域名的明文流量（HTTP） -->
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">winboll.cc</domain>
+    </domain-config>
+	<!-- 米盟 SDK 配置 -->
+    <base-config cleartextTrafficPermitted="true" />
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </debug-overrides>
+</network-security-config>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Nov 13 05:16:16 HKT 2025
-stageCount=1
+#Fri Nov 21 11:41:04 HKT 2025
+stageCount=2
 libraryProject=libappbase
 baseVersion=15.11
-publishVersion=15.11.0
+publishVersion=15.11.1
 buildCount=0
-baseBetaVersion=15.11.1
+baseBetaVersion=15.11.2

powerbell/README.md

@@ -24,7 +24,7 @@
 
 1.  Fork 本仓库
 2.  新建 Feat_xxx 分支
-3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@qq.com>)
 4.  新建 Pull Request
 
 

powerbell/build.gradle

@@ -18,40 +18,46 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    
+    // 1. compileSdkVersion：必须 ≥ targetSdkVersion，建议直接等于 targetSdkVersion（30）
+    compileSdkVersion 30
+
+    // 2. buildToolsVersion：需匹配 compileSdkVersion，建议使用 30.x.x 最新稳定版（无需高于 compileSdkVersion）
+    buildToolsVersion "30.0.3" // 这是 30 对应的最新稳定版，避免使用 beta 版
 
     defaultConfig {
         applicationId "cc.winboll.studio.powerbell"
-        minSdkVersion 24
+        minSdkVersion 23
         targetSdkVersion 30
         versionCode 6
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.4" 
+        versionName "15.11" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
+	// 米盟 SDK
+    packagingOptions {
+         doNotStrip "*/*/libmimo_1011.so"
     }
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libaes:15.9.3'
-    api 'cc.winboll.studio:libapputils:15.8.5'
-    api 'cc.winboll.studio:libappbase:15.9.5'
-    
-    // 吐司提示库
-    api 'com.github.getActivity:ToastUtils:10.5'
-    // 应用介绍页类库
+	
+	// 米盟
+	api 'com.miui.zeus:mimo-ad-sdk:5.3.+'//请使用最新版sdk
+     //注意：以下5个库必须要引入
+    //api 'androidx.appcompat:appcompat:1.4.1'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
+    api 'com.google.code.gson:gson:2.8.5'
+    api 'com.github.bumptech.glide:glide:4.9.0'
+    //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+	
+	
+	 // 应用介绍页类库
     api 'io.github.medyo:android-about-page:2.0.0'
     // SSH
     api 'com.jcraft:jsch:0.1.55'
@@ -71,23 +77,9 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-    
-    /*api 'cc.winboll.studio:winboll-shared:1.8.0'
-    api 'io.github.medyo:android-about-page:2.0.0'
-    api 'com.jcraft:jsch:0.1.55'
-    api 'org.jsoup:jsoup:1.13.1'
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'androidx.fragment:fragment:1.0.0'
-    api 'com.google.android.material:material:1.0.0'
-    
-    api 'com.baoyz.pullrefreshlayout:library:1.2.0'
-    api 'com.github.getActivity:ToastUtils:10.5'
-    api 'io.github.medyo:android-about-page:2.0.0'
-    api 'org.jsoup:jsoup:1.13.1'
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    api 'cc.winboll.studio:libaes:7.6.0'
-    */
+	implementation 'cc.winboll.studio:libaes:15.11.8'
+    implementation 'cc.winboll.studio:libappbase:15.11.6'
+	
+    //api fileTree(dir: 'libs', include: ['*.aar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Sep 03 20:59:53 HKT 2025
+#Sun Nov 30 18:48:20 HKT 2025
 stageCount=13
 libraryProject=
-baseVersion=15.4
-publishVersion=15.4.12
+baseVersion=15.11
+publishVersion=15.11.12
 buildCount=0
-baseBetaVersion=15.4.13
+baseBetaVersion=15.11.13

powerbell/proguard-rules.pro

@@ -9,9 +9,135 @@
 
 # Add any project specific keep options here:
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+# ============================== 基础通用规则 ==============================
+# 保留系统组件
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+
+# 保留 WinBoLL 核心包及子类（合并简化规则）
+-keep class cc.winboll.studio.** { *; }
+-keepclassmembers class cc.winboll.studio.** { *; }
+
+# 保留所有类中的 public static final String TAG 字段（便于日志定位）
+-keepclassmembers class * {
+    public static final java.lang.String TAG;
+}
+
+# 保留序列化类（避免Parcelable/Gson解析异常）
+-keep class * implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留 R 文件（避免资源ID混淆）
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 保留 native 方法（避免JNI调用失败）
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# 保留注解和泛型（避免反射/序列化异常）
+-keepattributes *Annotation*
+-keepattributes Signature
+
+# 屏蔽 Java 8+ 警告（适配 Java 7 语法）
+-dontwarn java.lang.invoke.*
+-dontwarn android.support.v8.renderscript.*
+-dontwarn java.util.function.**
+
+# ============================== 第三方框架专项规则 ==============================
+# OkHttp 4.4.1（米盟广告请求依赖，完善Lambda兼容）
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-keep class okhttp3.internal.** { *; }
+-keep class okio.** { *; }
+-dontwarn okhttp3.internal.platform.**
+-dontwarn okio.**
+# ============================== 必要补充规则 ==============================
+# OkHttp 4.4.1 补充规则（Java 7 兼容）
+-keep class okhttp3.internal.concurrent.** { *; }
+-keep class okhttp3.internal.connection.** { *; }
+-dontwarn okhttp3.internal.concurrent.TaskRunner
+-dontwarn okhttp3.internal.connection.RealCall
+
+# Glide 4.9.0（米盟广告图片加载依赖）
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$ImageType {
+    **[] $VALUES;
+    public *;
+}
+-keepclassmembers class * implements com.bumptech.glide.module.AppGlideModule {
+    <init>();
+}
+-dontwarn com.bumptech.glide.**
+
+# Gson 2.8.5（米盟广告数据序列化依赖）
+-keep class com.google.gson.** { *; }
+-keep interface com.google.gson.** { *; }
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# 米盟 SDK（核心广告组件，完整保留避免加载失败）
+-keep class com.miui.zeus.** { *; }
+-keep interface com.miui.zeus.** { *; }
+# 保留米盟日志字段（便于广告加载失败排查）
+-keepclassmembers class com.miui.zeus.mimo.sdk.** {
+    public static final java.lang.String TAG;
+}
+
+# RecyclerView 1.0.0（米盟广告布局渲染依赖）
+-keep class androidx.recyclerview.** { *; }
+-keep interface androidx.recyclerview.** { *; }
+-keepclassmembers class androidx.recyclerview.widget.RecyclerView$Adapter {
+    public *;
+}
+
+# 其他第三方框架（按引入依赖保留，无则可删除）
+# XXPermissions 18.63
+-keep class com.hjq.permissions.** { *; }
+-keep interface com.hjq.permissions.** { *; }
+
+# ZXing 二维码（核心解析组件）
+-keep class com.google.zxing.** { *; }
+-keep class com.journeyapps.zxing.** { *; }
+
+# Jsoup HTML解析
+-keep class org.jsoup.** { *; }
+
+# Pinyin4j 拼音搜索
+-keep class net.sourceforge.pinyin4j.** { *; }
+
+# JSch SSH组件
+-keep class com.jcraft.jsch.** { *; }
+
+# AndroidX 基础组件
+-keep class androidx.appcompat.** { *; }
+-keep interface androidx.appcompat.** { *; }
+
+# ============================== 优化与调试配置 ==============================
+# 优化级别（平衡混淆效果与性能）
+-optimizationpasses 5
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+
+# 调试辅助（保留行号便于崩溃定位）
+-verbose
+-dontpreverify
+-dontusemixedcaseclassnames
+-keepattributes SourceFile,LineNumberTable
+

powerbell/src/beta/AndroidManifest.xml

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

powerbell/src/beta/res/values-zh/string.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">能源钟☆</string>
+    <string name="app_name_cn1">能源钟★</string>
+    <string name="app_name_cn2">泡额呗额☆</string>
 
 </resources>

powerbell/src/beta/res/xml/shortcutsmaincn1.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+	    android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN1"
+	        android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

powerbell/src/beta/res/xml/shortcutsmaincn2.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+	    android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN2"
+	        android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+</shortcuts>

powerbell/src/beta/res/xml/shortcutsmainen1.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<!--<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+	    android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_EN1"
+	        android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.powerbell.beta"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

powerbell/src/main/AndroidManifest.xml

@@ -1,8 +1,15 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="cc.winboll.studio.powerbell">
 
+    <!-- 只能在前台获取精确的位置信息 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <!-- 只有在前台运行时才能获取大致位置信息 -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+
     <!-- 拍摄照片和视频 -->
     <uses-permission android:name="android.permission.CAMERA"/>
 
@@ -24,10 +31,29 @@
     <!-- 显示通知 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+    <!-- PACKAGE_USAGE_STATS -->
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+
+    <!-- BATTERY_STATS -->
+    <uses-permission android:name="android.permission.BATTERY_STATS"/>
+
+    <!-- 计算应用存储空间 -->
+    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
+
     <uses-feature android:name="android.hardware.camera"/>
 
     <uses-feature android:name="android.hardware.camera.autofocus"/>
 
+    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
+
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission"/>
+
+    <uses-permission
+        android:name="android.permission.ACCESS_PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions"/>
+
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -36,12 +62,27 @@
         android:theme="@style/AppTheme_Default"
         android:persistent="true"
         android:resizeableActivity="true"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:usesCleartextTraffic="true"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTask"
-            android:exported="true">
+            android:label="@string/app_name"
+            android:exported="true"
+            android:launchMode="singleTask">
+
+        </activity>
+
+        <activity android:name=".activities.CrashActivity"/>
+
+        <activity-alias
+            android:name=".MainActivityEN1"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:icon="@drawable/ic_launcher"
+            android:enabled="true">
 
             <intent-filter>
 
@@ -51,7 +92,55 @@
 
             </intent-filter>
 
-        </activity>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmainen1"/>
+
+        </activity-alias>
+
+        <activity-alias
+            android:name=".MainActivityCN1"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name_cn1"
+            android:icon="@drawable/ic_launcher"
+            android:enabled="false">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmaincn1"/>
+
+        </activity-alias>
+
+        <activity-alias
+            android:name=".MainActivityCN2"
+            android:targetActivity=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name_cn2"
+            android:icon="@drawable/ic_launcher"
+            android:enabled="false">
+
+            <intent-filter>
+
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcutsmaincn2"/>
+
+        </activity-alias>
 
         <activity
             android:name="cc.winboll.studio.powerbell.activities.ClearRecordActivity"
@@ -61,7 +150,7 @@
         </activity>
 
         <activity
-            android:name="cc.winboll.studio.powerbell.activities.BackgroundPictureActivity"
+            android:name="cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity"
             android:parentActivityName="cc.winboll.studio.powerbell.MainActivity"
             android:exported="true"
             android:launchMode="singleTask">
@@ -123,6 +212,26 @@
 
         <activity android:name="cc.winboll.studio.powerbell.activities.PixelPickerActivity"/>
 
+        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReportActivity"/>
+
+        <activity android:name="cc.winboll.studio.powerbell.unittest.MainUnitTestActivity"/>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider"/>
+
+        </provider>
+
+        <activity android:name="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"/>
+
+        <activity android:name="cc.winboll.studio.powerbell.activities.SettingsActivity"/>
+
     </application>
 
-</manifest>
+</manifest>

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

@@ -4,16 +4,23 @@ import android.content.Context;
 import android.os.Environment;
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
-import com.hjq.toast.ToastUtils;
 import java.io.File;
 
 public class App extends GlobalApplication {
 
-    public static final String TAG = "GlobalApplication";
-
+    public static final String TAG = "App";
+	
+	public static final String COMPONENT_EN1 = "cc.winboll.studio.powerbell.MainActivityEN1";
+	public static final String COMPONENT_CN1 = "cc.winboll.studio.powerbell.MainActivityCN1";
+	public static final String COMPONENT_CN2 = "cc.winboll.studio.powerbell.MainActivityCN2";
+	public static final String ACTION_SWITCHTO_EN1 = "cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_EN1";
+	public static final String ACTION_SWITCHTO_CN1 = "cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN1";
+	public static final String ACTION_SWITCHTO_CN2 = "cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN2";
+	
     // 数据配置存储工具
     static AppConfigUtils _mAppConfigUtils;
     static AppCacheUtils _mAppCacheUtils;
@@ -27,6 +34,8 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+		//setIsDebugging(false);
+		setIsDebugging(BuildConfig.DEBUG);
 
         // 临时文件夹方案1
         // 获取Pictures文件夹路径（Android 10及以上推荐使用MediaStore，此处为传统方式）
@@ -50,7 +59,7 @@ public class App extends GlobalApplication {
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.toast_custom_view);
         //ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
 
         // 设置数据配置存储工具
         _mAppConfigUtils = getAppConfigUtils(this);
@@ -77,5 +86,13 @@ public class App extends GlobalApplication {
     public void clearBatteryHistory() {
         _mAppCacheUtils.clearBatteryHistory();
     }
+
+	@Override
+	public void onTerminate() {
+		super.onTerminate();
+		ToastUtils.release();
+	}
+	
+	
 }
 

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

@@ -8,36 +8,66 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.RelativeLayout;
-import android.widget.Toast;
-import cc.winboll.studio.libaes.views.AToolbar;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.views.ADsBannerView;
+import cc.winboll.studio.libappbase.LogActivity;
 import cc.winboll.studio.libappbase.LogUtils;
-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.BackgroundSettingsActivity;
+import cc.winboll.studio.powerbell.activities.BatteryReportActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
+import cc.winboll.studio.powerbell.activities.SettingsActivity;
 import cc.winboll.studio.powerbell.activities.WinBoLLActivity;
-import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
+import cc.winboll.studio.powerbell.model.BackgroundBean;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
-import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
+import cc.winboll.studio.powerbell.unittest.MainUnitTestActivity;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
 
+/**
+ * 主活动类（修复小米广告SDK空Context崩溃问题）
+ * 核心修改点：
+ * 1. 添加全局Context安全校验
+ * 2. 优化广告请求的生命周期判断
+ * 3. 确保广告操作在主线程执行
+ * 4. 完善广告资源释放逻辑
+ */
 public class MainActivity extends WinBoLLActivity {
 
     public static final String TAG = "MainActivity";
-    public static final int BACKGROUND_PICTURE_REQUEST_CODE = 0;
+
+    private static final int REQUEST_WRITE_STORAGE_PERMISSION = 1001;
+
+//    private static final String PRIVACY_FILE = "privacy_pfs";
+//    private static final String PRIVACY_VALUE = "privacy_value";//0: 拒绝，1：赞同
+//
+//    private SharedPreferences mSharedPreferences;
+//
+//    private String BANNER_POS_ID = "802e356f1726f9ff39c69308bfd6f06a";
+//    private String BANNER_POS_ID_WINBOLL_BETA = "d129ee5a263911f981a6dc7a9802e3e7";
+//    private String BANNER_POS_ID_WINBOLL = "4ec30efdb32271765b9a4efac902828b";
+
+//    private BannerAd mBannerAd;
+//    private List<BannerAd> mAllBanners = new ArrayList<>();
+//
+//    private ViewGroup mContainer;
+//
+//    private boolean mIsBiddingWin = true;
+//
+//    public static final int BACKGROUND_PICTURE_REQUEST_CODE = 0;
 
     public static MainActivity _mMainActivity;
-    //LogView mLogView;
-    //ArrayList<Fragment> mlistFragment;
-    App mApplication;
-    //AppConfigUtils mAppConfigUtils;
-    Menu mMenu;
-    Fragment mCurrentShowFragment;
-    MainViewFragment mMainViewFragment;
-    AToolbar mAToolbar;
+    private App mApplication;
+    private Menu mMenu;
+    private Fragment mCurrentShowFragment;
+    private MainViewFragment mMainViewFragment;
+    private Toolbar mToolbar;
+    // 新增：主线程Handler，确保广告操作在主线程执行
+    //private Handler mMainHandler;
+	ADsBannerView mADsBannerView;
 
     @Override
     public Activity getActivity() {
@@ -51,26 +81,28 @@ public class MainActivity extends WinBoLLActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        //LogUtils.d(TAG, "onCreate(...)");
+        LogUtils.d(TAG, "onCreate(...)");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+		mADsBannerView = findViewById(R.id.adsbanner);
 
-        // 设置调试日志
-//        mLogView = findViewById(R.id.logview);
-//        mLogView.start();
-//        //LogUtils.d(TAG, "LogView Start.");
-//        mLogView.updateLogView();
+//        mContainer = findViewById(R.id.ads_container);
+//
+//        // 初始化主线程Handler（关键：确保广告操作在主线程执行）
+//        mMainHandler = new Handler(Looper.getMainLooper());
+//
+//        // 米盟模块：隐私协议弹窗
+//        showPrivacy();
 
-        _mMainActivity = MainActivity.this;
+        _mMainActivity = this;
         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);
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
 
+        // 初始化主Fragment
         if (mMainViewFragment == null) {
             FragmentTransaction tx = getFragmentManager().beginTransaction();
             mMainViewFragment = new MainViewFragment();
@@ -78,13 +110,46 @@ public class MainActivity extends WinBoLLActivity {
             tx.commit();
         }
         showFragment(mMainViewFragment);
-
-//        NotificationHelper notificationUtils = new NotificationHelper(this);
-//        notificationUtils.createNotificationChannels();
-
-
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+//        // 修复：释放广告资源，避免内存泄漏
+//        releaseAdResources();
+        // 置空静态引用，避免内存泄漏
+        _mMainActivity = null;
+//        // 移除Handler回调
+//        if (mMainHandler != null) {
+//            mMainHandler.removeCallbacksAndMessages(null);
+//        }
+		if (mADsBannerView != null) {
+			mADsBannerView.releaseAdResources();
+		}
+    }
+//
+//    /**
+//     * 释放广告资源（关键：避免内存泄漏和空Context调用）
+//     */
+//    private void releaseAdResources() {
+//        LogUtils.d(TAG, "releaseAdResources()");
+//        // 销毁所有广告实例
+//        if (mAllBanners != null && !mAllBanners.isEmpty()) {
+//            for (BannerAd ad : mAllBanners) {
+//                if (ad != null) {
+//                    ad.destroy();
+//                }
+//            }
+//            mAllBanners.clear();
+//        }
+//        // 置空当前广告引用
+//        mBannerAd = null;
+//        // 移除广告容器中的视图
+//        if (mContainer != null) {
+//            mContainer.removeAllViews();
+//        }
+//    }
+
     void showFragment(Fragment fragment) {
         FragmentTransaction tx = getFragmentManager().beginTransaction();
         for (Fragment item : getFragmentManager().getFragments()) {
@@ -95,7 +160,6 @@ public class MainActivity extends WinBoLLActivity {
         mCurrentShowFragment = fragment;
     }
 
-
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
@@ -103,8 +167,9 @@ public class MainActivity extends WinBoLLActivity {
     }
 
     public static void reloadBackground() {
-        if (_mMainActivity != null) {
-            _mMainActivity.mMainViewFragment.loadBackground();
+        // 修复：添加非空校验，避免Activity已销毁时调用
+        if (_mMainActivity != null && !_mMainActivity.isFinishing() && !_mMainActivity.isDestroyed()) {
+            _mMainActivity.mMainViewFragment.reloadBackground();
         }
     }
 
@@ -113,94 +178,95 @@ public class MainActivity extends WinBoLLActivity {
      */
     private String getRealPathFromURI(Uri contentUri) {
         String[] proj = {MediaStore.MediaColumns.DATA};
-        Cursor cursor=getContentResolver().query(contentUri, proj, null, null, null);
-        if (cursor.moveToNext()) {
-			int nColumnIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
-			if (nColumnIndex > -1) {
-				return cursor.getString(nColumnIndex);
-			} else {
-				LogUtils.d(TAG, "getRealPathFromURI nColumnIndex is -1.");
-			}
+        Cursor cursor = getContentResolver().query(contentUri, proj, null, null, null);
+        if (cursor != null && cursor.moveToNext()) {
+            int nColumnIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
+            if (nColumnIndex > -1) {
+                String path = cursor.getString(nColumnIndex);
+                cursor.close();
+                return path;
+            } else {
+                LogUtils.d(TAG, "getRealPathFromURI nColumnIndex is -1.");
+            }
+            cursor.close();
         }
-        cursor.close();
         return null;
-	}
+    }
 
     @Override
     protected void onResume() {
         super.onResume();
-        // 回到窗口自动取消提醒消息
-        //NotificationHelper.cancelRemindNotification(this);
         reloadBackground();
-		setBackgroundColor();
+        setBackgroundColor();
+		if (mADsBannerView != null) {
+			mADsBannerView.resumeADs(MainActivity.this);
+		}
+
+//        // 修复：优化广告请求逻辑（添加生命周期判断 + 主线程执行）
+//        if (!isFinishing() && !isDestroyed()) {
+//			String privacyAgreeValue = getSharedPreferences().getString(PRIVACY_VALUE, null);
+//			if (TextUtils.equals(privacyAgreeValue, String.valueOf(1))) {
+//				LogUtils.i(TAG, "已同意隐私协议，开始播放米盟广告...");
+//				mMainHandler.postDelayed(new Runnable() {
+//						@Override
+//						public void run() {
+//							// 再次校验生命周期，避免延迟执行时Activity已销毁
+//							if (!isFinishing() && !isDestroyed()) {
+//								fetchAd();
+//							}
+//						}
+//					}, 1000); // 延迟1秒请求广告，提升页面加载体验
+//			}
+//
+//        }
     }
 
-    // Menu icons are inflated just as they were with actionbar
-    //
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
         mMenu = menu;
         getMenuInflater().inflate(R.menu.toolbar_main, mMenu);
+		if (App.isDebugging()) {
+			getMenuInflater().inflate(R.menu.toolbar_unittest, mMenu);
+		}
         return true;
     }
 
-    // 回退开发者选项重设UI到初始用户状态
-    //
-    /*public void resetUI(MainActivity MainActivity) {
-     mMenu.clear();
-     getMenuInflater().inflate(R.menu.toolbar_main, mMenu);
-     }*/
-
-    @Override 
-    public boolean onOptionsItemSelected(MenuItem item) { 
-        super.onOptionsItemSelected(item); 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
         int menuItemId = item.getItemId();
-        if (menuItemId == R.id.action_about) {
-            Intent intent = new Intent(this, AboutActivity.class);
-            startActivity(intent);
-        } else if (menuItemId == R.id.action_battery_reporter) {
-            Intent intent = new Intent();
-            intent.setClass(this, BatteryReporterActivity.class);
-            startActivity(intent);
+        if (menuItemId == R.id.action_settings) {
+            startActivity(new Intent(this, SettingsActivity.class));
+        } else if (menuItemId == R.id.action_about) {
+            startActivity(new Intent(this, AboutActivity.class));
+        } else if (menuItemId == R.id.action_battery_report) {
+            startActivity(new Intent(this, BatteryReportActivity.class));
         } else if (menuItemId == R.id.action_clearrecord) {
-            Intent intent = new Intent();
-            intent.setClass(this, ClearRecordActivity.class);
-            startActivity(intent);
+            startActivity(new Intent(this, ClearRecordActivity.class));
         } else if (menuItemId == R.id.action_changepicture) {
-            Intent intent = new Intent();
-            intent.setClass(this, BackgroundPictureActivity.class);
-            startActivity(intent);
+            startActivity(new Intent(this, BackgroundSettingsActivity.class));
         } else if (menuItemId == R.id.action_log) {
-            App.getWinBoLLActivityManager().startLogActivity(this);
+            LogActivity.startLogActivity(this);
+        } else if (menuItemId == R.id.action_unittestactivity) {
+            startActivity(new Intent(this, MainUnitTestActivity.class));
         }
-
         return true;
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        //LogUtils.d(TAG, "onActivityResult(...)");
-        //LogUtils.d(TAG, "requestCode is : " + Integer.toString(requestCode));
-        //LogUtils.d(TAG, "resultCode is : " + Integer.toString(resultCode));
-
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == BACKGROUND_PICTURE_REQUEST_CODE) {
-            // 处理选择后图片
-            if (resultCode == RESULT_OK) {
-                //mMainViewFragment.loadBackgroundPicture();
-                Toast.makeText(getApplication(), "OK", Toast.LENGTH_SHORT).show();
-            }
-        } else {
-            String sz = "Unsolved requestCode = " + Integer.toString(requestCode);
-            Toast.makeText(getApplication(), sz, Toast.LENGTH_SHORT).show();
-            LogUtils.d(TAG, sz);
-        }
+//        if (requestCode == BACKGROUND_PICTURE_REQUEST_CODE) {
+//            if (resultCode == RESULT_OK) {
+//                Toast.makeText(getApplicationContext(), "OK", Toast.LENGTH_SHORT).show();
+//            }
+//        } else {
+//            String sz = "Unsolved requestCode = " + Integer.toString(requestCode);
+//            Toast.makeText(getApplicationContext(), sz, Toast.LENGTH_SHORT).show();
+//            LogUtils.d(TAG, sz);
+//        }
     }
 
-    /**
-     * 返回键
-     */
     @Override
     public void onBackPressed() {
         if (mCurrentShowFragment != mMainViewFragment) {
@@ -210,11 +276,349 @@ public class MainActivity extends WinBoLLActivity {
         }
     }
 
-	void setBackgroundColor() {
-		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(MainActivity.this);
-		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
-		int nPixelColor = bean.getPixelColor();
-		RelativeLayout mainLayout = findViewById(R.id.activitymainRelativeLayout1);
-		mainLayout.setBackgroundColor(nPixelColor);
-	}
-} 
+    void setBackgroundColor() {
+        // 修复：添加Activity非空校验
+        if (isFinishing() || isDestroyed()) {
+            return;
+        }
+        BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(this);
+        BackgroundBean bean = utils.getCurrentBackgroundBean();
+        int nPixelColor = bean.getPixelColor();
+        RelativeLayout mainLayout = findViewById(R.id.activitymainRelativeLayout1);
+        if (mainLayout != null) {
+            mainLayout.setBackgroundColor(nPixelColor);
+        }
+    }
+//
+//    /**
+//     * 显示广告（核心修复：传递安全的Context + 生命周期校验）
+//     */
+//    private void showAd() {
+//        LogUtils.d(TAG, "showAd()");
+//        // 1. 生命周期校验：避免Activity已销毁时操作UI
+//        if (isFinishing() || isDestroyed()) {
+//            LogUtils.e(TAG, "showAd: Activity is finishing or destroyed");
+//            return;
+//        }
+//        // 2. 非空校验：广告实例和容器
+//        if (mBannerAd == null || mContainer == null) {
+//            LogUtils.e(TAG, "showAd: BannerAd or Container is null");
+//            return;
+//        }
+//        // 3. 创建广告容器（使用ApplicationContext避免内存泄漏）
+//        final FrameLayout container = new FrameLayout(getApplicationContext());
+//        container.setPadding(0, 0, 0, MimoUtils.dpToPx(this, 10));
+//        mContainer.addView(container, new FrameLayout.LayoutParams(
+//							   FrameLayout.LayoutParams.MATCH_PARENT,
+//							   FrameLayout.LayoutParams.WRAP_CONTENT
+//						   ));
+//
+//        if (mIsBiddingWin) {
+//            mBannerAd.setPrice(getPrice());
+//        }
+//        // 4. 显示广告：传递ApplicationContext，避免Activity Context失效
+//        mBannerAd.showAd(MainActivity.this, container, new BannerAd.BannerInteractionListener() {
+//				@Override
+//				public void onAdClick() {
+//					LogUtils.d(TAG, "onAdClick");
+//				}
+//
+//				@Override
+//				public void onAdShow() {
+//					LogUtils.d(TAG, "onAdShow");
+//				}
+//
+//				@Override
+//				public void onAdDismiss() {
+//					LogUtils.d(TAG, "onAdDismiss");
+//					// 修复：移除容器时校验Activity状态
+//					if (!isFinishing() && !isDestroyed() && mContainer != null) {
+//						mContainer.removeView(container);
+//					}
+//				}
+//
+//				@Override
+//				public void onRenderSuccess() {
+//					LogUtils.d(TAG, "onRenderSuccess");
+//				}
+//
+//				@Override
+//				public void onRenderFail(int code, String msg) {
+//					LogUtils.e(TAG, "onRenderFail errorCode " + code + " errorMsg " + msg);
+//					// 修复：渲染失败时移除容器
+//					if (!isFinishing() && !isDestroyed() && mContainer != null) {
+//						mContainer.removeView(container);
+//					}
+//				}
+//			});
+//    }
+//
+//    /**
+//     * 请求广告（核心修复：Context安全校验 + 异常捕获 + 资源管理）
+//     */
+//    private void fetchAd() {
+//        LogUtils.d(TAG, "fetchAd()");
+//        // 1. 双重校验：Activity未销毁 + Context非空
+//        if (isFinishing() || isDestroyed() || getApplicationContext() == null) {
+//            LogUtils.e(TAG, "fetchAd: Invalid Context or Activity state");
+//            return;
+//        }
+//        // 2. 释放之前的广告资源，避免内存泄漏
+//        if (mBannerAd != null) {
+//            mBannerAd.destroy();
+//        }
+//        // 3. 初始化广告（使用ApplicationContext，避免Activity Context失效）
+//        try {
+//            mBannerAd = new BannerAd();
+//            mAllBanners.add(mBannerAd);
+//        } catch (Exception e) {
+//            LogUtils.e(TAG, "fetchAd: Init BannerAd failed", e);
+//            return;
+//        }
+//        // 4. 设置下载监听
+//        mBannerAd.setDownLoadListener(new BannerAd.BannerDownloadListener() {
+//				@Override
+//				public void onDownloadStarted() {
+//					LogUtils.d(TAG, "onDownloadStarted");
+//				}
+//
+//				@Override
+//				public void onDownloadPaused() {
+//					LogUtils.d(TAG, "onDownloadPaused");
+//				}
+//
+//				@Override
+//				public void onDownloadFailed(int errorCode) {
+//					LogUtils.d(TAG, "onDownloadFailed, errorCode = " + errorCode);
+//				}
+//
+//				@Override
+//				public void onDownloadFinished() {
+//					LogUtils.d(TAG, "onDownloadFinished");
+//				}
+//
+//				@Override
+//				public void onDownloadProgressUpdated(int progress) {
+//					LogUtils.d(TAG, "onDownloadProgressUpdated " + progress + "%");
+//				}
+//
+//				@Override
+//				public void onInstallFailed(int errorCode) {
+//					LogUtils.d(TAG, "onInstallFailed, errorCode = " + errorCode);
+//				}
+//
+//				@Override
+//				public void onInstallStart() {
+//					LogUtils.d(TAG, "onInstallStart");
+//				}
+//
+//				@Override
+//				public void onInstallSuccess() {
+//					LogUtils.d(TAG, "onInstallSuccess");
+//				}
+//
+//				@Override
+//				public void onDownloadCancel() {
+//					LogUtils.d(TAG, "onDownloadCancel");
+//				}
+//			});
+//
+//        // 5. 构建广告参数并请求
+//        String currentAD_ID = getAD_ID();
+//        LogUtils.d(TAG, String.format("currentAD_ID = %s", currentAD_ID));
+//        ADParams params = new ADParams.Builder().setUpId(currentAD_ID).build();
+//        mBannerAd.loadAd(params, new BannerAd.BannerLoadListener() {
+//				@Override
+//				public void onBannerAdLoadSuccess() {
+//					LogUtils.d(TAG, "onBannerAdLoadSuccess()");
+//					// 修复：广告加载成功后校验Activity状态
+//					if (!isFinishing() && !isDestroyed()) {
+//						showAd();
+//					}
+//				}
+//
+//				@Override
+//				public void onAdLoadFailed(int errorCode, String errorMsg) {
+//					LogUtils.e(TAG, "onAdLoadFailed: errorCode = " + errorCode + ", errorMsg = " + errorMsg);
+//					// 修复：加载失败时移除当前广告实例
+//					if (mAllBanners.contains(mBannerAd)) {
+//						mAllBanners.remove(mBannerAd);
+//					}
+//					mBannerAd.destroy();
+//					mBannerAd = null;
+//				}
+//			});
+//    }
+//
+//    /**
+//     * 根据当前秒数获取广告ID（原逻辑保留）
+//     */
+//    private String getAD_ID() {
+//        long currentSecond = System.currentTimeMillis() / 1000;
+//        return (currentSecond % 2 == 0) ? BANNER_POS_ID :
+//			(BuildConfig.DEBUG ? BANNER_POS_ID_WINBOLL_BETA : BANNER_POS_ID_WINBOLL);
+//    }
+//
+//    /**
+//     * 获取广告价格（原逻辑保留，添加空指针校验）
+//     */
+//    private long getPrice() {
+//        if (mBannerAd == null) {
+//            return 0;
+//        }
+//        Map<String, Object> map = mBannerAd.getMediaExtraInfo();
+//        if (map == null || map.isEmpty() || !map.containsKey("price")) {
+//            LogUtils.w(TAG, "getPrice: media extra info is null or no price key");
+//            return 0;
+//        }
+//        Object priceObj = map.get("price");
+//        if (priceObj instanceof Long) {
+//            return (Long) priceObj;
+//        } else if (priceObj instanceof Integer) {
+//            return ((Integer) priceObj).longValue();
+//        } else {
+//            LogUtils.e(TAG, "getPrice: price type is invalid");
+//            return 0;
+//        }
+//    }
+//
+//    /**
+//     * 显示隐私协议弹窗（原逻辑保留，优化Context使用）
+//     */
+//    private void showPrivacy() {
+//        // 校验Activity状态，避免弹窗泄露
+//        if (isFinishing() || isDestroyed()) {
+//            return;
+//        }
+//        String privacyAgreeValue = getSharedPreferences().getString(PRIVACY_VALUE, null);
+//        if (TextUtils.equals(privacyAgreeValue, String.valueOf(0))) {
+//            LogUtils.i(TAG, "已拒绝隐私协议，广告已处于不可用状态...");
+//            Toast.makeText(getApplicationContext(), "已拒绝隐私协议，广告已处于不可用状态", Toast.LENGTH_SHORT).show();
+//            return;
+//        }
+//        if (TextUtils.equals(privacyAgreeValue, String.valueOf(1))) {
+//            LogUtils.i(TAG, "已同意隐私协议，开始初始化米盟SDK...");
+//            initMimoSdk();
+//            return;
+//        }
+//        LogUtils.i(TAG, "开始弹出隐私协议...");
+//        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+//        builder.setTitle("用户须知");
+//        builder.setMessage("小米广告SDK隐私政策: https://dev.mi.com/distribute/doc/details?pId=1688, 请复制到浏览器查看");
+//        builder.setIcon(R.drawable.ic_launcher);
+//        builder.setCancelable(false); // 点击对话框以外的区域不消失
+//        builder.setPositiveButton("同意", new DialogInterface.OnClickListener() {
+//				@Override
+//				public void onClick(DialogInterface dialog, int which) {
+//					getSharedPreferences().edit()
+//                        .putString(PRIVACY_VALUE, String.valueOf(1))
+//                        .apply();
+//					initMimoSdk();
+//					dialog.dismiss();
+//				}
+//			});
+//        builder.setNegativeButton("拒绝", new DialogInterface.OnClickListener() {
+//				@Override
+//				public void onClick(DialogInterface dialog, int which) {
+//					getSharedPreferences().edit()
+//                        .putString(PRIVACY_VALUE, String.valueOf(0))
+//                        .apply();
+//					dialog.dismiss();
+//				}
+//			});
+//        AlertDialog dialog = builder.create();
+//
+//        // 配置弹窗位置（底部全屏）
+//        Window window = dialog.getWindow();
+//        if (window != null) {
+//            window.setGravity(Gravity.BOTTOM);
+//            WindowManager m = getWindowManager();
+//            Display d = m.getDefaultDisplay();
+//            WindowManager.LayoutParams p = window.getAttributes();
+//            p.width = d.getWidth();
+//            window.setAttributes(p);
+//        }
+//        dialog.show();
+//    }
+//
+//    /**
+//     * 初始化米盟SDK（核心修复：传递ApplicationContext + 异常捕获）
+//     */
+//    private void initMimoSdk() {
+//        // 1. 安全获取ApplicationContext，避免Activity Context失效
+//        Context appContext = getApplicationContext();
+//        if (appContext == null) {
+//            Log.e(TAG, "initMimoSdk: ApplicationContext is null");
+//            return;
+//        }
+//        // 2. 初始化SDK，捕获异常避免崩溃
+//        try {
+//            MimoSdk.init(appContext, new MimoCustomController() {
+//					@Override
+//					public boolean isCanUseLocation() {
+//						return true;
+//					}
+//
+//					@Override
+//					public MimoLocation getMimoLocation() {
+//						return null;
+//					}
+//
+//					@Override
+//					public boolean isCanUseWifiState() {
+//						return true;
+//					}
+//
+//					@Override
+//					public boolean alist() {
+//						return true;
+//					}
+//				}, new MimoSdk.InitCallback() {
+//					@Override
+//					public void success() {
+//						Log.d(TAG, "MimoSdk init success");
+//					}
+//
+//					@Override
+//					public void fail(int code, String msg) {
+//						Log.e(TAG, "MimoSdk init fail, code=" + code + ",msg=" + msg);
+//					}
+//				});
+//            MimoSdk.setDebugOn(true);
+//        } catch (Exception e) {
+//            Log.e(TAG, "initMimoSdk: init failed", e);
+//        }
+//    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Override
+    public void setupToolbar() {
+        super.setupToolbar();
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+        }
+    }
+//
+//    /**
+//     * 获取SharedPreferences实例（原逻辑保留，添加空指针校验）
+//     */
+//    public SharedPreferences getSharedPreferences() {
+//        if (mSharedPreferences == null) {
+//            // 修复：使用ApplicationContext获取SharedPreferences，避免Activity Context泄露
+//            Context appContext = getApplicationContext();
+//            if (appContext != null) {
+//                mSharedPreferences = appContext.getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
+//            } else {
+//                Log.e(TAG, "getSharedPreferences: ApplicationContext is null");
+//                // 降级方案：若ApplicationContext为空，使用Activity Context（仅作兼容）
+//                mSharedPreferences = super.getSharedPreferences(PRIVACY_FILE, Context.MODE_PRIVATE);
+//            }
+//        }
+//        return mSharedPreferences;
+//    }
+}
+

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

@@ -10,9 +10,9 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import cc.winboll.studio.libaes.models.APPInfo;
 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.libaes.views.AboutView;
 import cc.winboll.studio.powerbell.R;
 
 public class AboutActivity extends Activity {
@@ -57,7 +57,7 @@ public class AboutActivity extends Activity {
         appInfo.setAppGitOwner("Studio");
         appInfo.setAppGitAPPBranch(szBranchName);
         appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://discuz.winboll.cc/forum.php?mod=viewthread&tid=1");
+        appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=PowerBell");
         appInfo.setAppAPKName("PowerBell");
         appInfo.setAppAPKFolderName("PowerBell");
         return new AboutView(mContext, appInfo);

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

@@ -7,37 +7,40 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.text.TextUtils;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
 import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
+import cc.winboll.studio.powerbell.model.BackgroundBean;
 import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog;
-import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
+import cc.winboll.studio.powerbell.dialogs.NetworkBackgroundDialog;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
 import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
+import cc.winboll.studio.powerbell.views.BackgroundView;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import androidx.core.util.Preconditions;
 
-public class BackgroundPictureActivity extends WinBoLLActivity implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
+public class BackgroundSettingsActivity extends WinBoLLActivity implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
 
-    public static final String TAG = "BackgroundPictureActivity";
-    public BackgroundPictureUtils mBackgroundPictureUtils;
+    public static final String TAG = "BackgroundSettingsActivity";
+    public BackgroundSourceUtils mBackgroundSourceUtils;
 
     // 图片选择请求码
     public static final int REQUEST_SELECT_PICTURE = 0;
@@ -49,15 +52,28 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
     private File mfBackgroundDir;       // 背景图片存储文件夹
     private File mfPictureDir;          // 拍照与剪裁临时文件夹
     private File mfTakePhoto;           // 拍照文件
-    private File mfRecivedPicture;      // 接收的图片文件
-    private File mfTempCropPicture;     // 剪裁临时文件
-    private File mfRecivedCropPicture;  // 剪裁后的目标文件
+    //private File mfRecivedPicture;      // 接收的图片文件
+
+	// 背景视图预览图片的文件名
+	private String preViewFilePath = "";
+	private String preViewFileUrl = "";
+	BackgroundView bvPreviewBackground;
+	boolean isCommitSettings = false;
 
     // 静态变量
-    public static String _mszRecivedCropPicture = "RecivedCrop.jpg";
+	// 源文件的临时剪裁图片保存名称
+    private static String _mSourceCropTempFileName = "SourceCropTemp.jpg";
+	// 源文件的临时剪裁图片保存文件对象
+	private static File _mSourceCropTempFile;
+    // 源文件的剪裁图片保存名称
+    private static String _mSourceCroppedFileName = "SourceCropped.jpg";
+	// 源文件的剪裁图片保存文件对象
+	private static File _mSourceCroppedFile;
+	// 源文件的剪裁图片保存路径
+	private static String _mSourceCroppedFilePath;
     private static String _mszCommonFileType = "jpeg";
     private int mnPictureCompress = 100;
-    private static String _RecivedPictureFileName;
+    //private static String _RecivedBackgroundFileName;
 
 	@Override
 	public Activity getActivity() {
@@ -73,11 +89,13 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_backgroundpicture);
-        initEnv();
+		bvPreviewBackground = (BackgroundView) findViewById(R.id.activitybackgroundpictureBackgroundView1);
+		
+        //initEnv();
 
         // 初始化工具类和文件夹
-        mBackgroundPictureUtils = BackgroundPictureUtils.getInstance(this);
-        mfBackgroundDir = new File(mBackgroundPictureUtils.getBackgroundDir());
+        mBackgroundSourceUtils = BackgroundSourceUtils.getInstance(this);
+        mfBackgroundDir = new File(mBackgroundSourceUtils.getBackgroundSourceDirPath());
         if (!mfBackgroundDir.exists()) {
             mfBackgroundDir.mkdirs();
         }
@@ -89,10 +107,13 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
 
         // 初始化文件对象
         mfTakePhoto = new File(mfPictureDir, "TakePhoto.jpg");
-        mfTempCropPicture = new File(mfPictureDir, "TempCrop.jpg");
+        //mfTempCropPicture = new File(mfPictureDir, "TempCrop.jpg");
 
-        mfRecivedPicture = getRecivedPictureFile(this);
-        mfRecivedCropPicture = new File(mfBackgroundDir, _mszRecivedCropPicture);
+        //mfRecivedPicture = getRecivedPictureFile();
+        _mSourceCropTempFile = new File(mfBackgroundDir, _mSourceCropTempFileName);
+        _mSourceCroppedFile = new File(mfBackgroundDir, _mSourceCroppedFileName);
+		_mSourceCroppedFilePath = _mSourceCroppedFile.getAbsolutePath().toString();
+		LogUtils.d(TAG, String.format("_mSourceCroppedFilePath : %s", _mSourceCroppedFilePath));
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
@@ -102,7 +123,7 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
         mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    finish();
+                    finish(); // 点击导航栏返回按钮，触发 finish()
                 }
             });
 
@@ -116,7 +137,9 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
 		findViewById(R.id.activitybackgroundpictureAButton7).setOnClickListener(onPixelPickerClickListener);
 		findViewById(R.id.activitybackgroundpictureAButton8).setOnClickListener(onCleanPixelClickListener);
 
-        updatePreviewBackground();
+        BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+		utils.setCurrentSourceToPreview();
+		bvPreviewBackground.reloadPreviewBackground();
 
         // 处理分享的图片
         Intent intent = getIntent();
@@ -129,71 +152,85 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
         }
     }
 
-    private void initEnv() {
-        LogUtils.d(TAG, "initEnv()");
-        _RecivedPictureFileName = "Recived.data";
-    }
+//    private void initEnv() {
+//        LogUtils.d(TAG, "initEnv()");
+//        _RecivedBackgroundFileName = "SourcePicture.data";
+//    }
 
     public static String getBackgroundFileName() {
-        return _mszRecivedCropPicture;
+        return _mSourceCroppedFileName;
     }
 
     @Override
     public void onAcceptRecivedPicture(String szPreRecivedPictureName) {
-        BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(this);
-        utils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
-        utils.saveData();
-
-        File sourceFile = new File(utils.getBackgroundDir(), szPreRecivedPictureName);
-        if (FileUtils.copyFile(sourceFile, mfRecivedPicture)) {
-            startCropImageActivity(false);
-        } else {
-            ToastUtils.show("图片复制失败，请重试");
-        }
+		ToastUtils.show("onAcceptRecivedPicture not yet.");
+//        BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(this);
+//        utils.getCurrentBackgroundBean().setIsUseBackgroundFile(true);
+//        utils.saveSettings();
+//
+//        File sourceFile = new File(utils.getBackgroundSourceDirPath(), szPreRecivedPictureName);
+//        if (FileUtils.copyFile(sourceFile, mfRecivedPicture)) {
+//            startCropImageActivity(false);
+//        } else {
+//            ToastUtils.show("图片复制失败，请重试");
+//        }
     }
 
     /**
-     * 更新背景图片预览
+     * 更新背景图片预览，
+	 * 如果sourceFile参数为空，则加载旧的背景图片资源
      */
-    public void updatePreviewBackground() {
+    public void updateBackgroundView(File sourceFile, String sourceFileInfo) {
         LogUtils.d(TAG, "updatePreviewBackground");
-        ImageView ivPreviewBackground = (ImageView) findViewById(R.id.activitybackgroundpictureImageView1);
-        BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(this);
-        utils.loadBackgroundPictureBean();
+		BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(this);
+		if (sourceFile == null) {
+			bvPreviewBackground.reloadCurrentBackground();
+		} else {
+			utils.saveFileToPreviewBean(sourceFile, sourceFileInfo);
+			bvPreviewBackground.reloadPreviewBackground();
+		}
 
-        boolean isUseBackgroundFile = utils.getBackgroundPictureBean().isUseBackgroundFile();
-        if (isUseBackgroundFile && mfRecivedCropPicture.exists()) {
-            try {
-                String filePath = utils.getBackgroundDir() + getBackgroundFileName();
-                Drawable drawable = FileUtils.getImageDrawable(filePath);
-                if (drawable != null) {
-                    //drawable.setAlpha(120);
-                    ivPreviewBackground.setImageDrawable(drawable);
-                }
-                //ToastUtils.show("背景图片已更新");
-            } catch (IOException e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                ToastUtils.show("背景图片加载失败");
-            }
-        } else {
-            ToastUtils.show("未使用背景图片");
-            Drawable drawable = getResources().getDrawable(R.drawable.blank10x10);
-            if (drawable != null) {
-                drawable.setAlpha(120);
-                ivPreviewBackground.setImageDrawable(drawable);
-            }
-        }
+//        boolean isUseBackgroundFile = utils.getCurrentBackgroundBean().isUseBackgroundFile();
+//		LogUtils.d(TAG, String.format("isUseBackgroundFile is %s, _mSourceCroppedFile.exists() is %s ", isUseBackgroundFile, _mSourceCroppedFile.exists()));
+//
+//        //if (isUseBackgroundFile && _mSourceCroppedFile.exists()) {
+//		if (_mSourceCroppedFile.exists()) {
+//			//try {
+//			//String filePath = utils.getBackgroundDir() + getBackgroundFileName();
+//			preViewFilePath = _mSourceCroppedFilePath;
+//			LogUtils.d(TAG, String.format("preViewFilePathBackgroundView : %s", preViewFilePath));
+//			bvPreviewBackground.previewBackgroundImage(preViewFilePath);
+//			/*Drawable drawable = FileUtils.getImageDrawable(filePath);
+//			 if (drawable != null) {
+//			 //drawable.setAlpha(120);
+//			 //bvPreviewBackground.setImageDrawable(drawable);
+//			 }*/
+//			//ToastUtils.show("背景图片已更新");
+////            } catch (IOException e) {
+////                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+////                ToastUtils.show("背景图片加载失败");
+////            }
+//        } else {
+//            ToastUtils.show("未使用背景图片");
+//			preViewFilePath = "";
+//			bvPreviewBackground.previewBackgroundImage(preViewFilePath);
+////            Drawable drawable = getResources().getDrawable(R.drawable.blank10x10);
+////            if (drawable != null) {
+////                drawable.setAlpha(120);
+////                bvPreviewBackground.setImageDrawable(drawable);
+////            }
+//        }
     }
 
     // 点击事件监听器
     private View.OnClickListener onOriginNullClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
-            BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+            BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+            BackgroundBean bean = utils.getCurrentBackgroundBean();
             bean.setIsUseBackgroundFile(false);
-            utils.saveData();
-            updatePreviewBackground();
+            utils.saveSettings();
+			bvPreviewBackground.reloadPreviewBackground();
         }
     };
 
@@ -258,10 +295,11 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
     private View.OnClickListener onReceivedPictureClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
-            utils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
-            utils.saveData();
-            updatePreviewBackground();
+			ToastUtils.show("onReceivedPictureClickListener not yet.");
+//            BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+//            utils.getCurrentBackgroundBean().setIsUseBackgroundFile(true);
+//            utils.saveSettings();
+//            updateBackgroundView();
         }
     };
 
@@ -270,7 +308,7 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
         public void onClick(View v) {
 			// 从文件路径启动像素拾取活动
 			//String imagePath = "/storage/emulated/0/DCIM/Camera/sample.jpg";
-			String imagePath = mfRecivedCropPicture.toString();
+			String imagePath = _mSourceCroppedFile.toString();
 			Intent intent = new Intent(getApplicationContext(), PixelPickerActivity.class);
 			intent.putExtra("imagePath", imagePath);
 			startActivity(intent);
@@ -281,10 +319,10 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
 	private View.OnClickListener onCleanPixelClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-			BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
-			BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+			BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+			BackgroundBean bean = utils.getCurrentBackgroundBean();
 			bean.setPixelColor(0);
-			utils.saveData();
+			utils.saveSettings();
 			setBackgroundColor();
         }
     };
@@ -295,12 +333,13 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
     void compressQualityToRecivedPicture(Bitmap bitmap) {
         OutputStream outStream = null;
         try {
-            mfRecivedPicture = getRecivedPictureFile(this);
-            if (!mfRecivedPicture.exists()) {
-                mfRecivedPicture.createNewFile();
+			BackgroundSourceUtils utils= BackgroundSourceUtils.getInstance(this);
+            File fRecivedPicture = new File(utils.getPreviewBackgroundScaledCompressFilePath());
+            if (!fRecivedPicture.exists()) {
+                fRecivedPicture.createNewFile();
             }
 
-            FileOutputStream fos = new FileOutputStream(mfRecivedPicture);
+            FileOutputStream fos = new FileOutputStream(fRecivedPicture);
             outStream = new BufferedOutputStream(fos);
             bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outStream);
             outStream.flush();
@@ -327,24 +366,30 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
      */
     public void startCropImageActivity(boolean isCropFree) {
         LogUtils.d(TAG, "startCropImageActivity");
-        BackgroundPictureBean bean = mBackgroundPictureUtils.loadBackgroundPictureBean();
-        mfRecivedPicture = getRecivedPictureFile(this);
-        Uri uri = UriUtil.getUriForFile(this, mfRecivedPicture);
+		BackgroundSourceUtils utils= BackgroundSourceUtils.getInstance(this);
+	    BackgroundBean bean = utils.getPreviewBackgroundBean();
+		bean.setIsUseScaledCompress(true);
+		utils.saveSettings();
+		
+		File fRecivedPicture = new File(utils.getPreviewBackgroundFilePath());
+		
+        Uri uri = UriUtil.getUriForFile(this, fRecivedPicture);
         LogUtils.d(TAG, "uri : " + uri.toString());
 
-        if (mfTempCropPicture.exists()) {
-            mfTempCropPicture.delete();
+        if (_mSourceCropTempFile.exists()) {
+            _mSourceCropTempFile.delete();
         }
+
         try {
-            mfTempCropPicture.createNewFile();
+            _mSourceCropTempFile.createNewFile();
         } catch (IOException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
             ToastUtils.show("剪裁临时文件创建失败");
             return;
         }
 
-        Uri cropOutPutUri = Uri.fromFile(mfTempCropPicture);
-        LogUtils.d(TAG, "mfTempCropPicture : " + mfTempCropPicture.getPath());
+        Uri cropOutPutUri = Uri.fromFile(_mSourceCropTempFile);
+        LogUtils.d(TAG, "mfTempCropPicture : " + _mSourceCropTempFile.getPath());
 
         Intent intent = new Intent("com.android.camera.action.CROP");
         intent.setDataAndType(uri, "image/" + _mszCommonFileType);
@@ -361,6 +406,7 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
         intent.putExtra("scale", true);
         intent.putExtra("outputFormat", Bitmap.CompressFormat.JPEG.toString());
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+
         startActivityForResult(intent, REQUEST_CROP_IMAGE);
     }
 
@@ -388,7 +434,7 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
         }
 
         // 优化：创建保存目录
-        File backgroundDir = new File(mBackgroundPictureUtils.getBackgroundDir());
+        File backgroundDir = new File(mBackgroundSourceUtils.getBackgroundSourceDirPath());
         if (!backgroundDir.exists()) {
             if (!backgroundDir.mkdirs()) {
                 ToastUtils.show("无法创建保存目录");
@@ -397,11 +443,12 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
             }
         }
 
-        File saveFile = new File(backgroundDir, getBackgroundFileName());
+		// 剪裁的图片的保存地址
+        File fScaledCompressBitmapFile = new File(backgroundDir, BackgroundSourceUtils.getInstance(this).getPreviewBackgroundScaledCompressFilePath());
 
         // 优化：检查文件是否可写
-        if (saveFile.exists() && !saveFile.canWrite()) {
-            if (!saveFile.delete()) {
+        if (fScaledCompressBitmapFile.exists() && !fScaledCompressBitmapFile.canWrite()) {
+            if (!fScaledCompressBitmapFile.delete()) {
                 ToastUtils.show("无法删除旧文件");
                 if (scaledBitmap != bitmap) scaledBitmap.recycle();
                 return;
@@ -410,36 +457,41 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
 
         FileOutputStream fos = null;
         try {
-            fos = new FileOutputStream(saveFile);
+            fos = new FileOutputStream(fScaledCompressBitmapFile);
             boolean success = scaledBitmap.compress(Bitmap.CompressFormat.JPEG, 80, fos);
             fos.flush();
             if (success) {
-                ToastUtils.show("保存成功");
-                // 更新数据
-                mBackgroundPictureUtils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
-                updatePreviewBackground();
+				ToastUtils.show("图片压缩保存成功");
+				BackgroundSourceUtils.getInstance(this).getPreviewBackgroundBean().setIsUseScaledCompress(true);
+				BackgroundSourceUtils.getInstance(this).saveSettings();
+				bvPreviewBackground.reloadPreviewBackground();
+
             } else {
                 ToastUtils.show("图片压缩保存失败");
+				BackgroundSourceUtils.getInstance(this).getPreviewBackgroundBean().setIsUseScaledCompress(false);
+				BackgroundSourceUtils.getInstance(this).saveSettings();
+				bvPreviewBackground.reloadPreviewBackground();
             }
         } catch (FileNotFoundException e) {
             LogUtils.e(TAG, "文件未找到" + e);
-            ToastUtils.show("保存失败：文件路径错误");
+            ToastUtils.show("文件未找到" + e);
         } catch (IOException e) {
             LogUtils.e(TAG, "写入异常" + e);
-            ToastUtils.show("保存失败：磁盘可能已满或路径错误");
+            ToastUtils.show("写入异常" + e);
         } finally {
             if (fos != null) {
                 try {
                     fos.close();
                 } catch (IOException e) {
                     LogUtils.e(TAG, "流关闭异常" + e);
-                }
-            }
-            if (scaledBitmap != null && !scaledBitmap.isRecycled()) {
-                scaledBitmap.recycle();
-            }
-        }
-    }
+					ToastUtils.show("流关闭异常" + e);
+				}
+			}
+			if (scaledBitmap != null && !scaledBitmap.isRecycled()) {
+				scaledBitmap.recycle();
+			}
+		}
+	}
 
     /**
      * 缩放Bitmap
@@ -457,7 +509,9 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
      * 分享图片
      */
     void sharePicture() {
-        Uri uri = UriUtil.getUriForFile(this, mfRecivedPicture);
+		BackgroundSourceUtils utils= BackgroundSourceUtils.getInstance(this);
+		File fRecivedPicture = new File(utils.getCurrentBackgroundFilePath());
+        Uri uri = UriUtil.getUriForFile(this, fRecivedPicture);
         Intent shareIntent = new Intent(Intent.ACTION_SEND);
         shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
         shareIntent.setType("image/" + _mszCommonFileType);
@@ -465,11 +519,20 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
         startActivity(Intent.createChooser(shareIntent, "Share Image"));
     }
 
-    public static File getRecivedPictureFile(Context context) {
-        BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(context);
-        utils.loadBackgroundPictureBean();
-        return new File(utils.getBackgroundDir(), _RecivedPictureFileName);
-    }
+//    public File getRecivedPictureFile() {
+//        BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(this);
+//        utils.loadSettings();
+//        return new File(utils.getBackgroundSourceDirPath(), _RecivedBackgroundFileName);
+//    }
+
+//	public void saveToRecivedBackground(String srcFilePath, String srcFillSourcePath) {
+//        BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(this);
+//        utils.loadSettings();
+//        File dstFile = new File(utils.getBackgroundSourceDirPath(), _RecivedBackgroundFileName);
+//		//compressQualityToRecivedPicture(srcFilePath);
+//		ToastUtils.show("compressQualityToRecivedPicture not yet.");
+//		FileUtils.copyFile(new File(srcFilePath), dstFile);
+//    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -479,12 +542,17 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
                 Uri selectedImage = data.getData();
                 LogUtils.d(TAG, "Uri is : " + selectedImage.toString());
                 File fSrcImage = new File(UriUtil.getFilePathFromUri(this, selectedImage));
-                mfRecivedPicture = getRecivedPictureFile(this);
-                if (FileUtils.copyFile(fSrcImage, mfRecivedPicture)) {
-                    startCropImageActivity(false);
-                } else {
-                    ToastUtils.show("图片复制失败，请重试");
-                }
+				BackgroundSourceUtils utils= BackgroundSourceUtils.getInstance(this);
+				utils.saveFileToPreviewBean(fSrcImage, selectedImage.toString());
+				startCropImageActivity(false);
+				//mfRecivedPicture = getRecivedPictureFile();
+//				BackgroundBean bean = utils.getPreviewBackgroundBean();
+//                mfRecivedPicture = getRecivedPictureFile();
+//                if (FileUtils.copyFile(fSrcImage, mfRecivedPicture)) {
+//                    startCropImageActivity(false);
+//                } else {
+//                    ToastUtils.show("图片复制失败，请重试");
+//                }
             } catch (Exception e) {
                 LogUtils.e(TAG, "选择图片异常" + e);
                 ToastUtils.show("选择图片失败：" + e.getMessage());
@@ -510,8 +578,9 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
                 // 方案1：通过Intent获取剪裁后的Bitmap
                 if (data != null && data.hasExtra("data")) {
                     cropBitmap = data.getParcelableExtra("data");
-                } else if (mfTempCropPicture.exists()) {
-                    cropBitmap = BitmapFactory.decodeFile(mfTempCropPicture.getPath());
+                } else if (_mSourceCropTempFile.exists()) {
+					LogUtils.d(TAG, String.format("_mSourceCropTempFile Exists, Path is ：%s ", _mSourceCropTempFile.getPath()));
+                    cropBitmap = BitmapFactory.decodeFile(_mSourceCropTempFile.getPath());
                 } else {
                     ToastUtils.show("剪裁文件不存在");
                     return;
@@ -577,8 +646,8 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
     }
 
 	void setBackgroundColor() {
-		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
-		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+		BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+		BackgroundBean bean = utils.getCurrentBackgroundBean();
 		int nPixelColor = bean.getPixelColor();
 		RelativeLayout mainLayout = findViewById(R.id.activitybackgroundpictureRelativeLayout1);
 		mainLayout.setBackgroundColor(nPixelColor);
@@ -589,5 +658,76 @@ public class BackgroundPictureActivity extends WinBoLLActivity implements Backgr
 		super.onResume();
 		setBackgroundColor();
 	}
+
+	public void onNetworkBackgroundDialog(View view) {
+		// 在需要显示对话框的地方（如网络状态监听回调中）
+		NetworkBackgroundDialog dialog = new NetworkBackgroundDialog(this, new NetworkBackgroundDialog.OnDialogClickListener() {
+				@Override
+				public void onConfirm(String szConfirmFilePath, String szConfirmFileUrl) {
+					//ToastUtils.show("onConfirm");
+					// 保存预览资源信息
+					preViewFilePath = szConfirmFilePath;
+					preViewFileUrl = szConfirmFileUrl;
+					onRecivedPictureListener.onRecivedPicture(preViewFilePath, preViewFileUrl);
+				}
+
+				@Override
+				public void onCancel() {
+					//ToastUtils.show("onCancel");
+				}
+			});
+
+		// 可选：修改对话框标题和内容（适配自定义场景）
+		dialog.setTitle("网络图片下载对话框");
+		dialog.setContent("是否下载地址中的图片资源，作为应用背景图片？");
+
+		// 显示对话框
+		dialog.show();
+
+	}
+
+	interface OnRecivedPictureListener {
+		void onRecivedPicture(String srcFilePath, String srcFileUrl);
+	}
+
+	OnRecivedPictureListener onRecivedPictureListener = new OnRecivedPictureListener(){
+		@Override
+		public void onRecivedPicture(String srcFilePath, String srcFileUrl) {
+			BackgroundSourceUtils utils= BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+			utils.saveFileToPreviewBean(new File(srcFilePath), srcFileUrl);
+			startCropImageActivity(true);
+		}
+	};
+
+    /**
+     * 重写finish方法，确保所有退出场景都触发Toast
+     */
+    @Override
+    public void finish() {
+        if (!isCommitSettings) {
+			YesNoAlertDialog.show(this, "应用背景更改提示：", "是否应用预览图片？", new YesNoAlertDialog.OnDialogResultListener(){
+
+					@Override
+					public void onNo() {
+						isCommitSettings = true;
+						BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+						BackgroundBean bean = utils.getCurrentBackgroundBean();
+						bean.setIsUseBackgroundFile(!preViewFilePath.equals(""));
+						utils.saveSettings();
+						finish();
+					}
+
+					@Override
+					public void onYes() {
+						BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(BackgroundSettingsActivity.this);
+						utils.commitPreviewSourceToCurrent();
+						isCommitSettings = true;
+						finish();
+					}
+				});
+		} else {
+			super.finish();
+		}
+    }
 }
 

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

@@ -0,0 +1,516 @@
+package cc.winboll.studio.powerbell.activities;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/10/22 13:21
+ * @Describe BatteryReportActivity
+ */
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.powerbell.R;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class BatteryReportActivity extends Activity {
+    public static final String TAG = "BatteryReportActivity";
+
+    private RecyclerView rvBatteryReport;
+    private BatteryReportAdapter adapter;
+    private List<AppBatteryModel> dataList = new ArrayList<AppBatteryModel>(); 
+    private List<AppBatteryModel> filteredList = new ArrayList<AppBatteryModel>(); 
+    private BroadcastReceiver batteryReceiver;
+    private int batteryCapacity = 5400; // 电池容量（mAh）
+    private float lastBatteryPercent = 100.0f;
+    private long lastCheckTime = System.currentTimeMillis();
+    private EditText etSearch;
+    private Map<String, Long> appRunTimeCache = new HashMap<String, Long>();
+    private Map<String, String> packageToAppNameCache = new HashMap<String, String>();
+    private PackageManager mPackageManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_battery_report);
+        mPackageManager = getPackageManager();
+
+        // 权限检查（Java7 传统条件判断）
+        if (!hasUsageStatsPermission(this)) {
+            Toast.makeText(this, "请进入设置-应用-权限-特殊访问权限-使用情况访问权限，开启本应用的权限", Toast.LENGTH_LONG).show();
+            startActivity(new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS));
+            return;
+        }
+
+        etSearch = (EditText) findViewById(R.id.et_search); 
+        rvBatteryReport = (RecyclerView) findViewById(R.id.rv_battery_report); 
+        rvBatteryReport.setLayoutManager(new LinearLayoutManager(this));
+
+        // 初始化流程：新增“加载24小时累计耗电”步骤
+        loadAllAppPackage();
+        preCacheAllAppNames();
+        appRunTimeCache = getAppRunTime();
+        updateAppRunTimeToModel();
+        calculateInitial24hTotalConsumption(); // 初始化时计算24小时累计耗电
+        filteredList.addAll(dataList);
+        adapter = new BatteryReportAdapter(this, filteredList, mPackageManager, packageToAppNameCache);
+        rvBatteryReport.setAdapter(adapter);
+
+        // 搜索监听（不变）
+        etSearch.addTextChangedListener(new TextWatcher() {
+				@Override
+				public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+				@Override
+				public void onTextChanged(CharSequence s, int start, int before, int count) {
+					filterAppsByPackageAndName(s.toString());
+				}
+
+				@Override
+				public void afterTextChanged(Editable s) {}
+			});
+
+        // 电池广播：调用修改后的“单次耗电计算+累计累加”方法
+        batteryReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                int level = intent.getIntExtra("level", 100);
+                int scale = intent.getIntExtra("scale", 100);
+                float currentPercent = (float) level / scale * 100;
+                LogUtils.d(TAG, "电池百分比变化：" + lastBatteryPercent + " -> " + currentPercent);
+
+                if (currentPercent < lastBatteryPercent) {
+                    float dropPercent = lastBatteryPercent - currentPercent;
+                    long duration = System.currentTimeMillis() - lastCheckTime;
+                    LogUtils.d(TAG, "电池消耗：" + dropPercent + "%，时长：" + duration + "ms");
+                    appRunTimeCache = getAppRunTime();
+                    updateAppRunTimeToModel();
+                    calculateSingleConsumptionAndAccumulate(dropPercent, appRunTimeCache); // 单次+累计逻辑
+                }
+
+                lastBatteryPercent = currentPercent;
+                lastCheckTime = System.currentTimeMillis();
+            }
+        };
+        registerReceiver(batteryReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        // Java7 显式非空判断
+        if (batteryReceiver != null) {
+            unregisterReceiver(batteryReceiver);
+        }
+    }
+
+    /**
+     * 加载所有应用（仅获取包名，初始化模型时单次耗电、累计耗电均设为0）
+     */
+    private void loadAllAppPackage() {
+        List<ApplicationInfo> appList = mPackageManager.getInstalledApplications(PackageManager.GET_META_DATA);
+        dataList.clear();
+
+        LogUtils.d(TAG, "开始加载应用包名列表，共找到" + appList.size() + "个应用");
+
+        for (ApplicationInfo appInfo : appList) {
+            String packageName = appInfo.packageName;
+            // 初始化：单次耗电（consumption）=0，累计耗电（totalConsumption）=0，运行时长=0
+            dataList.add(new AppBatteryModel(packageName, 0.0f, 0.0f, 0));
+        }
+
+        LogUtils.d(TAG, "应用包名列表加载完成，共添加" + dataList.size() + "个包名。");
+    }
+
+    /**
+     * 预缓存应用名称（逻辑不变）
+     */
+    private void preCacheAllAppNames() {
+        packageToAppNameCache.clear();
+        LogUtils.d(TAG, "开始预缓存包名-应用名称映射");
+
+        for (AppBatteryModel model : dataList) {
+            String packageName = model.getPackageName();
+            String appName = getAppNameByPackage(packageName);
+            packageToAppNameCache.put(packageName, appName);
+        }
+
+        LogUtils.d(TAG, "预缓存完成，共缓存" + packageToAppNameCache.size() + "个应用名称");
+    }
+
+    /**
+     * 通过包名获取应用名称（逻辑不变）
+     */
+    private String getAppNameByPackage(String packageName) {
+        try {
+            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName, 0);
+            return mPackageManager.getApplicationLabel(appInfo).toString();
+        } catch (PackageManager.NameNotFoundException e) {
+            LogUtils.e(TAG, "包名" + packageName + "对应的应用未找到：" + e.getMessage());
+            return packageName;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "查询应用名称失败（包名：" + packageName + "）：" + e.getMessage());
+            return packageName;
+        }
+    }
+
+    /**
+     * 更新运行时长到模型（逻辑不变）
+     */
+    private void updateAppRunTimeToModel() {
+        int nCount = 0;
+        for (AppBatteryModel model : dataList) {
+            String packageName = model.getPackageName();
+            Long runTime;
+            if (appRunTimeCache.containsKey(packageName)) {
+                runTime = appRunTimeCache.get(packageName);
+                LogUtils.d(TAG, String.format("应用包 %s 运行时长已更新。", packageName));
+                nCount++;
+            } else {
+                runTime = 0L;
+            }
+            model.setRunTime(runTime);
+        }
+        LogUtils.d(TAG, String.format("dataList.size() %d， appRunTimeCache.size() %d。", dataList.size(), appRunTimeCache.size()));
+        LogUtils.d(TAG, String.format("updateAppRunTimeToModel() 更新的数据量为：%d", nCount));
+    }
+
+    /**
+     * 【新增】初始化时计算24小时累计耗电（赋值给totalConsumption）
+     * 逻辑：基于24小时运行时长占比，分配当前电池容量的理论24小时消耗
+     */
+    private void calculateInitial24hTotalConsumption() {
+        long total24hRunTime = 0;
+        // 1. 计算24小时内所有应用总运行时长
+        for (Map.Entry<String, Long> entry : appRunTimeCache.entrySet()) {
+            total24hRunTime += entry.getValue();
+        }
+        LogUtils.d(TAG, "24小时内所有应用总运行时长：" + formatRunTime(total24hRunTime));
+
+        // 2. 按运行时长占比分配24小时累计耗电（假设电池满电循环，用总容量近似24小时总消耗）
+        for (AppBatteryModel model : dataList) {
+            String packageName = model.getPackageName();
+            Long app24hRunTime = appRunTimeCache.getOrDefault(packageName, 0L);
+
+            // 计算占比与累计耗电
+            float ratio = (total24hRunTime > 0) ? (float) app24hRunTime / total24hRunTime : 0;
+            float initialTotalConsumption = batteryCapacity * ratio; // 用电池容量近似24小时总消耗
+            model.setTotalConsumption(initialTotalConsumption); // 初始化累计耗电
+            LogUtils.d(TAG, String.format("应用包 %s 24小时累计耗电初始化：%.1f mAh", packageName, initialTotalConsumption));
+        }
+    }
+
+    /**
+     * 【核心修改】计算单次耗电（赋值给consumption）+ 累加至累计耗电（totalConsumption = totalConsumption + consumption）
+     */
+    private void calculateSingleConsumptionAndAccumulate(float dropPercent, Map<String, Long> runTimeMap) {
+        long totalSingleRunTime = 0;
+        // 1. 计算本次电池下降期间的总运行时长
+        for (Map.Entry<String, Long> entry : runTimeMap.entrySet()) {
+            totalSingleRunTime += entry.getValue();
+        }
+
+        // 2. 遍历计算每个应用的“单次耗电”并“累加至累计”
+        for (AppBatteryModel model : dataList) {
+            String packageName = model.getPackageName();
+            Long appSingleRunTime = runTimeMap.getOrDefault(packageName, 0L);
+
+            // 步骤1：计算本次单次耗电（赋值给consumption）
+            float ratio = (totalSingleRunTime > 0) ? (float) appSingleRunTime / totalSingleRunTime : 0;
+            float singleConsumption = batteryCapacity * dropPercent / 100 * ratio; // 单次消耗
+            model.setConsumption(singleConsumption); // 存储单次耗电
+
+            // 步骤2：累加单次耗电到累计耗电（totalConsumption = 原有累计 + 本次单次）
+            float newTotalConsumption = model.getTotalConsumption() + singleConsumption;
+            model.setTotalConsumption(newTotalConsumption); // 更新累计耗电
+
+            // 同步运行时长
+            model.setRunTime(appSingleRunTime);
+
+            LogUtils.d(TAG, String.format("应用包 %s：单次耗电%.1f mAh，累计耗电%.1f mAh", 
+										  packageName, singleConsumption, newTotalConsumption));
+        }
+
+        // 3. 按累计耗电排序（从高到低）
+        Collections.sort(dataList, new Comparator<AppBatteryModel>() {
+				@Override
+				public int compare(AppBatteryModel m1, AppBatteryModel m2) {
+					return Float.compare(m2.getTotalConsumption(), m1.getTotalConsumption());
+				}
+			});
+
+        // 4. 重新应用过滤并刷新列表
+        filterAppsByPackageAndName(etSearch.getText().toString());
+    }
+
+    /**
+     * 双维度过滤（逻辑不变）
+     */
+    private void filterAppsByPackageAndName(String keyword) {
+        filteredList.clear();
+        if (keyword == null || keyword.isEmpty()) {
+            filteredList.addAll(dataList);
+        } else {
+            String lowerKeyword = keyword.toLowerCase();
+
+            for (AppBatteryModel model : dataList) {
+                String packageName = model.getPackageName();
+                String packageNameLower = packageName.toLowerCase();
+                String appName = packageToAppNameCache.get(packageName);
+                String appNameLower = appName.toLowerCase();
+
+                boolean isMatched = packageNameLower.contains(lowerKeyword) 
+                    || appNameLower.contains(lowerKeyword);
+
+                if (isMatched) {
+                    filteredList.add(model);
+                }
+            }
+        }
+        adapter.notifyDataSetChanged();
+    }
+
+    /**
+     * 获取应用运行时长（逻辑不变，返回24小时运行时长）
+     */
+    private Map<String, Long> getAppRunTime() {
+        Map<String, Long> runTimeMap = new HashMap<String, Long>();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            try {
+                android.app.usage.UsageStatsManager manager =
+                    (android.app.usage.UsageStatsManager) getSystemService(Context.USAGE_STATS_SERVICE);
+                long endTime = System.currentTimeMillis();
+                long startTime = endTime - 24 * 3600 * 1000; // 近24小时
+                List<android.app.usage.UsageStats> statsList = manager.queryUsageStats(
+                    android.app.usage.UsageStatsManager.INTERVAL_DAILY, startTime, endTime);
+
+                for (android.app.usage.UsageStats stats : statsList) {
+                    long runTimeMs = stats.getTotalTimeInForeground();
+                    String packageName = stats.getPackageName();
+                    LogUtils.d(TAG, "包名" + packageName + "24小时运行时长：" + formatRunTime(runTimeMs));
+                    runTimeMap.put(packageName, runTimeMs);
+                    if (packageName.equals("aidepro.top")) {
+                        LogUtils.d(TAG, String.format("runTimeMap.put(packageName, runTimeMs) 特殊查询 %s 查询有结果。", packageName));
+                    }
+                }
+            } catch (Exception e) {
+                LogUtils.e(TAG, "获取应用运行时长失败：" + e.getMessage());
+            }
+        }
+
+        LogUtils.d(TAG, String.format("应用运行时长列表数量%d。", runTimeMap.size()));
+        return runTimeMap;
+    }
+
+    /**
+     * 格式化运行时长（逻辑不变）
+     */
+    private String formatRunTime(long runTimeMs) {
+        if (runTimeMs <= 0) {
+            return "0秒";
+        }
+        long seconds = runTimeMs / 1000;
+        long hours = seconds / 3600;
+        long minutes = (seconds % 3600) / 60;
+        seconds = seconds % 60;
+
+        if (hours > 0) {
+            return String.format("%d时%d分%d秒", hours, minutes, seconds);
+        } else if (minutes > 0) {
+            return String.format("%d分%d秒", minutes, seconds);
+        } else {
+            return String.format("%d秒", seconds);
+        }
+    }
+
+    /**
+     * 权限检查（逻辑不变）
+     */
+    private boolean hasUsageStatsPermission(Context context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return false;
+        }
+
+        android.app.usage.UsageStatsManager manager =
+            (android.app.usage.UsageStatsManager) context.getSystemService(Context.USAGE_STATS_SERVICE);
+        if (manager == null) {
+            return false;
+        }
+
+        long endTime = System.currentTimeMillis();
+        long startTime = endTime - 1000 * 60;
+        List<android.app.usage.UsageStats> statsList = manager.queryUsageStats(
+            android.app.usage.UsageStatsManager.INTERVAL_DAILY, startTime, endTime);
+
+        return statsList != null && !statsList.isEmpty();
+    }
+
+    /**
+     * 【核心修改】数据模型：明确字段含义
+     * - consumption：单次耗电（两次电池广播间的消耗，float类型便于计算）
+     * - totalConsumption：累计耗电（24小时初始化值+后续单次累加，显示用）
+     */
+    public static class AppBatteryModel {
+        private String packageName;    // 应用包名（核心标识）
+        private float consumption;     // 单次耗电（mAh，float类型）
+        private float totalConsumption;// 累计耗电（mAh，显示+排序用）
+        private long runTime;          // 运行时长（ms）
+
+		// Java7 显式构造：初始化单次耗电、累计耗电为0
+        public AppBatteryModel(String packageName, float consumption, float totalConsumption, long runTime) {
+            this.packageName = packageName;
+            this.consumption = consumption; // 单次耗电初始为0
+            this.totalConsumption = totalConsumption; // 累计耗电初始为0（后续初始化时赋值）
+            this.runTime = runTime;
+        }
+
+        // Getter/Setter：覆盖所有字段，确保数据操作正常
+        public String getPackageName() {
+            return packageName;
+        }
+
+        public float getConsumption() {
+            return consumption; // 获取单次耗电
+        }
+
+        public void setConsumption(float consumption) {
+            this.consumption = consumption; // 设置单次耗电
+        }
+
+        public float getTotalConsumption() {
+            return totalConsumption; // 获取累计耗电（显示用）
+        }
+
+        public void setTotalConsumption(float totalConsumption) {
+            this.totalConsumption = totalConsumption; // 设置累计耗电（初始化/累加用）
+        }
+
+        public long getRunTime() {
+            return runTime;
+        }
+
+        public void setRunTime(long runTime) {
+            this.runTime = runTime;
+        }
+    }
+
+    /**
+     * RecyclerView 适配器：仅显示累计耗电（totalConsumption），逻辑适配模型修改
+     */
+    public static class BatteryReportAdapter extends RecyclerView.Adapter<BatteryReportAdapter.ViewHolder> {
+        private Context mContext;
+        private List<AppBatteryModel> mDataList;
+        private PackageManager mPm;
+        private Map<String, String> mPackageToNameCache;
+
+        // Java7 显式构造：接收名称缓存，确保显示时高效获取应用名
+        public BatteryReportAdapter(Context context, List<AppBatteryModel> dataList, 
+                                    PackageManager pm, Map<String, String> packageToNameCache) {
+            this.mContext = context;
+            this.mDataList = dataList;
+            this.mPm = pm;
+            this.mPackageToNameCache = packageToNameCache;
+        }
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            // 加载系统列表项布局（text1显示应用名，text2显示累计耗电+时长）
+            View itemView = LayoutInflater.from(mContext)
+                .inflate(android.R.layout.simple_list_item_2, parent, false);
+            return new ViewHolder(itemView);
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            // Java7 显式非空判断：避免空指针异常
+            if (mDataList == null || mDataList.isEmpty() || position >= mDataList.size()) {
+                holder.tvAppName.setText("未知应用");
+                holder.tvConsumption.setText("累计耗电：0.0 mAh | 运行时长：0秒");
+                return;
+            }
+
+            AppBatteryModel model = mDataList.get(position);
+            String packageName = model.getPackageName();
+            String appName = "";
+
+            // 优先从缓存获取应用名：减少PackageManager调用，提升性能
+            if (mPackageToNameCache != null && mPackageToNameCache.containsKey(packageName)) {
+                appName = mPackageToNameCache.get(packageName);
+            } else {
+                // 缓存无数据时兜底查询，并同步更新缓存
+                try {
+                    ApplicationInfo appInfo = mPm.getApplicationInfo(packageName, 0);
+                    appName = mPm.getApplicationLabel(appInfo).toString();
+                    if (mPackageToNameCache != null) {
+                        mPackageToNameCache.put(packageName, appName);
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    appName = packageName; // 包名不存在时用包名兜底
+                    LogUtils.e("Adapter", "包名" + packageName + "对应的应用未找到：" + e.getMessage());
+                } catch (Exception e) {
+                    appName = packageName; // 其他异常时用包名兜底
+                    LogUtils.e("Adapter", "查询应用名称失败（包名：" + packageName + "）：" + e.getMessage());
+                }
+            }
+
+            // 显示逻辑：仅展示累计耗电（totalConsumption），隐藏单次耗电
+            holder.tvAppName.setText(appName);
+            // 格式化运行时长 + 累计耗电（保留1位小数，提升可读性）
+            String runTimeStr = ((BatteryReportActivity) mContext).formatRunTime(model.getRunTime());
+            String totalConsumptionText = String.format("累计耗电：%.1f mAh | 运行时长：%s",
+														model.getTotalConsumption(), runTimeStr);
+            holder.tvConsumption.setText(totalConsumptionText);
+
+            // 显示优化：文字颜色区分（避免所有应用均标蓝，仅示例可按需修改）
+            holder.tvAppName.setTextColor(mContext.getResources().getColor(android.R.color.black));
+            holder.tvConsumption.setTextColor(mContext.getResources().getColor(android.R.color.darker_gray));
+
+            // 调整文字大小：适配手机屏幕，提升可读性
+            holder.tvAppName.setTextSize(16);
+            holder.tvConsumption.setTextSize(14);
+        }
+
+        // 获取列表长度：Java7 三元运算符判断空值，避免空指针
+        @Override
+        public int getItemCount() {
+            return mDataList == null ? 0 : mDataList.size();
+        }
+
+        /**
+         * ViewHolder：绑定系统布局控件，与显示逻辑对应
+         */
+        public static class ViewHolder extends RecyclerView.ViewHolder {
+            TextView tvAppName;     // 显示应用名称
+            TextView tvConsumption; // 显示累计耗电 + 运行时长
+
+            // Java7 显式构造：绑定控件ID（系统布局固定ID：text1、text2）
+            public ViewHolder(View itemView) {
+                super(itemView);
+                tvAppName = (TextView) itemView.findViewById(android.R.id.text1);
+                tvConsumption = (TextView) itemView.findViewById(android.R.id.text2);
+            }
+        }
+    }
+}
+

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

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

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

@@ -4,19 +4,19 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Switch;
 import android.widget.TextView;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.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.model.BatteryInfoBean;
 import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
 import java.util.ArrayList;
-import android.widget.Switch;
 
 public class ClearRecordActivity extends Activity {
 

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

@@ -6,6 +6,7 @@ package cc.winboll.studio.powerbell.activities;
  */
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
@@ -19,14 +20,14 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity;
 import cc.winboll.studio.powerbell.activities.PixelPickerActivity;
-import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
-import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
+import cc.winboll.studio.powerbell.model.BackgroundBean;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -192,10 +193,10 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 				public void onClick(View v) {
 					dialog.dismiss();
 					// 可以在这里添加确定后的回调逻辑
-					BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(PixelPickerActivity.this);
-					BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+					BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(PixelPickerActivity.this);
+					BackgroundBean bean = utils.getCurrentBackgroundBean();
 					bean.setPixelColor(pixelColor);
-					utils.saveData();
+					utils.saveSettings();
 					Toast.makeText(PixelPickerActivity.this, "已记录像素值", Toast.LENGTH_SHORT).show();
 					setBackgroundColor();
 				}
@@ -216,8 +217,8 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 
 
 	void setBackgroundColor() {
-		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(PixelPickerActivity.this);
-		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
+		BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(PixelPickerActivity.this);
+		BackgroundBean bean = utils.getCurrentBackgroundBean();
 		int nPixelColor = bean.getPixelColor();
 		RelativeLayout mainLayout = findViewById(R.id.activitypixelpickerRelativeLayout1);
 		mainLayout.setBackgroundColor(nPixelColor);
@@ -233,7 +234,10 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
+			Intent intent = new Intent();
+            intent.setClass(this, BackgroundSettingsActivity.class);
+            startActivity(intent);
+            //GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), );
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
@@ -243,7 +247,10 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 	@Override
 	public void onBackPressed() {
 		super.onBackPressed();
-		GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
+		Intent intent = new Intent();
+		intent.setClass(this, BackgroundSettingsActivity.class);
+		startActivity(intent);
+		//GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), BackgroundPictureActivity.class);
 	}
 }
 

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

@@ -0,0 +1,21 @@
+package cc.winboll.studio.powerbell.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import cc.winboll.studio.powerbell.R;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/27 14:26
+ * @Describe 应用设置窗口
+ */
+public class SettingsActivity extends Activity {
+    
+    public static final String TAG = "SettingsActivity";
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+    }
+}

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

@@ -0,0 +1,49 @@
+package cc.winboll.studio.powerbell.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.utils.APPPlusUtils;
+import cc.winboll.studio.powerbell.App;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/15 13:45
+ * @Describe 应用快捷方式活动类
+ */
+public class ShortcutActionActivity extends Activity {
+
+    public static final String TAG = "ShortcutActionActivity";
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		// 处理应用级别的切换请求
+        handleSwitchRequest();
+		finish();
+	}
+
+	/**
+     * 处理应用图标快捷菜单的请求
+     */
+    private void handleSwitchRequest() {
+        Intent intent = getIntent();
+        if (intent != null && "switchto_en1".equals(intent.getDataString())) {
+			APPPlusUtils.switchAppLauncherToComponent(this, App.COMPONENT_EN1);
+            ToastUtils.show("切换至" + getString(R.string.app_name) + "图标");
+			//moveTaskToBack(true);
+        }
+		if (intent != null && "switchto_cn1".equals(intent.getDataString())) {
+			APPPlusUtils.switchAppLauncherToComponent(this, App.COMPONENT_CN1);
+            ToastUtils.show("切换至" + getString(R.string.app_name_cn1) + "图标");
+			//moveTaskToBack(true);
+        }
+		if (intent != null && "switchto_cn2".equals(intent.getDataString())) {
+			APPPlusUtils.switchAppLauncherToComponent(this, App.COMPONENT_CN2);
+            ToastUtils.show("切换至" + getString(R.string.app_name_cn2) + "图标");
+			//moveTaskToBack(true);
+        }
+    }
+}

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

@@ -5,40 +5,93 @@ package cc.winboll.studio.powerbell.activities;
  * @Date 2025/06/19 20:35
  * @Describe 应用窗口基类
  */
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.MenuItem;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import cc.winboll.studio.powerbell.App;
-import cc.winboll.studio.powerbell.MainActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.powerbell.BuildConfig;
 import cc.winboll.studio.powerbell.R;
 
-public abstract class WinBoLLActivity extends Activity implements IWinBoLLActivity {
+@SuppressLint("SetTextI18n")
+public abstract class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "WinBoLLActivity";
-
+	
+	protected TextView mTagView;
+	
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+		changeFullScreen(this);
+    }
+	
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        addVersionNameToContentView();
+    }
+
+    protected void addVersionNameToContentView() {
+        if (!isTagViewVisible()) {
+            return;
+        }
+        if (mTagView == null) {
+            mTagView = new TextView(this);
+            mTagView.setTextColor(Color.GRAY);
+            mTagView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
+            mTagView.setText("MIMO SDK V" + BuildConfig.VERSION_NAME);
+            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
+            FrameLayout frameLayout = findViewById(android.R.id.content);
+            frameLayout.addView(mTagView, params);
+        }
+    }
+
+    protected boolean isTagViewVisible() {
+        return true;
+    }
+
+    public void setupToolbar() {
+        Toolbar mToolbar = findViewById(R.id.toolbar);
+        if (mToolbar != null) {
+            setSupportActionBar(mToolbar);
+            if (getSupportActionBar() != null) {
+                getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            }
+        }
     }
 
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        GlobalApplication.getWinBoLLActivityManager().add(this);
+        //GlobalApplication.getWinBoLLActivityManager().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
+        //GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
+            //GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
             return true;
         }
         // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
@@ -48,6 +101,25 @@ public abstract class WinBoLLActivity extends Activity implements IWinBoLLActivi
 	@Override
 	public void onBackPressed() {
 		super.onBackPressed();
-		GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
+		//GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), MainActivity.class);
 	}
+	
+	public void changeFullScreen(Activity activity) {
+        Window window =  activity.getWindow();
+        if (window == null){
+            return;
+        }
+        View decorView = window.getDecorView();
+        if (decorView == null){
+            return;
+        }
+        int flag = decorView.getSystemUiVisibility();
+        flag |= View.SYSTEM_UI_FLAG_FULLSCREEN;
+        flag |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+        flag |= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+        flag |= View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+        flag |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+        decorView.setSystemUiVisibility(flag);
+        window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
 }

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

@@ -12,7 +12,7 @@ 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 cc.winboll.studio.powerbell.model.BatteryData;
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -1,99 +0,0 @@
-package cc.winboll.studio.powerbell.beans;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2024/07/18 11:52:28
- * @Describe 应用背景图片数据类
- */
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import java.io.IOException;
-
-public class BackgroundPictureBean extends BaseBean {
-
-    public static final String TAG = "BackgroundPictureBean";
-
-    int backgroundWidth = 100;
-    int backgroundHeight = 100;
-    boolean isUseBackgroundFile = false;
-	// 图片拾取像素颜色
-	int pixelColor = 0;
-
-    public BackgroundPictureBean() {
-    }
-
-    public BackgroundPictureBean(String recivedFileName, boolean isUseBackgroundFile) {
-        this.isUseBackgroundFile = isUseBackgroundFile;
-    }
-
-	public void setPixelColor(int pixelColor) {
-		this.pixelColor = pixelColor;
-	}
-
-	public int getPixelColor() {
-		return pixelColor;
-	}
-
-    public void setBackgroundWidth(int backgroundWidth) {
-        this.backgroundWidth = backgroundWidth;
-    }
-
-    public int getBackgroundWidth() {
-        return backgroundWidth;
-    }
-
-    public void setBackgroundHeight(int backgroundHeight) {
-        this.backgroundHeight = backgroundHeight;
-    }
-
-    public int getBackgroundHeight() {
-        return backgroundHeight;
-    }
-
-    public void setIsUseBackgroundFile(boolean isUseBackgroundFile) {
-        this.isUseBackgroundFile = isUseBackgroundFile;
-    }
-
-    public boolean isUseBackgroundFile() {
-        return isUseBackgroundFile;
-    }
-
-    @Override
-    public String getName() {
-        return BackgroundPictureBean.class.getName();
-    }
-
-    @Override
-    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-        super.writeThisToJsonWriter(jsonWriter);
-        BackgroundPictureBean bean = this;
-        jsonWriter.name("backgroundWidth").value(bean.getBackgroundWidth());
-        jsonWriter.name("backgroundHeight").value(bean.getBackgroundHeight());
-        jsonWriter.name("isUseBackgroundFile").value(bean.isUseBackgroundFile());
-		jsonWriter.name("pixelColor").value(bean.getPixelColor());
-    }
-
-    @Override
-    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
-        BackgroundPictureBean bean = new BackgroundPictureBean();
-        jsonReader.beginObject();
-        while (jsonReader.hasNext()) {
-            String name = jsonReader.nextName();
-            if (name.equals("backgroundWidth")) {
-                bean.setBackgroundWidth(jsonReader.nextInt());
-            } else if (name.equals("backgroundHeight")) {
-                bean.setBackgroundHeight(jsonReader.nextInt());
-            } else if (name.equals("isUseBackgroundFile")) {
-                bean.setIsUseBackgroundFile(jsonReader.nextBoolean());
-            } else if (name.equals("pixelColor")) {
-                bean.setPixelColor(jsonReader.nextInt());
-            } else {
-                jsonReader.skipValue();
-            }
-        }
-        // 结束 JSON 对象
-        jsonReader.endObject();
-        return bean;
-    }
-}

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

@@ -12,8 +12,8 @@ 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.activities.BackgroundSettingsActivity;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
 import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
 import java.io.File;
@@ -29,7 +29,7 @@ public class BackgroundPicturePreviewDialog extends Dialog {
     public static final String TAG = "BackgroundPicturePreviewDialog";
 
     Context mContext;
-    BackgroundPictureUtils mBackgroundPictureUtils;
+    BackgroundSourceUtils mBackgroundPictureUtils;
     Button dialogbackgroundpicturepreviewButton1;
     Button dialogbackgroundpicturepreviewButton2;
     String mszPreReceivedFileName;
@@ -40,7 +40,7 @@ public class BackgroundPicturePreviewDialog extends Dialog {
         initEnv();
         
         mContext = context;
-        mBackgroundPictureUtils = ((BackgroundPictureActivity)context).mBackgroundPictureUtils;
+        mBackgroundPictureUtils = ((BackgroundSettingsActivity)context).mBackgroundSourceUtils;
         
         ImageView imageView = findViewById(R.id.dialogbackgroundpicturepreviewImageView1);
         copyAndViewRecivePicture(imageView);
@@ -78,7 +78,7 @@ public class BackgroundPicturePreviewDialog extends Dialog {
 
     void copyAndViewRecivePicture(ImageView imageView) {
         //AppConfigUtils appConfigUtils = AppConfigUtils.getInstance((GlobalApplication)mContext.getApplicationContext());
-        BackgroundPictureActivity activity = ((BackgroundPictureActivity)mContext);
+        BackgroundSettingsActivity activity = ((BackgroundSettingsActivity)mContext);
 
         //取出文件uri
         Uri uri = activity.getIntent().getData();
@@ -95,7 +95,7 @@ public class BackgroundPicturePreviewDialog extends Dialog {
 
         File fSrcImage = new File(szSrcImage);
         //mszPreReceivedFileName = DateUtils.getDateNowString() + "-" + fSrcImage.getName();
-        File mfPreReceivedPhoto = new File(activity.mBackgroundPictureUtils.getBackgroundDir(), mszPreReceivedFileName);
+        File mfPreReceivedPhoto = new File(activity.mBackgroundSourceUtils.getBackgroundSourceDirPath(), mszPreReceivedFileName);
         // 复制源图片到剪裁文件
         try {
             FileUtils.copyFileUsingFileChannels(fSrcImage, mfPreReceivedPhoto);

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

@@ -0,0 +1,273 @@
+package cc.winboll.studio.powerbell.dialogs;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Handler;
+import android.os.Message;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.views.BackgroundView;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import cc.winboll.studio.powerbell.utils.ImageDownloader;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/19 20:11
+ * @Describe 网络后台使用提示对话框
+ * 继承 AndroidX AlertDialog，绑定自定义布局 dialog_networkbackground.xml
+ */
+public class NetworkBackgroundDialog extends AlertDialog {
+    public static final String TAG = "NetworkBackgroundDialog";
+    // 消息标识：图片加载成功
+    private static final int MSG_IMAGE_LOAD_SUCCESS = 1001;
+    // 消息标识：图片加载失败
+    private static final int MSG_IMAGE_LOAD_FAILED = 1002;
+
+    // 控件引用
+    private TextView tvTitle;
+    private TextView tvContent;
+    private Button btnCancel;
+    private Button btnConfirm;
+    private Button btnPreview;
+    private EditText etURL;
+    BackgroundView bvBackgroundPreview;
+    Context mContext;
+    // 主线程 Handler，用于接收子线程消息并更新 UI
+    private Handler mUiHandler;
+	String mPreviewFilePath;
+	String mPreviewFileUrl;
+	String mDownloadSavedPath;
+
+    // 按钮点击回调接口（Java7 接口实现）
+    public interface OnDialogClickListener {
+        void onConfirm(String szConfirmFilePath, String previewFileUrl); // 确认按钮点击
+        void onCancel();  // 取消按钮点击
+    }
+
+    private OnDialogClickListener listener;
+
+    // Java7 显式构造（必须传入 Context）
+    public NetworkBackgroundDialog(@NonNull Context context) {
+        super(context);
+        initHandler(); // 初始化 Handler
+        initView(); // 初始化布局和控件
+        setDismissListener(); // 设置对话框消失监听
+    }
+
+    // 带回调的构造（便于外部处理点击事件）
+    public NetworkBackgroundDialog(@NonNull Context context, OnDialogClickListener listener) {
+        super(context);
+        this.listener = listener;
+        initHandler(); // 初始化 Handler
+        initView();
+        setDismissListener(); // 设置对话框消失监听
+    }
+
+    /**
+     * 初始化主线程 Handler，用于更新 UI
+     */
+    private void initHandler() {
+        mUiHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                // 对话框已消失时，不再处理 UI 消息
+                if (!isShowing()) {
+                    return;
+                }
+                switch (msg.what) {
+                    case MSG_IMAGE_LOAD_SUCCESS:
+                        // 图片加载成功，获取文件路径并设置背景
+                        mDownloadSavedPath = (String) msg.obj;
+						previewBackground(mDownloadSavedPath);
+                        break;
+                    case MSG_IMAGE_LOAD_FAILED:
+                        // 图片加载失败，设置默认背景
+                        bvBackgroundPreview.setBackgroundResource(R.drawable.ic_launcher);
+                        ToastUtils.show("图片预览失败，请检查链接");
+                        break;
+                }
+            }
+        };
+    }
+
+    /**
+     * 设置对话框消失监听：移除 Handler 消息，避免内存泄漏
+     */
+    private void setDismissListener() {
+        this.setOnDismissListener(new OnDismissListener() {
+				@Override
+				public void onDismiss(DialogInterface dialog) {
+					// 对话框消失时，移除所有未处理的消息和回调
+					if (mUiHandler != null) {
+						mUiHandler.removeCallbacksAndMessages(null);
+					}
+					LogUtils.d(TAG, "对话框已消失，Handler 消息已清理");
+				}
+			});
+    }
+
+    /**
+     * 初始化布局和控件
+     */
+    private void initView() {
+        mContext = this.getContext();
+        // 加载自定义布局
+        View dialogView = LayoutInflater.from(getContext())
+			.inflate(R.layout.dialog_networkbackground, null);
+        // 设置对话框内容视图
+        setView(dialogView);
+
+        // 绑定控件
+        tvTitle = (TextView) dialogView.findViewById(R.id.tv_dialog_title);
+        tvContent = (TextView) dialogView.findViewById(R.id.tv_dialog_content);
+        btnCancel = (Button) dialogView.findViewById(R.id.btn_cancel);
+        btnConfirm = (Button) dialogView.findViewById(R.id.btn_confirm);
+        btnPreview = (Button) dialogView.findViewById(R.id.btn_preview);
+        etURL = (EditText) dialogView.findViewById(R.id.et_url);
+        bvBackgroundPreview = (BackgroundView) dialogView.findViewById(R.id.bv_background_preview);
+		// 加载初始图片
+		bvBackgroundPreview.setBackgroundResource(R.drawable.ic_launcher);
+        // 设置按钮点击事件
+        setButtonClickListeners();
+    }
+
+    /**
+     * 设置按钮点击监听
+     */
+    private void setButtonClickListeners() {
+        // 取消按钮：关闭对话框 + 回调外部
+        btnCancel.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d("NetworkBackgroundDialog", "取消按钮点击");
+					BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(mContext);
+					utils.setCurrentSourceToPreview();
+
+					dismiss(); // 关闭对话框
+					if (listener != null) {
+						listener.onCancel();
+					}
+				}
+			});
+
+        // 确认按钮：关闭对话框 + 回调外部
+        btnConfirm.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d("NetworkBackgroundDialog", "确认按钮点击");
+					// 确定预览背景资源
+					BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(mContext);
+					utils.saveFileToPreviewBean(new File(mPreviewFilePath), mPreviewFileUrl);
+
+					dismiss(); // 关闭对话框
+					if (listener != null) {
+						listener.onConfirm(mPreviewFilePath, mPreviewFileUrl);
+					}
+				}
+			});
+
+        // 图片预览按钮：预览输入框地址图片
+        btnPreview.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					downloadImageToAlbumAndPreview();
+				}
+			});
+    }
+
+    /**
+     * 根据文件路径设置 BackgroundView 背景（主线程调用）
+     * @param filePath 图片文件路径
+     */
+    private void previewBackground(String previewFilePath) {
+        FileInputStream fis = null;
+        try {
+            File imageFile = new File(previewFilePath);
+            if (!imageFile.exists()) {
+				ToastUtils.show("图片文件不存在：" + previewFilePath);
+                LogUtils.e(TAG, "图片文件不存在：" + previewFilePath);
+				bvBackgroundPreview.setBackgroundResource(R.drawable.ic_launcher);
+                return;
+            }
+
+			// 预览背景
+			mPreviewFilePath = previewFilePath;
+			BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(mContext);
+			utils.saveFileToPreviewBean(new File(mPreviewFilePath), mPreviewFileUrl);
+			bvBackgroundPreview.reloadPreviewBackground();
+
+			//ToastUtils.show("预览背景中。。。");
+        } catch (Exception e) {
+            e.printStackTrace();
+            bvBackgroundPreview.setBackgroundResource(R.drawable.ic_launcher);
+            LogUtils.e(TAG, "图片预览失败：" + e.getMessage());
+        } finally {
+            // Java7 手动关闭流，避免资源泄漏
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 对外提供方法：修改对话框标题（灵活适配不同场景）
+     */
+    public void setTitle(String title) {
+        if (tvTitle != null) {
+            tvTitle.setText(title);
+        }
+    }
+
+    /**
+     * 对外提供方法：修改对话框内容（灵活适配不同场景）
+     */
+    public void setContent(String content) {
+        if (tvContent != null) {
+            tvContent.setText(content);
+        }
+    }
+
+    /**
+     * 对外提供方法：设置按钮点击回调（替代带参构造）
+     */
+    public void setOnDialogClickListener(OnDialogClickListener listener) {
+        this.listener = listener;
+    }
+
+	void downloadImageToAlbumAndPreview() {
+		//String previewFileUrl = "https://example.com/test.jpg";
+		mPreviewFileUrl = etURL.getText().toString();
+		ImageDownloader.getInstance(mContext).downloadImage(mPreviewFileUrl, new ImageDownloader.DownloadCallback(){
+				@Override
+				public void onSuccess(String savePath) {
+					// 发送消息到主线程，携带图片路径
+					Message successMsg = mUiHandler.obtainMessage(MSG_IMAGE_LOAD_SUCCESS, savePath);
+					mUiHandler.sendMessage(successMsg);
+				}
+
+				@Override
+				public void onFailure(String errorMsg) {
+					ToastUtils.show("下载失败：" + errorMsg);
+				}
+			});
+
+	}
+}
+

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

@@ -9,7 +9,6 @@ import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
@@ -20,15 +19,15 @@ import android.widget.TextView;
 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;
+import cc.winboll.studio.powerbell.activities.PixelPickerActivity;
+import cc.winboll.studio.powerbell.model.BackgroundBean;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
-import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
+import cc.winboll.studio.powerbell.views.BackgroundView;
 import cc.winboll.studio.powerbell.views.BatteryDrawable;
 import cc.winboll.studio.powerbell.views.VerticalSeekBar;
-import java.io.File;
 
 public class MainViewFragment extends Fragment {
 
@@ -72,6 +71,7 @@ public class MainViewFragment extends Fragment {
     TextView mtvUsegeReminderValue;
     CheckBox mcbUsegeReminderValue;
     TextView mtvCurrentValue;
+	BackgroundView bvPreviewBackground;
 
 
     @Override
@@ -79,27 +79,33 @@ public class MainViewFragment extends Fragment {
         mView = inflater.inflate(R.layout.fragment_mainview, container, false);
         _mMainViewFragment = MainViewFragment.this;
         mAppConfigUtils = App.getAppConfigUtils(getActivity());
-        
+
         // 获取指定ID的View实例
-        final View mainImageView = mView.findViewById(R.id.fragmentmainviewImageView1);
+	    bvPreviewBackground = mView.findViewById(R.id.fragmentmainviewBackgroundView1);
+		
+		BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(getActivity());
+		BackgroundBean bean = utils.getCurrentBackgroundBean();
+		int nPixelColor = bean.getPixelColor();
+		bvPreviewBackground.setBackgroundColor(nPixelColor);
+        /*final View mainImageView = mView.findViewById(R.id.fragmentmainviewImageView1);
 
-        // 注册OnGlobalLayoutListener
-        mainImageView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    // 获取宽度和高度
-                    int width = mainImageView.getMeasuredWidth();
-                    int height = mainImageView.getMeasuredHeight();
+		 // 注册OnGlobalLayoutListener
+		 mainImageView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+		 @Override
+		 public void onGlobalLayout() {
+		 // 获取宽度和高度
+		 int width = mainImageView.getMeasuredWidth();
+		 int height = mainImageView.getMeasuredHeight();
 
-                    BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(getActivity());
-                    BackgroundPictureBean bean = utils.loadBackgroundPictureBean();
-                    bean.setBackgroundWidth(width);
-                    bean.setBackgroundHeight(height);
-                    utils.saveData();
-                    // 移除监听器以避免内存泄漏
-                    mainImageView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                }
-            });
+		 BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(getActivity());
+		 BackgroundPictureBean bean = utils.loadBackgroundPictureBean();
+		 bean.setBackgroundWidth(width);
+		 bean.setBackgroundHeight(height);
+		 utils.saveData();
+		 // 移除监听器以避免内存泄漏
+		 mainImageView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+		 }
+		 });*/
 
         mDrawableFrame = getActivity().getDrawable(R.drawable.bg_frame);
         mllLeftSeekBar = (LinearLayout) mView.findViewById(R.id.fragmentmainviewLinearLayout1);
@@ -143,6 +149,17 @@ public class MainViewFragment extends Fragment {
         return mView;
     }
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(getActivity());
+		BackgroundBean bean = utils.getCurrentBackgroundBean();
+		int nPixelColor = bean.getPixelColor();
+		bvPreviewBackground.setBackgroundColor(nPixelColor);
+	}
+	
+	
+
     void setViewData() {
         int nChargeReminderValue = mAppConfigUtils.getChargeReminderValue();
         int nUsegeReminderValue = mAppConfigUtils.getUsegeReminderValue();
@@ -302,22 +319,23 @@ public class MainViewFragment extends Fragment {
         }
     }
 
-    public void loadBackground() {
-        BackgroundPictureBean bean = BackgroundPictureUtils.getInstance(getActivity()).getBackgroundPictureBean();
-        ImageView imageView = mView.findViewById(R.id.fragmentmainviewImageView1);
-        String szBackgroundFilePath = BackgroundPictureUtils.getInstance(getActivity()).getBackgroundDir() + BackgroundPictureActivity.getBackgroundFileName();
-        File fBackgroundFilePath = new File(szBackgroundFilePath);
-        LogUtils.d(TAG, "szBackgroundFilePath : " + szBackgroundFilePath);
-        LogUtils.d(TAG, String.format("fBackgroundFilePath.exists() %s", fBackgroundFilePath.exists()));
-        if (bean.isUseBackgroundFile() && fBackgroundFilePath.exists()) {
-            Drawable drawableBackground = Drawable.createFromPath(szBackgroundFilePath);
-            //drawableBackground.setAlpha(120);
-            imageView.setImageDrawable(drawableBackground);
-        } else {
-            Drawable drawableBackground = getActivity().getDrawable(R.drawable.blank10x10);
-            //drawableBackground.setAlpha(120);
-            imageView.setImageDrawable(drawableBackground);
-        }
+    public void reloadBackground() {
+		bvPreviewBackground.reloadCurrentBackground();
+//        BackgroundPictureBean bean = BackgroundPictureUtils.getInstance(getActivity()).getBackgroundPictureBean();
+//        ImageView imageView = mView.findViewById(R.id.fragmentmainviewImageView1);
+//        String szBackgroundFilePath = BackgroundPictureUtils.getInstance(getActivity()).getBackgroundDir() + BackgroundPictureActivity.getBackgroundFileName();
+//        File fBackgroundFilePath = new File(szBackgroundFilePath);
+//        LogUtils.d(TAG, "szBackgroundFilePath : " + szBackgroundFilePath);
+//        LogUtils.d(TAG, String.format("fBackgroundFilePath.exists() %s", fBackgroundFilePath.exists()));
+//        if (bean.isUseBackgroundFile() && fBackgroundFilePath.exists()) {
+//            Drawable drawableBackground = Drawable.createFromPath(szBackgroundFilePath);
+//            //drawableBackground.setAlpha(120);
+//            imageView.setImageDrawable(drawableBackground);
+//        } else {
+//            Drawable drawableBackground = getActivity().getDrawable(R.drawable.blank10x10);
+//            //drawableBackground.setAlpha(120);
+//            imageView.setImageDrawable(drawableBackground);
+//        }
     }
 
     Handler mHandler = new Handler(){

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

@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.beans;
+package cc.winboll.studio.powerbell.model;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

powerbell/src/main/java/cc/winboll/studio/powerbell/model/BackgroundBean.java

@@ -0,0 +1,143 @@
+package cc.winboll.studio.powerbell.model;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2024/07/18 11:52:28
+ * @Describe 应用背景图片数据类
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class BackgroundBean extends BaseBean {
+
+    public static final String TAG = "BackgroundPictureBean";
+
+	String backgroundFileName = "";
+	String backgroundFileInfo = "";
+	boolean isUseBackgroundFile = false;
+	String backgroundScaledCompressFileName = "";
+	boolean isUseScaledCompress = false;
+    int backgroundWidth = 100;
+    int backgroundHeight = 100;
+	// 图片拾取像素颜色
+	int pixelColor = 0;
+
+    public BackgroundBean() {
+    }
+
+	public void setBackgroundScaledCompressFileName(String backgroundScaledCompressFileName) {
+		this.backgroundScaledCompressFileName = backgroundScaledCompressFileName;
+	}
+
+	public String getBackgroundScaledCompressFileName() {
+		return backgroundScaledCompressFileName;
+	}
+
+	public void setIsUseScaledCompress(boolean isUseScaledCompress) {
+		this.isUseScaledCompress = isUseScaledCompress;
+	}
+
+	public boolean isUseScaledCompress() {
+		return isUseScaledCompress;
+	}
+
+	public void setIsUseBackgroundFile(boolean isUseBackgroundFile) {
+		this.isUseBackgroundFile = isUseBackgroundFile;
+	}
+
+	public boolean isUseBackgroundFile() {
+		return isUseBackgroundFile;
+	}
+
+	public void setBackgroundFileInfo(String backgroundFileInfo) {
+		this.backgroundFileInfo = backgroundFileInfo;
+	}
+
+	public String getBackgroundFileInfo() {
+		return backgroundFileInfo;
+	}
+
+	public void setBackgroundFileName(String backgroundFileName) {
+		this.backgroundFileName = backgroundFileName;
+	}
+
+	public String getBackgroundFileName() {
+		return backgroundFileName;
+	}
+
+	public void setPixelColor(int pixelColor) {
+		this.pixelColor = pixelColor;
+	}
+
+	public int getPixelColor() {
+		return pixelColor;
+	}
+
+    public void setBackgroundWidth(int backgroundWidth) {
+        this.backgroundWidth = backgroundWidth;
+    }
+
+    public int getBackgroundWidth() {
+        return backgroundWidth;
+    }
+
+    public void setBackgroundHeight(int backgroundHeight) {
+        this.backgroundHeight = backgroundHeight;
+    }
+
+    public int getBackgroundHeight() {
+        return backgroundHeight;
+    }
+
+    @Override
+    public String getName() {
+        return BackgroundBean.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        BackgroundBean bean = this;
+        jsonWriter.name("backgroundFileName").value(bean.getBackgroundFileName());
+		jsonWriter.name("backgroundFileInfo").value(bean.getBackgroundFileInfo());
+		jsonWriter.name("isUseBackgroundFile").value(bean.isUseBackgroundFile());
+		jsonWriter.name("backgroundScaledCompressFileName").value(bean.getBackgroundScaledCompressFileName());
+		jsonWriter.name("isUseScaledCompress").value(bean.isUseScaledCompress());
+		jsonWriter.name("backgroundWidth").value(bean.getBackgroundWidth());
+        jsonWriter.name("backgroundHeight").value(bean.getBackgroundHeight());
+        jsonWriter.name("pixelColor").value(bean.getPixelColor());
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        BackgroundBean bean = new BackgroundBean();
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (name.equals("backgroundFileName")) {
+                bean.setBackgroundFileName(jsonReader.nextString());
+            } else if (name.equals("backgroundFileInfo")) {
+                bean.setBackgroundFileInfo(jsonReader.nextString());
+            } else if (name.equals("isUseBackgroundFile")) {
+                bean.setIsUseBackgroundFile(jsonReader.nextBoolean());
+            } else if (name.equals("backgroundScaledCompressFileName")) {
+                bean.setBackgroundScaledCompressFileName(jsonReader.nextString());
+            } else if (name.equals("isUseScaledCompress")) {
+                bean.setIsUseScaledCompress(jsonReader.nextBoolean());
+            } else if (name.equals("backgroundWidth")) {
+                bean.setBackgroundWidth(jsonReader.nextInt());
+            } else if (name.equals("backgroundHeight")) {
+                bean.setBackgroundHeight(jsonReader.nextInt());
+            } else if (name.equals("pixelColor")) {
+                bean.setPixelColor(jsonReader.nextInt());
+            } else {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return bean;
+    }
+}

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

@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.beans;
+package cc.winboll.studio.powerbell.model;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

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

@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.beans;
+package cc.winboll.studio.powerbell.model;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;

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

@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.beans;
+package cc.winboll.studio.powerbell.model;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>

powerbell/src/main/java/cc/winboll/studio/powerbell/model/NotificationMessage.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.beans;
+package cc.winboll.studio.powerbell.model;
 
 // 应用消息结构
 //

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

@@ -5,7 +5,7 @@ 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.model.AppConfigBean;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.BatteryUtils;

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

@@ -14,15 +14,17 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.widget.RemoteViews;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.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.model.AppConfigBean;
+import cc.winboll.studio.powerbell.model.NotificationMessage;
 import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler;
 import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver;
 import cc.winboll.studio.powerbell.services.AssistantService;
@@ -32,8 +34,6 @@ import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.NotificationHelper;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
-import android.os.Handler;
-import android.os.Looper;
 
 public class ControlCenterService extends Service {
 
@@ -73,8 +73,8 @@ public class ControlCenterService extends Service {
         mAppConfigUtils = App.getAppConfigUtils(this);
         mAppCacheUtils = App.getAppCacheUtils(this);
         mNotificationHelper = new NotificationHelper(ControlCenterService.this);
-        
-        
+
+
         if (mMyServiceConnection == null) {
             mMyServiceConnection = new MyServiceConnection();
         }
@@ -105,7 +105,7 @@ public class ControlCenterService extends Service {
             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);
@@ -116,7 +116,7 @@ public class ControlCenterService extends Service {
                 mControlCenterServiceReceiver = new ControlCenterServiceReceiver(this);
                 mControlCenterServiceReceiver.registerAction(this);
             }
-            
+
             new Handler(Looper.getMainLooper()).postDelayed(new Runnable(){
 
                     @Override
@@ -126,7 +126,7 @@ public class ControlCenterService extends Service {
                         LogUtils.i(TAG, "Service Is Start.");
                     }
                 }, 2000);
-            
+
         }
     }
 
@@ -263,15 +263,15 @@ public class ControlCenterService extends Service {
         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);

powerbell/src/main/java/cc/winboll/studio/powerbell/unittest/BackgroundViewTestFragment.java

@@ -0,0 +1,48 @@
+package cc.winboll.studio.powerbell.unittest;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.R;
+import android.widget.Button;
+import cc.winboll.studio.powerbell.MainActivity;
+import android.content.Intent;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/19 18:16
+ * @Describe BackgroundViewTestFragment
+ */
+public class BackgroundViewTestFragment extends Fragment {
+
+    public static final String TAG = "BackgroundViewTestFragment";
+
+	View mainView;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		//super.onCreateView(inflater, container, savedInstanceState);
+
+		// 非调试状态就结束本线程
+		if (!GlobalApplication.isDebugging()) {
+			Thread.currentThread().destroy();
+		}
+
+		mainView = inflater.inflate(R.layout.fragment_test_backgroundview, container, false);
+		
+		((Button)mainView.findViewById(R.id.btn_main_activity)).setOnClickListener(new View.OnClickListener(){
+
+				@Override
+				public void onClick(View v) {
+					getActivity().startActivity(new Intent(getActivity(), MainActivity.class));
+				}
+			});
+
+		ToastUtils.show(String.format("%s onCreate", TAG));
+		return mainView;
+	}
+}

powerbell/src/main/java/cc/winboll/studio/powerbell/unittest/MainUnitTestActivity.java

@@ -0,0 +1,39 @@
+package cc.winboll.studio.powerbell.unittest;
+
+import android.os.Bundle;
+import android.widget.FrameLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.powerbell.R;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import android.nfc.tech.TagTechnology;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/19 18:04
+ * @Describe 单元测试启动主页窗口
+ */
+public class MainUnitTestActivity extends AppCompatActivity {
+
+    public static final String TAG = "MainUnitTestActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+		// 非调试状态就退出
+		if (!GlobalApplication.isDebugging()) {
+			finish();
+		}
+        setContentView(R.layout.activity_mainunittest);
+		
+		FragmentManager fragmentManager = getSupportFragmentManager();
+		FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+		fragmentTransaction.add(R.id.activitymainunittestFrameLayout1, new BackgroundViewTestFragment(), BackgroundViewTestFragment.TAG);
+		fragmentTransaction.commit();
+		
+		ToastUtils.show(String.format("%s onCreate", TAG));
+    }
+
+}

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

@@ -0,0 +1,164 @@
+package cc.winboll.studio.powerbell.utils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/26 15:54
+ * @Describe 应用图标切换工具类（启用组件时创建对应快捷方式）
+ */
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.widget.Toast;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
+
+public class APPPlusUtils {
+    public static final String TAG = "APPPlusUtils";
+
+    // 快捷方式配置（名称+图标，需与实际资源匹配）
+//    private static final String PLUS_SHORTCUT_NAME = "位置服务-Laojun";
+//    private static final int PLUS_SHORTCUT_ICON = R.mipmap.ic_launcher; // Laojun 图标资源
+
+    /**
+     * 添加Plus组件与图标
+     */
+    public static boolean switchAppLauncherToComponent(Context context, String componentName) {
+        if (context == null) {
+            LogUtils.d(TAG, "切换失败：上下文为空");
+            Toast.makeText(context, context.getString(R.string.app_name) + "图标切换失败", Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        PackageManager pm = context.getPackageManager();
+		
+        ComponentName plusComponentSwitchTo = new ComponentName(context, componentName);
+        ComponentName plusComponentEN1 = new ComponentName(context, App.COMPONENT_EN1);
+        ComponentName plusComponentCN1 = new ComponentName(context, App.COMPONENT_CN1);
+        ComponentName plusComponentCN2 = new ComponentName(context, App.COMPONENT_CN2);
+
+        try {
+			disableComponent(pm, plusComponentEN1);
+			disableComponent(pm, plusComponentCN1);
+			disableComponent(pm, plusComponentCN2);
+            enableComponent(pm, plusComponentSwitchTo);
+
+            return true;
+
+        } catch (Exception e) {
+            LogUtils.e(TAG, "图标切换失败：" + e.getMessage());
+            Toast.makeText(context, context.getString(R.string.app_name) + "图标切换失败" + e.getMessage(), Toast.LENGTH_SHORT).show();
+            return false;
+        }
+    }
+
+    /**
+     * 创建指定组件的桌面快捷方式（自动去重，兼容 Android 8.0+）
+     * @param component 目标组件（如 LAOJUN_ACTIVITY）
+     * @param name 快捷方式名称
+     * @param iconRes 快捷方式图标资源ID
+     * @return 是否创建成功
+     */
+    private static boolean createComponentShortcut(Context context, ComponentName component, String name, int iconRes) {
+        if (context == null || component == null || name == null || iconRes == 0) {
+            LogUtils.d(TAG, "快捷方式创建失败：参数为空");
+            return false;
+        }
+
+        // Android 8.0+（API 26+）：使用 ShortcutManager（系统推荐）
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            try {
+                PackageManager pm = context.getPackageManager();
+                android.content.pm.ShortcutManager shortcutManager = context.getSystemService(android.content.pm.ShortcutManager.class);
+                if (shortcutManager == null || !shortcutManager.isRequestPinShortcutSupported()) {
+                    LogUtils.d(TAG, "系统不支持创建快捷方式");
+                    return false;
+                }
+
+                // 检查是否已存在该组件的快捷方式（去重）
+                for (android.content.pm.ShortcutInfo info : shortcutManager.getPinnedShortcuts()) {
+                    if (component.getClassName().equals(info.getIntent().getComponent().getClassName())) {
+                        LogUtils.d(TAG, "快捷方式已存在：" + component.getClassName());
+                        return true;
+                    }
+                }
+
+                // 构建启动目标组件的意图
+                Intent launchIntent = new Intent(Intent.ACTION_MAIN)
+					.setComponent(component)
+					.addCategory(Intent.CATEGORY_LAUNCHER)
+					.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
+                // 构建快捷方式信息
+                android.content.pm.ShortcutInfo shortcutInfo = new android.content.pm.ShortcutInfo.Builder(context, component.getClassName())
+					.setShortLabel(name)
+					.setLongLabel(name)
+					.setIcon(android.graphics.drawable.Icon.createWithResource(context, iconRes))
+					.setIntent(launchIntent)
+					.build();
+
+                // 请求创建快捷方式（需用户确认）
+                shortcutManager.requestPinShortcut(shortcutInfo, null);
+                return true;
+
+            } catch (Exception e) {
+                LogUtils.d(TAG, "Android O+ 快捷方式创建失败：" + e.getMessage());
+                return false;
+            }
+        } else {
+            // Android 8.0 以下：使用广播（兼容旧机型）
+            try {
+                // 构建启动目标组件的意图
+                Intent launchIntent = new Intent(Intent.ACTION_MAIN)
+					.setComponent(component)
+					.addCategory(Intent.CATEGORY_LAUNCHER)
+					.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
+                // 构建创建快捷方式的广播意图
+                Intent installIntent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
+                installIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, launchIntent);
+                installIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
+                installIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+									   Intent.ShortcutIconResource.fromContext(context, iconRes));
+                installIntent.putExtra("duplicate", false); // 禁止重复创建
+
+                context.sendBroadcast(installIntent);
+                return true;
+
+            } catch (Exception e) {
+                LogUtils.d(TAG, "Android O- 快捷方式创建失败：" + e.getMessage());
+                return false;
+            }
+        }
+    }
+
+    /**
+     * 启用组件（带状态检查，避免重复操作）
+     */
+    private static void enableComponent(PackageManager pm, ComponentName component) {
+        if (pm.getComponentEnabledSetting(component) != PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
+            pm.setComponentEnabledSetting(
+				component,
+				PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+				PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS
+            );
+        }
+    }
+
+    /**
+     * 禁用组件（带状态检查，避免重复操作）
+     */
+    private static void disableComponent(PackageManager pm, ComponentName component) {
+        if (pm.getComponentEnabledSetting(component) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+            pm.setComponentEnabledSetting(
+				component,
+				PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+				PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS
+            );
+        }
+    }
+}
+

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

@@ -2,7 +2,7 @@ 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.powerbell.model.BatteryInfoBean;
 import java.util.ArrayList;
 
 public class AppCacheUtils {

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

@@ -5,8 +5,8 @@ import android.content.Context;
 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.model.AppConfigBean;
+import cc.winboll.studio.powerbell.model.ControlCenterServiceBean;
 import cc.winboll.studio.powerbell.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
 import cc.winboll.studio.powerbell.services.ControlCenterService;

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

@@ -1,64 +0,0 @@
-package cc.winboll.studio.powerbell.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2024/07/18 12:07:20
- * @Describe 背景图片工具集
- */
-import android.content.Context;
-import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
-import java.io.File;
-
-public class BackgroundPictureUtils {
-
-    public static final String TAG = "BackgroundPictureUtils";
-
-    static BackgroundPictureUtils _mBackgroundPictureUtils;
-    Context mContext;
-    BackgroundPictureBean mBackgroundPictureBean;
-    // 背景图片目录
-    String mszBackgroundDir;
-
-    BackgroundPictureUtils(Context context) {
-        mContext = context;
-        String szExternalFilesDir = mContext.getExternalFilesDir(TAG) + File.separator;
-        setBackgroundDir(szExternalFilesDir + "Background" + File.separator);
-        loadBackgroundPictureBean();
-    }
-
-    public static BackgroundPictureUtils getInstance(Context context) {
-        if (_mBackgroundPictureUtils == null) {
-            _mBackgroundPictureUtils = new BackgroundPictureUtils(context);
-        }
-        return _mBackgroundPictureUtils;
-    }
-
-    //
-    // 加载应用背景图片配置数据
-    //
-    public BackgroundPictureBean loadBackgroundPictureBean() {
-        mBackgroundPictureBean = BackgroundPictureBean.loadBean(mContext, BackgroundPictureBean.class);
-        if (mBackgroundPictureBean == null) {
-            mBackgroundPictureBean = new BackgroundPictureBean();
-            BackgroundPictureBean.saveBean(mContext, mBackgroundPictureBean);
-        }
-        return mBackgroundPictureBean;
-    }
-
-
-    void setBackgroundDir(String mszBackgroundDir) {
-        this.mszBackgroundDir = mszBackgroundDir;
-    }
-
-    public String getBackgroundDir() {
-        return mszBackgroundDir;
-    }
-
-    public BackgroundPictureBean getBackgroundPictureBean() {
-        return mBackgroundPictureBean;
-    }
-
-    public void saveData() {
-        BackgroundPictureBean.saveBean(mContext, mBackgroundPictureBean);
-    }
-}

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

@@ -0,0 +1,144 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.content.Context;
+import cc.winboll.studio.powerbell.model.BackgroundBean;
+import java.io.File;
+import java.util.UUID;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2024/07/18 12:07:20
+ * @Describe 背景图片工具集（修复单例模式，线程安全）
+ */
+public class BackgroundSourceUtils {
+
+    public static final String TAG = "BackgroundPictureUtils";
+
+    // 1. 静态实例加volatile，禁止指令重排，保证可见性
+    private static volatile BackgroundSourceUtils sInstance;
+    private Context mContext;
+	private File currentBackgroundBeanFile;
+    private BackgroundBean currentBackgroundBean;
+	private File previewBackgroundBeanFile;
+    private BackgroundBean previewBackgroundBean;
+	// 应用外部存储文件夹路径
+	private File fUtilsDir;
+	private File fModelDir;
+    // 背景图片目录
+    private File fBackgroundSourceDir;
+
+    // 2. 私有构造器（加防反射逻辑）
+    private BackgroundSourceUtils(Context context) {
+        // 防反射破坏：若已有实例，抛异常阻止创建
+        if (sInstance != null) {
+            throw new RuntimeException("BackgroundSourceUtils 是单例类，禁止重复创建！");
+        }
+        // 上下文建议用Application Context，避免内存泄漏
+        this.mContext = context.getApplicationContext();
+        fUtilsDir = this.mContext.getExternalFilesDir(TAG);
+		fModelDir = new File(fUtilsDir, "ModelDir");
+		currentBackgroundBeanFile = new File(fModelDir, "currentBackgroundBean.json");
+		previewBackgroundBeanFile = new File(fModelDir, "previewBackgroundBean.json");
+        fBackgroundSourceDir = new File(fUtilsDir, "BackgroundSource");
+		
+		// 加载配置
+        loadSettings();
+    }
+
+    // 3. 双重校验锁单例（线程安全，高效）
+    public static BackgroundSourceUtils getInstance(Context context) {
+        // 第一重校验：避免每次调用都加锁（提高效率）
+        if (sInstance == null) {
+            // 同步锁：保证同一时刻只有一个线程进入创建逻辑
+            synchronized (BackgroundSourceUtils.class) {
+                // 第二重校验：防止多线程并发时重复创建（核心）
+                if (sInstance == null) {
+                    sInstance = new BackgroundSourceUtils(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    /*
+	 * 加载背景图片配置数据
+	 */
+    void loadSettings() {
+        currentBackgroundBean = BackgroundBean.loadBeanFromFile(currentBackgroundBeanFile.getAbsolutePath(), BackgroundBean.class);
+        if (currentBackgroundBean == null) {
+            currentBackgroundBean = new BackgroundBean();
+            BackgroundBean.saveBeanToFile(currentBackgroundBeanFile.getAbsolutePath(), currentBackgroundBean);
+        }
+		previewBackgroundBean = BackgroundBean.loadBeanFromFile(previewBackgroundBeanFile.getAbsolutePath(), BackgroundBean.class);
+        if (previewBackgroundBean == null) {
+            previewBackgroundBean = new BackgroundBean();
+            BackgroundBean.saveBeanToFile(previewBackgroundBeanFile.getAbsolutePath(), previewBackgroundBean);
+        }
+    }
+	
+	public BackgroundBean getCurrentBackgroundBean() {
+		return currentBackgroundBean;
+	}
+	
+	public BackgroundBean getPreviewBackgroundBean() {
+		return previewBackgroundBean;
+	}
+
+    public String getCurrentBackgroundFilePath() {
+		loadSettings();
+		File file = new File(fBackgroundSourceDir, currentBackgroundBean.getBackgroundFileName());
+		return file.getAbsolutePath();
+	}
+
+    public String getPreviewBackgroundFilePath() {
+		loadSettings();
+		File file = new File(fBackgroundSourceDir, previewBackgroundBean.getBackgroundFileName());
+		return file.getAbsolutePath();
+	}
+	
+	public String getPreviewBackgroundScaledCompressFilePath() {
+		loadSettings();
+		File file = new File(fBackgroundSourceDir, previewBackgroundBean.getBackgroundScaledCompressFileName());
+		return file.getAbsolutePath();
+	}
+
+	public void saveSettings() {
+        BackgroundBean.saveBeanToFile(currentBackgroundBeanFile.getAbsolutePath(), currentBackgroundBean);
+		BackgroundBean.saveBeanToFile(previewBackgroundBeanFile.getAbsolutePath(), previewBackgroundBean);
+    }
+	
+    public String getBackgroundSourceDirPath() {
+        return fBackgroundSourceDir.getAbsolutePath();
+    }
+	
+	/*
+	 * 保存图片到预览模型, 并返回预览模型数据
+	 */
+	public BackgroundBean saveFileToPreviewBean(File sourceFile, String fileInfo) {
+		File previewBackgroundFile = new File(fBackgroundSourceDir, FileUtils.createUniqueFileName(sourceFile));
+		//ToastUtils.show(String.format("saveFileToPreviewBean previewBackgroundFile : %s", previewBackgroundFile.getAbsolutePath()));
+		
+		FileUtils.copyFile(sourceFile, previewBackgroundFile);
+		previewBackgroundBean = new BackgroundBean();
+		previewBackgroundBean.setBackgroundFileName(previewBackgroundFile.getName());
+		previewBackgroundBean.setBackgroundScaledCompressFileName("ScaledCompress_"+previewBackgroundFile.getName());
+		previewBackgroundBean.setBackgroundFileName(fileInfo);
+		saveSettings();
+		
+		ToastUtils.show(String.format("saveFileToPreviewBean getPreviewBackgroundFilePath() : %s", getPreviewBackgroundFilePath()));
+		
+		return previewBackgroundBean;
+	}
+	
+	public void commitPreviewSourceToCurrent() {
+		currentBackgroundBean = previewBackgroundBean;
+		saveSettings();
+	}
+	
+	public void setCurrentSourceToPreview() {
+		previewBackgroundBean = currentBackgroundBean;
+		saveSettings();
+	}
+}
+

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

@@ -1,176 +1,236 @@
 package cc.winboll.studio.powerbell.utils;
+
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import cc.winboll.studio.libappbase.LogUtils;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+
+import java.io.*;
 import java.nio.channels.FileChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.UUID;
 
 /**
- * 文件读取工具类
+ * 文件操作工具类
+ * 功能：文件读写、复制、图片转换、文件名处理等常用文件操作
+ * 适配：Java 7+，支持Android全版本
+ * 注意：调用文件操作前需确保已获取存储权限（Android 6.0+ 需动态申请）
  */
-
 public class FileUtils {
 
+    /** 日志标签 */
     public static final String TAG = "FileUtils";
+    /** 读取文件默认缓冲区大小（10KB） */
+    private static final int BUFFER_SIZE = 10240;
+    /** 最大读取文件大小（1GB），防止OOM */
+    private static final long MAX_READ_FILE_SIZE = 1024 * 1024 * 1024;
 
-    //
-    // 读取文件内容，作为字符串返回
-    //
+    // ====================================== 文件读取相关 ======================================
+
+    /**
+     * 读取文件内容并转为字符串
+     * @param filePath 文件绝对路径（非空）
+     * @return 文件内容字符串
+     * @throws IOException 异常：文件不存在、文件过大、读取失败等
+     */
     public static String readFileAsString(String filePath) throws IOException {
+        // 1. 校验文件合法性
         File file = new File(filePath);
         if (!file.exists()) {
-            throw new FileNotFoundException(filePath);
-        } 
+            throw new FileNotFoundException("文件不存在：" + filePath);
+        }
+        if (file.length() > MAX_READ_FILE_SIZE) {
+            throw new IOException("文件过大（超过1GB），禁止读取：" + filePath);
+        }
 
-        if (file.length() > 1024 * 1024 * 1024) {
-            throw new IOException("File is too large");
-        } 
-
-        StringBuilder sb = new StringBuilder((int) (file.length()));
-        // 创建字节输入流  
-        FileInputStream fis = new FileInputStream(filePath);  
-        // 创建一个长度为10240的Buffer
-        byte[] bbuf = new byte[10240];  
-        // 用于保存实际读取的字节数  
-        int hasRead = 0;  
-        while ((hasRead = fis.read(bbuf)) > 0) {  
-            sb.append(new String(bbuf, 0, hasRead));  
-        }  
-        fis.close();  
+        // 2. 读取文件内容（使用StringBuilder高效拼接）
+        StringBuilder sb = new StringBuilder((int) file.length());
+        try (FileInputStream fis = new FileInputStream(file)) {
+            byte[] buffer = new byte[BUFFER_SIZE];
+            int readLen;
+            // 循环读取缓冲区，避免一次性读取大文件导致OOM
+            while ((readLen = fis.read(buffer)) > 0) {
+                sb.append(new String(buffer, 0, readLen));
+            }
+        }
         return sb.toString();
     }
 
-    //
-    // 根据文件路径读取byte[] 数组
-    //
+    /**
+     * 读取文件内容并转为byte数组（适用于二进制文件：图片、音频等）
+     * @param filePath 文件绝对路径（非空）
+     * @return 文件内容byte数组
+     * @throws IOException 异常：文件不存在、读取失败等
+     */
     public static byte[] readFileByBytes(String filePath) throws IOException {
+        // 1. 校验文件合法性
         File file = new File(filePath);
         if (!file.exists()) {
-            throw new FileNotFoundException(filePath);
-        } else {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream((int) file.length());
-            BufferedInputStream in = null;
+            throw new FileNotFoundException("文件不存在：" + filePath);
+        }
 
-            try {
-                in = new BufferedInputStream(new FileInputStream(file));
-                short bufSize = 1024;
-                byte[] buffer = new byte[bufSize];
-                int len1;
-                while (-1 != (len1 = in.read(buffer, 0, bufSize))) {
-                    bos.write(buffer, 0, len1);
-                }
+        // 2. 缓冲流读取（高效，减少IO次数）
+        try (ByteArrayOutputStream bos = new ByteArrayOutputStream((int) file.length());
+		BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file))) {
 
-                byte[] var7 = bos.toByteArray();
-                return var7;
-            } finally {
-                try {
-                    if (in != null) {
-                        in.close();
-                    }
-                } catch (IOException var14) {
-                    var14.printStackTrace();
-                }
-
-                bos.close();
+            byte[] buffer = new byte[BUFFER_SIZE];
+            int readLen;
+            while ((readLen = bis.read(buffer)) != -1) {
+                bos.write(buffer, 0, readLen);
             }
+            bos.flush();
+            return bos.toByteArray();
         }
     }
 
-    //
-    // 文件复制函数
-    //
+    // ====================================== 文件复制相关 ======================================
+
+    /**
+     * 基于FileChannel复制文件（高效，适用于大文件复制）
+     * @param source 源文件（非空，必须存在）
+     * @param dest 目标文件（非空，父目录会自动创建）
+     * @throws IOException 异常：源文件不存在、复制失败等
+     */
     public static void copyFileUsingFileChannels(File source, File dest) throws IOException {
-        FileChannel inputChannel = null;
-        FileChannel outputChannel = null;
-        try {
-            inputChannel = new FileInputStream(source).getChannel();
-            outputChannel = new FileOutputStream(dest).getChannel();
+        // 1. 校验源文件合法性
+        if (!source.exists() || !source.isFile()) {
+            throw new FileNotFoundException("源文件不存在或不是文件：" + source.getAbsolutePath());
+        }
+
+        // 2. 创建目标文件父目录
+        if (!dest.getParentFile().exists()) {
+            dest.getParentFile().mkdirs();
+        }
+
+        // 3. 通道复制（try-with-resources 自动关闭通道，无需手动关闭）
+        try (FileChannel inputChannel = new FileInputStream(source).getChannel();
+		FileChannel outputChannel = new FileOutputStream(dest).getChannel()) {
+            // 从输入通道复制到输出通道（高效，底层优化）
             outputChannel.transferFrom(inputChannel, 0, inputChannel.size());
-        } finally {
-            inputChannel.close();
-            outputChannel.close();
+            LogUtils.d(TAG, "文件复制成功（FileChannel）：" + source.getAbsolutePath() + " → " + dest.getAbsolutePath());
         }
     }
 
     /**
-     * 将文件生成位图
-     * @param path
-     * @return
-     * @throws IOException
+     * 简化版文件复制（基于NIO Files工具类，代码简洁，适用于中小文件）
+     * @param oldFile 源文件（非空，必须存在）
+     * @param newFile 目标文件（非空，父目录会自动创建）
+     * @return 复制结果：true-成功，false-失败
      */
-    public static BitmapDrawable getImageDrawable(String path)
-    throws IOException {
-        //打开文件
-        File file = new File(path);
-        if (!file.exists()) {
-            return null;
-        }
-
-        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-        int BUFFER_SIZE = 1000;
-        byte[] bt = new byte[BUFFER_SIZE];
-
-        //得到文件的输入流
-        InputStream in = new FileInputStream(file);
-
-        //将文件读出到输出流中
-        int readLength = in.read(bt);
-        while (readLength != -1) {
-            outStream.write(bt, 0, readLength);
-            readLength = in.read(bt);
-        }
-
-        //转换成byte 后 再格式化成位图
-        byte[] data = outStream.toByteArray();
-        Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length);// 生成位图
-        BitmapDrawable bd = new BitmapDrawable(bitmap);
-
-        return bd;
-    }
-    
     public static boolean copyFile(File oldFile, File newFile) {
-        //String oldPath = "path/to/original/file.txt";
-        //String newPath = "path/to/new-location/for/file.txt";
+        // 1. 校验源文件合法性
+        if (oldFile == null || !oldFile.exists() || !oldFile.isFile()) {
+            LogUtils.e(TAG, "源文件无效：" + (oldFile != null ? oldFile.getAbsolutePath() : "null"));
+            return false;
+        }
 
-        //File oldFile = new java.io.File(oldPath);
-        //File newFile = new java.io.File(newPath);
+        // 2. 创建目标文件父目录
         if (!newFile.getParentFile().exists()) {
             newFile.getParentFile().mkdirs();
         }
 
-        if (!oldFile.exists()) {
-            //System.out.println("The original file does not exist.");
-            LogUtils.d(TAG, "The original file does not exist.");
-        } else {
-            try {
-                // 源文件路径
-                Path sourcePath = Paths.get(oldFile.getPath());
-                // 目标文件路径
-                Path destPath = Paths.get(newFile.getPath());
-                if(newFile.exists()) {
-                    newFile.delete();
-                }
-                Files.copy(sourcePath, destPath);
-                LogUtils.d(TAG, "File copy successfully.");
-                //System.out.println("File moved successfully.");
-                return true;
-            } catch (Exception e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                //System.err.println("An error occurred while moving the file: " + e.getMessage());
+        // 3. 复制文件（覆盖已有目标文件）
+        try {
+            Path sourcePath = Paths.get(oldFile.getPath());
+            Path destPath = Paths.get(newFile.getPath());
+            // 先删除已有目标文件（避免覆盖失败）
+            if (newFile.exists()) {
+                newFile.delete();
             }
+            Files.copy(sourcePath, destPath);
+            LogUtils.d(TAG, "文件复制成功（Files）：" + oldFile.getAbsolutePath() + " → " + newFile.getAbsolutePath());
+            return true;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "文件复制失败：" + e.getMessage(), e);
+            return false;
         }
-        return false;
     }
 
+    // ====================================== 图片文件相关 ======================================
+
+    /**
+     * 从文件路径获取BitmapDrawable（适用于Android图片显示）
+     * @param path 图片文件绝对路径（非空）
+     * @return BitmapDrawable 图片对象（文件不存在/读取失败返回null）
+     * @throws IOException 异常：文件读取IO错误
+     */
+    public static BitmapDrawable getImageDrawable(String path) throws IOException {
+        // 1. 校验文件合法性
+        File file = new File(path);
+        if (!file.exists() || !file.isFile()) {
+            LogUtils.e(TAG, "图片文件不存在：" + path);
+            return null;
+        }
+
+        // 2. 读取文件并转为BitmapDrawable（缓冲流读取，减少内存占用）
+        try (InputStream is = new FileInputStream(file);
+		ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+
+            byte[] buffer = new byte[BUFFER_SIZE];
+            int readLen;
+            while ((readLen = is.read(buffer)) != -1) {
+                bos.write(buffer, 0, readLen);
+            }
+
+            // 3. 生成Bitmap并包装为BitmapDrawable
+            byte[] imageBytes = bos.toByteArray();
+            Bitmap bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length);
+            return new BitmapDrawable(bitmap);
+        }
+    }
+
+    // ====================================== 文件名处理相关 ======================================
+
+    /**
+     * 截取文件后缀名（兼容多 "." 场景，如"image.2025.png" → ".png"）
+     * @param file 目标文件（可为null）
+     * @return 文件后缀名：带点（如".jpg"），无后缀/文件无效返回空字符串
+     */
+    public static String getFileSuffixWithMultiDot(File file) {
+        // 1. 校验文件合法性
+        if (file == null || !file.isFile()) {
+            return "";
+        }
+
+        // 2. 提取文件名并查找最后一个 "."
+        String fileName = file.getName();
+        int lastDotIndex = fileName.lastIndexOf(".");
+
+        // 3. 校验后缀合法性（排除无后缀、以点结尾、后缀过长的异常文件）
+        if (lastDotIndex == -1 // 无 "."
+			|| lastDotIndex == fileName.length() - 1 // 以 "." 结尾（如".gitignore"）
+			|| (fileName.length() - lastDotIndex) > 5) { // 后缀长度超过5（异常文件名）
+            return "";
+        }
+
+        // 4. 返回小写后缀（统一格式，避免大小写不一致问题）
+        return fileName.substring(lastDotIndex).toLowerCase();
+    }
+
+    /**
+     * 生成唯一文件名（优化版：唯一、合法、简洁）
+     * 生成规则：UUID(去掉"-") + "_" + 时间戳 + 原文件后缀
+     * @param refFile 参考文件（用于提取后缀名，可为null）
+     * @return 唯一文件名（如"a1b2c3d4e5f6_1730000000000.jpg"，无后缀则不带点）
+     */
+    public static String createUniqueFileName(File refFile) {
+        // 1. 获取参考文件的后缀名（自动容错null/无效文件）
+        String suffix = getFileSuffixWithMultiDot(refFile);
+
+        // 2. 生成唯一标识（UUID确保全局唯一，时间戳进一步降低重复概率）
+        String uniqueId = UUID.randomUUID().toString().replace("-", ""); // 去掉"-"简化文件名
+        long timeStamp = System.currentTimeMillis();
+
+        // 3. 拼接文件名（分场景处理，避免多余点）
+        if (suffix.isEmpty()) {
+            // 无后缀：唯一ID + 时间戳
+            return String.format("%s_%d", uniqueId, timeStamp);
+        } else {
+            // 有后缀：唯一ID + 时间戳 + 后缀（无多余点）
+            return String.format("%s_%d%s", uniqueId, timeStamp, suffix);
+        }
+    }
 }
+

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

@@ -0,0 +1,294 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.content.Context;
+import android.os.Environment;
+import android.text.TextUtils;
+import android.util.Log;
+import cc.winboll.studio.libappbase.LogUtils;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/19 20:52
+ * @Describe 图片下载工具类（单例模式）
+ * 功能：下载网络图片到缓存目录、清理过期文件、获取最新下载文件
+ */
+public class ImageDownloader {
+	public static final String TAG = "ImageDownloader";
+	// 单例实例
+	private static ImageDownloader sInstance;
+	// OkHttp 客户端（全局复用，提升性能）
+	private OkHttpClient mOkHttpClient;
+	// 缓存目录：/data/data/应用包名/cache/networkdownload
+	private File mCacheDir;
+	// 过期时间：7天（单位：毫秒），可按需调整
+	private static final long EXPIRE_TIME = 7 * 24 * 3600 * 1000;
+
+	/**
+	 * 私有构造（单例模式禁止外部实例化）
+	 * @param context 上下文（用于获取缓存目录）
+	 */
+	private ImageDownloader(Context context) {
+		// 初始化 OkHttp 客户端（设置超时时间）
+		mOkHttpClient = new OkHttpClient.Builder()
+			.connectTimeout(10, TimeUnit.SECONDS)
+			.readTimeout(15, TimeUnit.SECONDS)
+			.writeTimeout(15, TimeUnit.SECONDS)
+			.build();
+
+		// 初始化缓存目录：networkdownload
+		initCacheDir(context);
+		// 初始化时清理过期文件
+		clearExpiredFiles();
+	}
+
+	/**
+	 * 单例获取方法（线程安全）
+	 * @param context 上下文（建议使用 Application 上下文避免内存泄漏）
+	 * @return 单例实例
+	 */
+	public static synchronized ImageDownloader getInstance(Context context) {
+		if (sInstance == null) {
+			// 使用 Application 上下文，防止 Activity 销毁导致的内存泄漏
+			sInstance = new ImageDownloader(context.getApplicationContext());
+		}
+		return sInstance;
+	}
+
+	/**
+	 * 初始化缓存目录：若不存在则创建
+	 */
+	private void initCacheDir(Context context) {
+		// 获取应用内置缓存目录（无需权限）
+		File cacheRoot = context.getCacheDir();
+		mCacheDir = new File(cacheRoot, "networkdownload");
+
+		// 若目录不存在则创建（包括父目录）
+		if (!mCacheDir.exists()) {
+			boolean isCreated = mCacheDir.mkdirs();
+			if (isCreated) {
+				LogUtils.d("ImageDownloader", "networkdownload 缓存目录创建成功：" + mCacheDir.getAbsolutePath());
+			} else {
+				LogUtils.e("ImageDownloader", "networkdownload 缓存目录创建失败");
+			}
+		} else {
+			LogUtils.d("ImageDownloader", "networkdownload 缓存目录已存在：" + mCacheDir.getAbsolutePath());
+		}
+	}
+
+	/**
+	 * 清理过期文件（最后修改时间超过 EXPIRE_TIME 的文件）
+	 */
+	private void clearExpiredFiles() {
+		if (mCacheDir == null || !mCacheDir.exists()) {
+			return;
+		}
+
+		File[] files = mCacheDir.listFiles();
+		if (files == null || files.length == 0) {
+			LogUtils.d("ImageDownloader", "缓存目录无文件，无需清理");
+			return;
+		}
+
+		long currentTime = System.currentTimeMillis();
+		int deleteCount = 0;
+
+		// 遍历所有文件，删除过期文件
+		for (File file : files) {
+			long lastModifyTime = file.lastModified();
+			if (currentTime - lastModifyTime > EXPIRE_TIME) {
+				if (file.delete()) {
+					deleteCount++;
+					LogUtils.d("ImageDownloader", "删除过期文件：" + file.getName());
+				} else {
+					LogUtils.e("ImageDownloader", "删除过期文件失败：" + file.getName());
+				}
+			}
+		}
+
+		LogUtils.d("ImageDownloader", "过期文件清理完成，共删除 " + deleteCount + " 个文件");
+	}
+
+	/**
+	 * 下载网络图片到缓存目录
+	 * @param imageUrl 图片网络链接
+	 * @param callback 下载结果回调（成功/失败）
+	 */
+	public void downloadImage(final String imageUrl, final DownloadCallback callback) {
+		// 校验参数
+		if (TextUtils.isEmpty(imageUrl)) {
+			if (callback != null) {
+				callback.onFailure("图片链接为空");
+			}
+			return;
+		}
+
+		if (mCacheDir == null || !mCacheDir.exists()) {
+			if (callback != null) {
+				callback.onFailure("缓存目录不存在");
+			}
+			return;
+		}
+
+		// 构建 OkHttp 请求
+		Request request = new Request.Builder()
+			.url(imageUrl)
+			.build();
+
+		// 异步下载（避免阻塞主线程）
+		mOkHttpClient.newCall(request).enqueue(new Callback() {
+				@Override
+				public void onFailure(Call call, IOException e) {
+					// 下载失败，回调主线程
+					if (callback != null) {
+						callback.onFailure("下载失败：" + e.getMessage());
+					}
+					LogUtils.e("ImageDownloader", "图片下载失败：" + e.getMessage());
+				}
+
+				@Override
+				public void onResponse(Call call, Response response) throws IOException {
+					if (!response.isSuccessful()) {
+						// 响应失败（如 404、500）
+						if (callback != null) {
+							callback.onFailure("响应失败：" + response.code());
+						}
+						LogUtils.e("ImageDownloader", "图片响应失败，状态码：" + response.code());
+						return;
+					}
+
+					// 响应成功，写入文件
+					InputStream inputStream = null;
+					FileOutputStream outputStream = null;
+					try {
+						inputStream = response.body().byteStream();
+						// 生成 UUID 唯一文件名（保留原文件后缀）
+						String fileExtension = getFileExtension(imageUrl);
+						String fileName = UUID.randomUUID().toString() + fileExtension;
+						File imageFile = new File(mCacheDir, fileName);
+
+						// 写入文件
+						outputStream = new FileOutputStream(imageFile);
+						byte[] buffer = new byte[1024];
+						int len;
+						while ((len = inputStream.read(buffer)) != -1) {
+							outputStream.write(buffer, 0, len);
+						}
+						outputStream.flush();
+
+						// 下载成功，回调主线程并返回文件路径
+						if (callback != null) {
+							callback.onSuccess(imageFile.getAbsolutePath());
+						}
+						LogUtils.d("ImageDownloader", "图片下载成功：" + imageFile.getAbsolutePath());
+
+					} catch (IOException e) {
+						if (callback != null) {
+							callback.onFailure("文件写入失败：" + e.getMessage());
+						}
+						LogUtils.e("ImageDownloader", "图片写入失败：" + e.getMessage());
+					} finally {
+						// 关闭流（Java7 手动关闭，避免资源泄漏）
+						if (inputStream != null) {
+							try {
+								inputStream.close();
+							} catch (IOException e) {
+								e.printStackTrace();
+							}
+						}
+						if (outputStream != null) {
+							try {
+								outputStream.close();
+							} catch (IOException e) {
+								e.printStackTrace();
+							}
+						}
+						// 关闭响应体
+						if (response.body() != null) {
+							response.body().close();
+						}
+					}
+				}
+			});
+	}
+
+	/**
+	 * 获取 networkdownload 目录中最后下载的文件（按修改时间排序）
+	 * @return 最后下载的文件路径（null 表示无文件）
+	 */
+	public String getLastDownloadedFile() {
+		if (mCacheDir == null || !mCacheDir.exists()) {
+			LogUtils.e("ImageDownloader", "缓存目录不存在");
+			return null;
+		}
+
+		File[] files = mCacheDir.listFiles();
+		if (files == null || files.length == 0) {
+			LogUtils.d("ImageDownloader", "缓存目录无文件");
+			return null;
+		}
+
+		// 按最后修改时间降序排序，取第一个即为最新文件
+		File lastFile = files[0];
+		for (File file : files) {
+			if (file.lastModified() > lastFile.lastModified()) {
+				lastFile = file;
+			}
+		}
+
+		LogUtils.d("ImageDownloader", "最后下载的文件：" + lastFile.getAbsolutePath());
+		return lastFile.getAbsolutePath();
+	}
+
+	/**
+	 * 工具方法：从图片链接中提取文件后缀（如 .png、.jpg）
+	 * @param imageUrl 图片链接
+	 * @return 文件后缀（含点号，若无法提取则返回 .jpg）
+	 */
+	private String getFileExtension(String imageUrl) {
+		if (TextUtils.isEmpty(imageUrl)) {
+			return ".jpg";
+		}
+
+		int lastDotIndex = imageUrl.lastIndexOf(".");
+		int lastSlashIndex = imageUrl.lastIndexOf("/");
+		// 确保后缀在最后一个斜杠之后，且长度合理（1-5 个字符）
+		if (lastDotIndex > lastSlashIndex && lastDotIndex < imageUrl.length() - 1) {
+			String extension = imageUrl.substring(lastDotIndex);
+			if (extension.length() <= 5) {
+				return extension.toLowerCase(); // 统一转为小写
+			}
+		}
+
+		// 无法提取后缀时，默认使用 .jpg
+		return ".jpg";
+	}
+
+	/**
+	 * 下载结果回调接口（Java7 接口实现）
+	 */
+	public interface DownloadCallback {
+		/**
+		 * 下载成功
+		 * @param filePath 图片保存路径
+		 */
+		void onSuccess(String filePath);
+
+		/**
+		 * 下载失败
+		 * @param errorMsg 失败原因
+		 */
+		void onFailure(String errorMsg);
+	}
+}
+

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

@@ -0,0 +1,33 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/14 11:14
+ * @Describe 米盟 MimoUtils
+ */
+public final class MimoUtils {
+	public static final String TAG = "Utils";
+
+	public static int dpToPx(Context context, float dp) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (dp * displayMetrics.density + 0.5f);
+	}
+
+	public static int pxToDp(Context context, float px) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (px / displayMetrics.density + 0.5f);
+	}
+
+	public static int pxToSp(Context context, float pxValue) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (pxValue / displayMetrics.scaledDensity + 0.5f);
+	}
+
+	public static int spToPx(Context context, float spValue) {
+		DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+		return (int) (spValue * displayMetrics.scaledDensity + 0.5f);
+	}
+}

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

@@ -21,7 +21,7 @@ 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.model.NotificationMessage;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 
 public class NotificationUtils2 {

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

@@ -1,6 +1,6 @@
 package cc.winboll.studio.powerbell.utils;
 
-import cc.winboll.studio.powerbell.beans.BatteryInfoBean;
+import cc.winboll.studio.powerbell.model.BatteryInfoBean;
 import java.util.ArrayList;
 
 public class StringUtils {

powerbell/src/main/java/cc/winboll/studio/powerbell/views/BackgroundView.java

@@ -0,0 +1,403 @@
+package cc.winboll.studio.powerbell.views;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.R;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/19 18:01
+ * @Describe 背景图片视图控件（全透明背景 + 不拉伸居中平铺 + 完全填充父视图）
+ */
+public class BackgroundView extends RelativeLayout {
+
+    public static final String TAG = "BackgroundView";
+
+    Context mContext;
+    private ImageView ivBackground;
+
+    private static String BACKGROUND_IMAGE_FOLDER = "Background";
+    private static String BACKGROUND_IMAGE_FILENAME = "current.data";
+    private static String BACKGROUND_IMAGE_PREVIEW_FILENAME = "current_preview.data";
+    private static String backgroundSourceFilePath;
+    private float imageAspectRatio = 1.0f; // 图片原始宽高比（控制不拉伸）
+    // 标记当前是否处于预览模式
+    private boolean isPreviewMode = false;
+
+    public BackgroundView(Context context) {
+        super(context);
+        this.mContext = context;
+        initView();
+    }
+
+    public BackgroundView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.mContext = context;
+        initView();
+    }
+
+    public BackgroundView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        this.mContext = context;
+        initView();
+    }
+
+    public BackgroundView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        this.mContext = context;
+        initView();
+    }
+
+    void initView() {
+        // 1. 控件本身：完全填充父视图 + 全透明背景 + 无内边距
+        setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+        setPadding(0, 0, 0, 0); // 取消自身内边距
+        setBackgroundColor(0x00000000); // 全透明背景（#00000000）
+        setBackground(new ColorDrawable(0x00000000)); // 双重保障：同时设置Background为透明（兼容低版本）
+
+        initBackgroundImageView(); // 初始化内部ImageView（全透明 + 不拉伸居中平铺）
+
+		backgroundSourceFilePath = BackgroundSourceUtils.getInstance(this.mContext).getCurrentBackgroundFilePath();
+        loadAndSetImageViewBackground();
+    }
+
+    private void initBackgroundImageView() {
+        ivBackground = new ImageView(mContext);
+        // 2. ImageView：初始宽高WRAP_CONTENT + 居中 + 无内边距 + 全透明背景
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
+			LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT); // 居中显示
+        layoutParams.setMargins(0, 0, 0, 0); // 取消边距
+        ivBackground.setLayoutParams(layoutParams);
+
+        // 3. 缩放模式：FIT_CENTER（不拉伸，按比例显示）
+        ivBackground.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        ivBackground.setPadding(0, 0, 0, 0); // 取消内部padding
+        ivBackground.setBackgroundColor(0x00000000); // ImageView背景全透明
+        ivBackground.setBackground(new ColorDrawable(0x00000000)); // 双重保障（兼容低版本）
+
+        this.addView(ivBackground);
+    }
+
+//    private void initBackgroundImagePath() {
+//		if (isPreviewMode) {
+//            backgroundSourceFilePath = BackgroundSourceUtils.getInstance(this.mContext).getPreviewBackgroundFilePath();
+//        } else {
+//			backgroundSourceFilePath = BackgroundSourceUtils.getInstance(this.mContext).getCurrentBackgroundFilePath();
+//		}
+//    }
+
+    /**
+     * 拷贝图片文件到背景资源目录（正式背景）
+     */
+//    public void setImageViewSource(String srcBackgroundPath) {
+//        initBackgroundImagePath();
+//        if (backgroundSourceFilePath == null) {
+//            LogUtils.e(TAG, "目标路径初始化失败，无法保存背景图片");
+//            return;
+//        }
+//
+//        File srcFile = new File(srcBackgroundPath);
+//        if (!srcFile.exists() || !srcFile.isFile()) {
+//            LogUtils.e(TAG, String.format("源文件不存在或不是文件：%s", srcBackgroundPath));
+//            return;
+//        }
+//
+//        File destFile = new File(backgroundSourceFilePath);
+//        File destDir = destFile.getParentFile();
+//        if (destDir != null && !destDir.exists()) {
+//            boolean isDirCreated = destDir.mkdirs();
+//            if (!isDirCreated) {
+//                LogUtils.e(TAG, "目标目录创建失败：" + destDir.getAbsolutePath());
+//                return;
+//            }
+//        }
+//
+//        FileInputStream fis = null;
+//        FileOutputStream fos = null;
+//        try {
+//            fis = new FileInputStream(srcFile);
+//            fos = new FileOutputStream(destFile);
+//
+//            byte[] buffer = new byte[4096];
+//            int len;
+//            while ((len = fis.read(buffer)) != -1) {
+//                fos.write(buffer, 0, len);
+//            }
+//            fos.flush();
+//
+//            LogUtils.d(TAG, String.format("文件拷贝成功：%s -> %s", srcBackgroundPath, backgroundSourceFilePath));
+//            // 拷贝成功后，若处于预览模式则退出预览，加载正式背景
+//            if (isPreviewMode) {
+//                exitPreviewMode();
+//            } else {
+//                loadAndSetImageViewBackground();
+//            }
+//
+//        } catch (Exception e) {
+//            LogUtils.e(TAG, String.format("文件拷贝失败：%s", e.getMessage()), e);
+//            if (destFile.exists()) {
+//                destFile.delete();
+//                LogUtils.d(TAG, "已删除损坏的目标文件");
+//            }
+//        } finally {
+//            if (fis != null) {
+//                try {
+//                    fis.close();
+//                } catch (Exception e) {
+//                    LogUtils.e(TAG, "输入流关闭失败：" + e.getMessage());
+//                }
+//            }
+//            if (fos != null) {
+//                try {
+//                    fos.close();
+//                } catch (Exception e) {
+//                    LogUtils.e(TAG, "输出流关闭失败：" + e.getMessage());
+//                }
+//            }
+//        }
+//    }
+
+    /**
+     * 预览临时图片（全透明背景 + 不拉伸居中平铺）
+     * @param previewImagePath 临时预览图片的路径
+     */
+    /*public void previewBackgroundImage(String previewImagePath) {
+	 if (previewImagePath == null || previewImagePath.isEmpty()) {
+	 LogUtils.e(TAG, "预览图片路径为空");
+	 setDefaultImageViewBackground();
+	 return;
+	 }
+
+	 File previewFile = new File(previewImagePath);
+	 if (!previewFile.exists() || !previewFile.isFile()) {
+	 LogUtils.e(TAG, "预览图片不存在或不是文件：" + previewImagePath);
+	 setDefaultImageViewBackground();
+	 return;
+	 }
+
+	 // 计算图片原始宽高比
+	 if (!calculateImageAspectRatio(previewFile)) {
+	 LogUtils.e(TAG, "预览图片尺寸无效，无法预览");
+	 setDefaultImageViewBackground();
+	 return;
+	 }
+
+	 // 压缩加载预览图片（保持比例）
+	 Bitmap previewBitmap = decodeBitmapWithCompress(previewFile, 1080, 1920);
+	 if (previewBitmap == null) {
+	 LogUtils.e(TAG, "预览图片加载失败");
+	 setDefaultImageViewBackground();
+	 return;
+	 }
+
+	 // 设置预览图片（保持ImageView透明背景）
+	 Drawable previewDrawable = new BitmapDrawable(mContext.getResources(), previewBitmap);
+	 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+	 ivBackground.setBackground(previewDrawable);
+	 } else {
+	 ivBackground.setBackgroundDrawable(previewDrawable);
+	 }
+
+	 // 调整ImageView尺寸（居中平铺，不拉伸）
+	 adjustImageViewSize();
+	 isPreviewMode = true;
+	 LogUtils.d(TAG, "进入预览模式，预览图片路径：" + previewImagePath + "，宽高比：" + imageAspectRatio);
+	 }
+	 */
+
+    /**
+     * 退出预览模式，恢复显示正式背景图片
+     */
+    /*public void exitPreviewMode() {
+	 if (isPreviewMode) {
+	 loadAndSetImageViewBackground();
+	 isPreviewMode = false;
+	 LogUtils.d(TAG, "退出预览模式，恢复正式背景");
+	 }
+	 }*/
+
+    /**
+     * 公共函数：供外部类调用，重新加载正式背景图片（刷新显示）
+     */
+    public void reloadCurrentBackground() {
+        LogUtils.d(TAG, "外部调用重新加载背景图片");
+		backgroundSourceFilePath = BackgroundSourceUtils.getInstance(this.mContext).getCurrentBackgroundFilePath();
+        loadAndSetImageViewBackground();
+    }
+	
+	public void reloadPreviewBackground() {
+        LogUtils.d(TAG, "外部调用重新加载背景图片");
+		backgroundSourceFilePath = BackgroundSourceUtils.getInstance(this.mContext).getPreviewBackgroundFilePath();
+        loadAndSetImageViewBackground();
+    }
+
+    /**
+     * 加载正式背景图片并设置到 ImageView（全透明背景 + 不拉伸居中平铺）
+     */
+    private void loadAndSetImageViewBackground() {
+        if (backgroundSourceFilePath == null) {
+			LogUtils.d(TAG, "backgroundSourceFilePath == null");
+            setDefaultImageViewBackground();
+            return;
+        }
+		//ToastUtils.show(String.format("backgroundSourceFilePath : %s", backgroundSourceFilePath));
+
+        File backgroundFile = new File(backgroundSourceFilePath);
+        if (!backgroundFile.exists() || !backgroundFile.isFile()) {
+            LogUtils.e(TAG, "背景图片不存在：" + backgroundSourceFilePath);
+            setDefaultImageViewBackground();
+            return;
+        }
+
+        // 计算图片原始宽高比
+        if (!calculateImageAspectRatio(backgroundFile)) {
+            setDefaultImageViewBackground();
+            return;
+        }
+
+        // 压缩加载 Bitmap（保持比例）
+        Bitmap bitmap = decodeBitmapWithCompress(backgroundFile, 1080, 1920);
+        if (bitmap == null) {
+            LogUtils.e(TAG, "图片加载失败，无法解析为 Bitmap");
+            setDefaultImageViewBackground();
+            return;
+        }
+
+        // 设置图片（保持ImageView透明背景）
+        Drawable backgroundDrawable = new BitmapDrawable(mContext.getResources(), bitmap);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            ivBackground.setBackground(backgroundDrawable);
+        } else {
+            ivBackground.setBackgroundDrawable(backgroundDrawable);
+        }
+
+        // 调整ImageView尺寸（居中平铺，不拉伸）
+        adjustImageViewSize();
+        LogUtils.d(TAG, "ImageView 背景加载成功（全透明+不拉伸），宽高比：" + imageAspectRatio);
+    }
+
+    /**
+     * 计算图片原始宽高比（宽/高）
+     */
+    private boolean calculateImageAspectRatio(File file) {
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+
+            int imageWidth = options.outWidth;
+            int imageHeight = options.outHeight;
+
+            if (imageWidth <= 0 || imageHeight <= 0) {
+                LogUtils.e(TAG, "图片尺寸无效：宽=" + imageWidth + ", 高=" + imageHeight);
+                return false;
+            }
+
+            imageAspectRatio = (float) imageWidth / imageHeight;
+            return true;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "计算图片宽高比失败：" + e.getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 调整ImageView尺寸（不拉伸，居中平铺）
+     */
+    private void adjustImageViewSize() {
+        int parentWidth = getWidth(); // 控件宽度（已填充父视图）
+        int parentHeight = getHeight(); // 控件高度（已填充父视图）
+
+        if (parentWidth == 0 || parentHeight == 0) {
+            post(new Runnable() {
+					@Override
+					public void run() {
+						adjustImageViewSize();
+					}
+				});
+            return;
+        }
+
+        int imageViewWidth, imageViewHeight;
+        if (imageAspectRatio >= 1.0f) { // 横图
+            imageViewWidth = Math.min(parentWidth, (int) (parentHeight * imageAspectRatio));
+            imageViewHeight = (int) (imageViewWidth / imageAspectRatio);
+        } else { // 竖图
+            imageViewHeight = Math.min(parentHeight, (int) (parentWidth / imageAspectRatio));
+            imageViewWidth = (int) (imageViewHeight * imageAspectRatio);
+        }
+
+        // 应用尺寸
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) ivBackground.getLayoutParams();
+        layoutParams.width = imageViewWidth;
+        layoutParams.height = imageViewHeight;
+        ivBackground.setLayoutParams(layoutParams);
+
+        LogUtils.d(TAG, "ImageView 尺寸调整完成：宽=" + imageViewWidth + ", 高=" + imageViewHeight);
+    }
+
+    /**
+     * 带压缩的 Bitmap 解码（保持比例，避免 OOM）
+     */
+    private Bitmap decodeBitmapWithCompress(File file, int maxWidth, int maxHeight) {
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+
+            int scaleX = options.outWidth / maxWidth;
+            int scaleY = options.outHeight / maxHeight;
+            int inSampleSize = Math.max(scaleX, scaleY);
+            if (inSampleSize <= 0) {
+                inSampleSize = 1;
+            }
+
+            options.inJustDecodeBounds = false;
+            options.inSampleSize = inSampleSize;
+            options.inPreferredConfig = Bitmap.Config.RGB_565;
+            return BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "图片压缩加载失败：" + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 设置默认背景（全透明兜底，避免空白）
+     */
+    private void setDefaultImageViewBackground() {
+        // 关键：默认背景设为全透明（而非默认图，避免遮挡下层视图）
+        ivBackground.setBackground(new ColorDrawable(0x00000000)); // 全透明背景
+        imageAspectRatio = 1.0f;
+        adjustImageViewSize();
+        LogUtils.d(TAG, "已设置默认透明背景");
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        adjustImageViewSize();
+    }
+
+    /**
+     * 对外提供：判断当前是否处于预览模式
+     */
+    public boolean isPreviewMode() {
+        return isPreviewMode;
+    }
+}
+

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

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#FF009DCB"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

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

@@ -21,14 +21,15 @@
 			android:layout_height="match_parent"
 			android:id="@+id/activitybackgroundpictureRelativeLayout1"/>
 
-
-		<ImageView
+		<cc.winboll.studio.powerbell.views.BackgroundView
+			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/activitybackgroundpictureImageView1"
-			android:layout_below="@id/toolbar">
+			android:background="#FF7381FF"
+			android:id="@+id/activitybackgroundpictureBackgroundView1">
 
-		</ImageView>
+		</cc.winboll.studio.powerbell.views.BackgroundView>
 
 		<LinearLayout
 			android:orientation="vertical"
@@ -80,6 +81,23 @@
 					android:layout_margin="5dp"
 					android:id="@+id/activitybackgroundpictureAButton2"/>
 
+				<cc.winboll.studio.libaes.views.AButton
+					android:layout_width="50dp"
+					android:layout_height="36dp"
+					android:text="♾"
+					android:layout_gravity="center_vertical"
+					android:layout_margin="5dp"
+					android:id="@+id/activitybackgroundpictureAButton9"
+					android:onClick="onNetworkBackgroundDialog"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
+
 				<cc.winboll.studio.libaes.views.AButton
 					android:layout_width="50dp"
 					android:layout_height="36dp"
@@ -103,7 +121,7 @@
 					android:layout_gravity="center_vertical"
 					android:layout_margin="5dp"
 					android:id="@+id/activitybackgroundpictureAButton7"/>
-				
+
 				<cc.winboll.studio.libaes.views.AButton
 					android:layout_width="50dp"
 					android:layout_height="36dp"
@@ -111,11 +129,12 @@
 					android:layout_gravity="center_vertical"
 					android:layout_margin="5dp"
 					android:id="@+id/activitybackgroundpictureAButton8"/>
-				
+
 			</LinearLayout>
 
 		</LinearLayout>
 
 	</RelativeLayout>
+
 </LinearLayout>
 

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

@@ -0,0 +1,30 @@
+<?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:background="@android:color/white">
+
+    <!-- 搜索框：提示文本改为“搜索应用名称或包名” -->
+    <EditText
+        android:id="@+id/et_search"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:padding="12dp"
+        android:hint="搜索应用名称或包名"
+        android:background="@android:drawable/btn_default_small"
+        android:inputType="text"
+        android:textSize="16sp"/>
+
+    <!-- 应用列表 -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_battery_report"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"/>
+
+</LinearLayout>

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

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

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

@@ -6,7 +6,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<cc.winboll.studio.libaes.views.AToolbar
+	<cc.winboll.studio.libaes.views.ASupportToolbar
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/toolbar_height"
 		android:id="@+id/toolbar"
@@ -21,8 +21,7 @@
 		<RelativeLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:id="@+id/activitymainRelativeLayout1"
-			android:background="#FFEE2121"/>
+			android:id="@+id/activitymainRelativeLayout1"/>
 
 		<FrameLayout
 			android:layout_width="match_parent"
@@ -31,5 +30,10 @@
 
 	</RelativeLayout>
 
+	<cc.winboll.studio.libaes.views.ADsBannerView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/adsbanner"/>
+
 </LinearLayout>
 

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

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

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+	<cc.winboll.studio.libaes.views.AToolbar
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		style="@style/DefaultAToolbar"/>
+	
+    <cc.winboll.studio.libaes.views.ADsControlView
+		android:id="@+id/ads_control_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
+</LinearLayout>

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

@@ -0,0 +1,93 @@
+<?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:layout_margin="16dp"
+	android:orientation="vertical"
+	android:background="@android:color/white"
+	android:padding="20dp"
+	android:radius="12dp">
+
+	<TextView
+		android:id="@+id/tv_dialog_title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="网络后台提示"
+		android:textSize="18sp"
+		android:textColor="@android:color/black"
+		android:textStyle="bold"/>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="12dp">
+
+		<EditText
+			android:layout_width="0dp"
+			android:ems="10"
+			android:layout_height="wrap_content"
+			android:layout_weight="1.0"
+			android:id="@+id/et_url"
+			android:singleLine="true"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="↻"
+			android:id="@+id/btn_preview"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="100dp"
+		android:layout_marginTop="12dp"
+		android:layout_gravity="center_vertical">
+
+		<cc.winboll.studio.powerbell.views.BackgroundView
+			android:layout_width="100dp"
+			android:layout_height="100dp"
+			android:id="@+id/bv_background_preview"/>
+
+	</LinearLayout>
+
+	<TextView
+		android:id="@+id/tv_dialog_content"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="12dp"
+		android:text="应用正在后台使用网络，是否继续允许？"
+		android:textSize="15sp"
+		android:textColor="@android:color/darker_gray"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="20dp"
+		android:orientation="horizontal"
+		android:gravity="end">
+
+		<Button
+			android:id="@+id/btn_cancel"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="取消"
+			android:textSize="14sp"
+			android:background="@android:drawable/btn_default_small"
+			android:layout_marginRight="8dp"/>
+
+		<Button
+			android:id="@+id/btn_confirm"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="允许"
+			android:textSize="14sp"
+			android:background="@android:drawable/btn_default_small"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+

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

@@ -5,12 +5,13 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<ImageView
+	<cc.winboll.studio.powerbell.views.BackgroundView
+		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/fragmentmainviewImageView1">
-
-	</ImageView>
+		android:background="#FF7381FF"
+		android:id="@+id/fragmentmainviewBackgroundView1"/>
 
 	<LinearLayout
 		android:orientation="vertical"

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cc.winboll.studio.powerbell.views.BackgroundView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="#FF7381FF">
+
+	<HorizontalScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Main"
+			android:id="@+id/btn_main_activity"/>
+
+	</HorizontalScrollView>
+
+</cc.winboll.studio.powerbell.views.BackgroundView>
+

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

@@ -1,8 +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"/>
+        android:id="@+id/action_battery_report"
+        android:title="@string/item_battery_report"/>
     <item
         android:id="@+id/action_clearrecord"
         android:title="@string/item_clearrecord"/>
@@ -10,9 +10,9 @@
         android:id="@+id/action_changepicture"
         android:title="@string/item_changepicture"/>
     <item
-        android:id="@+id/action_log"
-        android:title="@string/item_logview"/>
+        android:id="@+id/action_settings"
+        android:title="@string/item_settings"/>
     <item
         android:id="@+id/action_about"
-        android:title="@string/item_aboutview"/>
+        android:title="@string/item_about"/>
 </menu>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_log"
+        android:title="@string/item_logview"/>
+    <item
+        android:id="@+id/action_unittestactivity"
+        android:title="@string/item_mainunittestactivity"/>
+    
+</menu>

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

@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">能源钟</string>
+    <string name="app_name_cn1">能源钟</string>
+    <string name="app_name_cn2">泡额呗额</string>
     <string name="app_description">一个接收手机电量信息的应用，当电量值达到设定范围时会提醒用户。</string>
     <string name="about_crashed">本应用崩溃了，作者水平有限，敬请谅解！</string>
-    <string name="item_mainview">Main View</string>
-    <string name="item_aboutview">About</string>
-    <string name="item_clearrecord">Clear Record</string>
-    <string name="item_changepicture">Change Picture</string>
-    <string name="item_devoloperoptionsview">Developer View</string>
-    <string name="item_logview">Log View</string>
-    <string name="item_sourceview">Source View</string>
+    <string name="item_main">主窗口</string>
+    <string name="item_about">关于</string>
+    <string name="item_settings">应用设置</string>
+    <string name="item_battery_report">应用耗电记录</string>
+    <string name="item_mainunittestactivity">开发调试窗口</string>
+    <string name="item_clearrecord">清理电量记录</string>
+    <string name="item_changepicture">更换背景图片</string>
+    <string name="item_devoloperoptionsview">开发调试窗口</string>
+    <string name="item_logview">日志窗口</string>
+    <string name="item_sourceview">源码窗口</string>
     <string name="txt_aboveswitch">消息总开关</string>
     <string name="txt_aboveswitchtips">当电量低于左边（放电状态）或高于右边（充电状态），就会发送一个提醒铃声。</string>
     <string name="texthint_CustomSlideToCleanRecord">Slide Right To Clean Up APP Record.</string>

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

@@ -25,16 +25,15 @@
     <color name="colorShuiDark">#FF0072A4</color>
     <color name="colorShuiAccent">#FF33C1FF</color>
     <color name="colorXinling">#FFFCC500</color>
-    <color name="colorPrimary">@color/colorShuiDark</color>
+    <!--<color name="colorPrimary">@color/colorShuiDark</color>
     <color name="colorPrimaryDark">@color/colorFeng</color>
     <color name="colorAccent">@color/colorShui</color>
-    <color name="colorYellow">#FFFFFF00</color>
-    <color name="colorRed">#FFFF0000</color>
-    <color name="colorBlue">#FF000FFF</color>
+	-->
+    <color name="colorYellow">#FFBEBE48</color>
+    <color name="colorRed">#FFC85C5C</color>
+    <color name="colorBlue">#FF2677C7</color>
     <color name="colorBlack">#FF000000</color>
-    <color name="colorUsege">@color/colorHuo</color>
-    <color name="colorCurrent">@color/colorShui</color>
-    <color name="colorCharge">@color/colorXinling</color>
+	<color name="colorText">@color/colorBlack</color>
     <!-- 调试配置
     <color name="colorYellow">#FF630066</color>
     <color name="colorRed">#FF23244D</color>
@@ -47,15 +46,19 @@
     <color name="colorBlue">#FF000DE5</color>
     <color name="colorBlack">#FF000000</color>
     -->
-    <!-- 原色配置
-    <color name="colorYellow">#FFFFFF00</color>
+    <!-- 原色配置 -->
+    <!--<color name="colorYellow">#FFFFFF00</color>
     <color name="colorRed">#FFFF0000</color>
     <color name="colorBlue">#FF000FFF</color>
     <color name="colorBlack">#FF000000</color>
+	-->
+    <color name="colorPrimary">@color/colorShui</color>
+    <color name="colorPrimaryDark">@color/colorShuiDark</color>
+    <color name="colorAccent">@color/colorShuiAccent</color>
     <color name="colorUsege">@color/colorRed</color>
     <color name="colorCurrent">@color/colorBlue</color>
     <color name="colorCharge">@color/colorYellow</color>
-    -->
+    
     <!--CustomSlideToUnlockView控件配置-->
     <color name="colorCustomSlideToUnlockViewWhite">#FFFFFFFF</color>
     

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

@@ -1,16 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">PowerBell</string>
+    <string name="app_name_cn1">能源钟</string>
+    <string name="app_name_cn2">泡额呗额</string>
     <string name="app_projectname">PowerBell</string>
     <string name="app_description">A mobile app that receives battery level information from a phone and alerts the user when the battery level reaches a predefined range.</string>
     <string name="about_crashed">This application has crashed, the author level is limited, please understand!</string>
+    <string name="switchto_en1">PowerBell</string>
+    <string name="switchto_cn1">能源钟</string>
+    <string name="switchto_cn2">泡额呗额</string>
+    <string name="en1_switch_disabled">PowerBell X</string>
+    <string name="cn1_switch_disabled">能源钟 X</string>
+    <string name="cn2_switch_disabled">泡额呗额 X</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_about">About</string>
+    <string name="item_settings">Settings</string>
+    <string name="item_battery_report">Battery Report</string>
     <string name="item_clearrecord">Clear Record</string>
     <string name="item_changepicture">Change Picture</string>
     <string name="item_devoloperoptionsview">Developer View</string>
     <string name="item_logview">Log View</string>
+    <string name="item_mainunittestactivity">Debug Activity</string>
     <string name="item_cleanlog">Clean Log</string>
     <string name="item_sourceview">Source View</string>
     <string name="txt_aboveswitch">Message master switch</string>

powerbell/src/main/res/xml/file_provider.xml

@@ -13,6 +13,9 @@
     <external-files-path
         name="external_file_path"
         path="." />
+	<external-files-path
+		name="files_root"
+		path="mimoDownload" />
     <!--代表app 外部存储区域根目录下的文件 Context.getExternalCacheDir目录下的目录-->
     <external-cache-path
         name="external_cache_path"

powerbell/src/main/res/xml/shortcutsmaincn1.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+	    android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

powerbell/src/main/res/xml/shortcutsmaincn2.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<!--<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+	    android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+</shortcuts>

powerbell/src/main/res/xml/shortcutsmainen1.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 切换启动入口的快捷菜单 -->
+	<!--<shortcut
+        android:shortcutId="switchto_en1"
+        android:enabled="true"
+	    android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_en1"
+        android:shortcutLongLabel="@string/switchto_en1"
+        android:shortcutDisabledMessage="@string/en1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_EN1"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_en1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>-->
+	<shortcut
+        android:shortcutId="switchto_cn1"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn1"
+        android:shortcutLongLabel="@string/switchto_cn1"
+        android:shortcutDisabledMessage="@string/cn1_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN1"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn1" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+	<shortcut
+        android:shortcutId="switchto_cn2"
+        android:enabled="true"
+        android:icon="@drawable/ic_launcher"
+        android:shortcutShortLabel="@string/switchto_cn2"
+        android:shortcutLongLabel="@string/switchto_cn2"
+        android:shortcutDisabledMessage="@string/cn2_switch_disabled">
+        <intent
+            android:action="cc.winboll.studio.powerbell.App.ACTION_SWITCHTO_CN2"
+            android:targetPackage="cc.winboll.studio.powerbell"
+            android:targetClass="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"
+            android:data="switchto_cn2" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

powerbell/src/stage/AndroidManifest.xml

@@ -4,18 +4,6 @@
 
     <application>
 
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="cc.winboll.studio.powerbell.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider"/>
-
-        </provider>
-
     </application>
 
 </manifest>