<powerbell>APK 15.14.8 release Publish.

powerbell/build.gradle

@@ -29,11 +29,11 @@ android {
         applicationId "cc.winboll.studio.powerbell"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 6
+        versionCode 7
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.11" 
+        versionName "15.14" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -56,7 +56,12 @@ dependencies {
     api 'com.github.bumptech.glide:glide:4.9.0'
     //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 	
-	
+	// uCrop 核心依赖（最新稳定版）
+    implementation 'com.github.yalantis:ucrop:2.2.8'
+    // 兼容AndroidX（若项目用AndroidX，必须添加）
+    //implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+
 	 // 应用介绍页类库
     api 'io.github.medyo:android-about-page:2.0.0'
     // SSH
@@ -77,8 +82,13 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
     
-	implementation 'cc.winboll.studio:libaes:15.11.6'
-    implementation 'cc.winboll.studio:libappbase:15.11.0'
+	// WinBoLL库 nexus.winboll.cc 地址
+	//api 'cc.winboll.studio:libaes:15.12.0'
+    //api 'cc.winboll.studio:libappbase:15.12.2'
+	
+	// WinBoLL备用库 jitpack.io 地址
+	api 'com.github.ZhanGSKen:AES:aes-v15.12.3'
+	api 'com.github.ZhanGSKen:APPBase:appbase-v15.12.2'
 	
     //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 Nov 26 16:27:33 HKT 2025
+#Tue Dec 16 20:17:03 HKT 2025
 stageCount=9
 libraryProject=
-baseVersion=15.11
-publishVersion=15.11.8
+baseVersion=15.14
+publishVersion=15.14.8
 buildCount=0
-baseBetaVersion=15.11.9
+baseBetaVersion=15.14.9

powerbell/src/main/AndroidManifest.xml

@@ -4,55 +4,56 @@
     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"/>
-
-    <!-- 运行前台服务 -->
+    <!-- ====================== 原有权限保留 + 补充核心权限 ====================== -->
+    <!-- 运行前台服务（原有保留，补充 Android 12+ 特殊前台服务权限） -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
-    <!-- 读取您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
-    <!-- 修改或删除您共享存储空间中的内容 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <!-- 开机启动 -->
+    <!-- 开机启动（原有保留，确保自启广播生效） -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
-    <!-- MANAGE_EXTERNAL_STORAGE -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
-
-    <!-- 显示通知 -->
+    <!-- 显示通知（原有保留，前台服务/保活必备） -->
     <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.ACCESS_PACKAGE_USAGE_STATS"
+        tools:ignore="ProtectedPermissions"/>
 
-    <!-- 计算应用存储空间 -->
+    <!-- 相机相关（原有保留，补充权限等级声明，避免安装警告） -->
+    <uses-feature 
+        android:name="android.hardware.camera" 
+        android:required="false"/> <!-- 非核心功能设为非必须，兼容无相机设备 -->
+    <uses-feature 
+        android:name="android.hardware.camera.autofocus" 
+        android:required="false"/>
+    <uses-permission android:name="android.permission.CAMERA" /> <!-- 补充相机权限，原有仅声明feature无权限 -->
+
+    <!-- 应用信息相关（原有保留） -->
     <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"/>
+    <!-- 新增：文件管理权限（对应 PermissionUtils 全文件管理逻辑） -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <!-- API30+ 全文件权限 -->
+
+    <!-- 新增：忽略电池优化权限（对应 PermissionUtils 电池优化逻辑，必须声明） -->
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+
+    <!-- 新增：API30+ 跳转系统权限页兼容（避免自启/文件权限跳转失败） -->
+    <queries>
+        <!-- 全文件管理权限跳转兼容 -->
+
+        <!-- 小米自启权限跳转兼容（精准匹配安全中心包名） -->
+        <package android:name="com.miui.securitycenter" />
+        <!-- 电池优化权限跳转兼容 -->
+
+    </queries>
 
     <application
         android:name=".App"
@@ -64,17 +65,20 @@
         android:resizeableActivity="true"
         android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning">
+        android:supportsRtl="true"
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
 
+        <!-- ====================== 页面配置（原有保留，优化 exported 安全） ====================== -->
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
             android:exported="true"
             android:launchMode="singleTask">
-
         </activity>
 
-        <activity android:name=".activities.CrashActivity"/>
+        <activity 
+            android:name=".activities.CrashActivity"
+            android:exported="false"/> <!-- 新增：非外部调用，设为 false，提升安全 -->
 
         <activity-alias
             android:name=".MainActivityEN1"
@@ -83,19 +87,13 @@
             android:label="@string/app_name"
             android:icon="@drawable/ic_launcher"
             android:enabled="true">
-
             <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/shortcutsmainen1"/>
-
         </activity-alias>
 
         <activity-alias
@@ -105,19 +103,13 @@
             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
@@ -127,109 +119,121 @@
             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"
+            android:name=".activities.ClearRecordActivity"
             android:parentActivityName="cc.winboll.studio.powerbell.MainActivity"
-            android:launchMode="singleTask">
-
-        </activity>
+            android:launchMode="singleTask"
+            android:exported="false"/> <!-- 新增：非外部调用，设为 false -->
 
         <activity
-            android:name="cc.winboll.studio.powerbell.activities.BackgroundPictureActivity"
+            android:name=".activities.BackgroundSettingsActivity"
             android:parentActivityName="cc.winboll.studio.powerbell.MainActivity"
             android:exported="true"
             android:launchMode="singleTask">
-
             <intent-filter>
-
                 <action android:name="android.intent.action.SEND"/>
-
                 <category android:name="android.intent.category.DEFAULT"/>
-
                 <data android:mimeType="image/jpeg"/>
-
                 <data android:mimeType="image/jpg"/>
-
                 <data android:mimeType="image/png"/>
-
                 <data android:mimeType="image/webp"/>
-
                 <data android:mimeType="image/*"/>
-
             </intent-filter>
-
         </activity>
 
+        <!-- ====================== 广播接收器（优化自启广播，提升保活成功率） ====================== -->
         <receiver
             android:name=".receivers.MainReceiver"
             android:enabled="true"
-            android:exported="false"
+            android:exported="true"
             android:directBootAware="true">
-
-            <intent-filter>
-
+            <intent-filter android:priority="1000"> <!-- 新增：广播优先级最高，确保优先接收开机广播 -->
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
-
+                <!-- 补充：充电/解锁广播，增强后台唤醒机会 -->
+                <action android:name="android.intent.action.POWER_CONNECTED"/>
+                <action android:name="android.intent.action.USER_PRESENT"/>
             </intent-filter>
-
         </receiver>
 
+        <!-- ====================== 服务配置（核心优化：前台服务保活，适配 API29-30） ====================== -->
+        <!-- 核心前台服务：ControlCenterService（保活核心，重点优化） -->
         <service
-            android:name="cc.winboll.studio.powerbell.services.ControlCenterService"
+            android:name=".services.ControlCenterService"
             android:priority="1000"
             android:enabled="true"
             android:exported="false"
-            android:process=".controlcenterservice"/>
+            android:process=".controlcenterservice"
+            android:foregroundServiceType="dataSync">
+            <!-- 新增：Android 12+ 前台服务用途声明（系统强制，否则拦截服务启动） -->
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FOREGROUND_SERVICE"
+                android:value="后台核心功能运行、持续保活" /> <!-- 按实际用途填写，不可空 -->
+        </service>
 
+        <!-- 辅助服务：AssistantService（按需优化，增强稳定性） -->
         <service
-            android:name="cc.winboll.studio.powerbell.services.AssistantService"
+            android:name=".services.AssistantService"
             android:enabled="true"
             android:exported="false"
-            android:process=".assistantservice"/>
+            android:process=".assistantservice"> <!-- 若需前台启动，添加此配置；纯后台可移除 -->
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FOREGROUND_SERVICE"
+                android:value="辅助核心功能运行" />
+        </service>
 
+        <!-- ====================== 其他配置（原有保留，补充优化） ====================== -->
         <meta-data
             android:name="android.max_aspect"
             android:value="4.0"/>
 
-        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReporterActivity"/>
-
-        <activity android:name="cc.winboll.studio.powerbell.activities.AboutActivity"/>
-
-        <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"/>
+        <!-- 所有非外部调用的 Activity，统一设 exported=false，提升安全 -->
+        <activity 
+            android:name=".activities.BatteryReporterActivity"
+            android:exported="false"/>
+        <activity 
+            android:name=".activities.PixelPickerActivity"
+            android:exported="false"/>
+        <activity 
+            android:name=".activities.BatteryReportActivity"
+            android:exported="false"/>
+        <activity 
+            android:name=".unittest.MainUnitTestActivity"
+            android:exported="false"/>
+        <activity 
+            android:name=".activities.ShortcutActionActivity"
+            android:exported="false"/>
+        <activity 
+            android:name=".activities.SettingsActivity"
+            android:exported="false"/>
 
+        <!-- 文件提供者（原有保留，正常使用） -->
         <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"/>
+        <!-- UCrop 第三方页面（原有保留，exported=true 正常） -->
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:exported="true">
+        </activity>
 
     </application>
 
-</manifest>
+</manifest>
+

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

@@ -2,28 +2,36 @@ package cc.winboll.studio.powerbell;
 
 import android.content.Context;
 import android.os.Environment;
-import android.view.Gravity;
+import android.os.Handler;
+import android.os.Looper;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
 import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
+import cc.winboll.studio.powerbell.utils.BitmapCacheUtils;
 import java.io.File;
 
 public class App extends 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";
 
-    public static final String TAG = "GlobalApplication";
-	
-	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;
+    // 新增：全局 Bitmap 缓存工具（常驻内存）
+    public static BitmapCacheUtils _mBitmapCacheUtils; 
+
     GlobalApplicationReceiver mReceiver;
     static String szTempDir = "";
 
@@ -34,40 +42,72 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		setIsDebugging(BuildConfig.DEBUG);
+        setIsDebugging(BuildConfig.DEBUG);
 
-        // 临时文件夹方案1
-        // 获取Pictures文件夹路径（Android 10及以上推荐使用MediaStore，此处为传统方式）
+        // 初始化活动窗口管理
+        WinBoLLActivityManager.init(this);
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+
+        // 临时文件夹初始化（保持原有逻辑）
         File picturesDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
-        // 定义目标文件路径（在Pictures目录下创建"PowerBell"子文件夹及文件）
         File powerBellDir = new File(picturesDir, "PowerBell");
-        
-        // 临时文件夹方案2 <图片保存失败>
-        // 获取Pictures文件夹路径（Android 10及以上推荐使用MediaStore，此处为传统方式）
-        //File powerBellDir = getExternalFilesDir("TempDir");
-
-        // 先创建文件夹（如果不存在）
         if (!powerBellDir.exists()) {
             powerBellDir.mkdirs();
         }
         szTempDir = powerBellDir.getAbsolutePath();
 
-
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.toast_custom_view);
-        //ToastUtils.setStyle(new WhiteToastStyle());
-        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
-
         // 设置数据配置存储工具
         _mAppConfigUtils = getAppConfigUtils(this);
         _mAppCacheUtils = getAppCacheUtils(this);
+        // 初始化全局 Bitmap 缓存工具（关键：App 启动时初始化，常驻内存）
+        _mBitmapCacheUtils = BitmapCacheUtils.getInstance();
 
         mReceiver = new GlobalApplicationReceiver(this);
         mReceiver.registerAction();
+
+        // ======================== 新增：异步预加载背景图 ========================
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					new Thread(new Runnable() {
+							@Override
+							public void run() {
+								try {
+									// 1. 获取背景源工具类实例
+									BackgroundSourceUtils bgSourceUtils = BackgroundSourceUtils.getInstance(App.this);
+									if (bgSourceUtils == null) {
+										LogUtils.e(TAG, "preloadBitmap: BackgroundSourceUtils 实例为空");
+										return;
+									}
+									// 2. 获取当前背景Bean
+									BackgroundBean bgBean = bgSourceUtils.getCurrentBackgroundBean();
+									if (bgBean == null || !bgBean.isUseBackgroundFile()) {
+										LogUtils.d(TAG, "preloadBitmap: 无有效背景文件，跳过预加载");
+										return;
+									}
+									// 3. 获取背景图路径（优先取压缩图路径）
+									String bgPath = bgBean.isUseBackgroundScaledCompressFile()
+										? bgBean.getBackgroundScaledCompressFilePath()
+										: bgBean.getBackgroundFilePath();
+									// 4. 预加载到全局缓存
+									if (_mBitmapCacheUtils != null) {
+										_mBitmapCacheUtils.cacheBitmap(bgPath);
+										LogUtils.d(TAG, "preloadBitmap: 应用启动时预加载成功 - " + bgPath);
+									} else {
+										LogUtils.e(TAG, "preloadBitmap: 全局 BitmapCacheUtils 未初始化");
+									}
+								} catch (Exception e) {
+									LogUtils.e(TAG, "preloadBitmap: 预加载失败 - " + e.getMessage());
+								}
+							}
+						}).start();
+				}
+			}, 1000); // 延迟1秒执行，避免阻塞应用初始化
+        // ======================== 预加载逻辑结束 ========================
     }
 
+    // 保持原有方法不变
     public static AppConfigUtils getAppConfigUtils(Context context) {
         if (_mAppConfigUtils == null) {
             _mAppConfigUtils = AppConfigUtils.getInstance(context);
@@ -86,12 +126,14 @@ public class App extends GlobalApplication {
         _mAppCacheUtils.clearBatteryHistory();
     }
 
-	@Override
-	public void onTerminate() {
-		super.onTerminate();
-		ToastUtils.release();
-	}
-	
-	
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        ToastUtils.release();
+        // 可选：App 终止时清空 Bitmap 缓存，释放内存
+        if (_mBitmapCacheUtils != null) {
+            _mBitmapCacheUtils.clearAllCache();
+        }
+    }
 }
 

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

@@ -1,65 +0,0 @@
-package cc.winboll.studio.powerbell.activities;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2025/03/25 01:16:32
- * @Describe 应用介绍窗口
- */
-import android.app.Activity;
-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.views.AboutView;
-import cc.winboll.studio.powerbell.R;
-
-public class AboutActivity extends Activity {
-
-    Context mContext;
-
-    public static final String TAG = "AboutActivity";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        mContext = this;
-
-        // 初始化工具栏
-        AToolbar mAToolbar = (AToolbar) findViewById(R.id.toolbar);
-        setActionBar(mAToolbar);
-        mAToolbar.setSubtitle(getString(R.string.text_about));
-        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        AboutView aboutView = CreateAboutView();
-        // 在 Activity 的 onCreate 或其他生命周期方法中调用
-        LinearLayout llRoot = findViewById(R.id.root_ll);
-        //layout.setOrientation(LinearLayout.VERTICAL);
-        // 创建布局参数（宽度和高度）
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        );
-        llRoot.addView(aboutView, params);
-
-    }
-
-    public AboutView CreateAboutView() {
-        String szBranchName = "powerbell";
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName(getString(R.string.app_name));
-        appInfo.setAppIcon(R.drawable.ic_launcher);
-        appInfo.setAppDescription(getString(R.string.app_description));
-        appInfo.setAppGitName("APPBase");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        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/BackgroundPictureActivity.java

@@ -1,659 +0,0 @@
-package cc.winboll.studio.powerbell.activities;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-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.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.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.dialogs.BackgroundPicturePreviewDialog;
-import cc.winboll.studio.powerbell.dialogs.NetworkBackgroundDialog;
-import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
-import cc.winboll.studio.powerbell.utils.FileUtils;
-import cc.winboll.studio.powerbell.utils.UriUtil;
-import cc.winboll.studio.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;
-
-public class BackgroundPictureActivity extends WinBoLLActivity implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
-
-    public static final String TAG = "BackgroundPictureActivity";
-    public BackgroundPictureUtils mBackgroundPictureUtils;
-
-    // 图片选择请求码
-    public static final int REQUEST_SELECT_PICTURE = 0;
-    public static final int REQUEST_TAKE_PHOTO = 1;
-    public static final int REQUEST_CROP_IMAGE = 2;
-    private static final int STORAGE_PERMISSION_REQUEST = 100;
-
-    private AToolbar mAToolbar;
-    private File mfBackgroundDir;       // 背景图片存储文件夹
-    private File mfPictureDir;          // 拍照与剪裁临时文件夹
-    private File mfTakePhoto;           // 拍照文件
-    private File mfRecivedPicture;      // 接收的图片文件
-    private File mfTempCropPicture;     // 剪裁临时文件
-    private File mfRecivedCropPicture;  // 剪裁后的目标文件
-
-	private String preViewFileBackgroundView = "";
-	BackgroundView bvPreviewBackground;
-	boolean isCommitSettings = false;
-
-    // 静态变量
-    public static String _mszRecivedCropPicture = "RecivedCrop.jpg";
-    private static String _mszCommonFileType = "jpeg";
-    private int mnPictureCompress = 100;
-    private static String _RecivedPictureFileName;
-
-	@Override
-	public Activity getActivity() {
-		return this;
-	}
-
-	@Override
-	public String getTag() {
-		return TAG;
-	}
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_backgroundpicture);
-        initEnv();
-
-        // 初始化工具类和文件夹
-        mBackgroundPictureUtils = BackgroundPictureUtils.getInstance(this);
-        mfBackgroundDir = new File(mBackgroundPictureUtils.getBackgroundDir());
-        if (!mfBackgroundDir.exists()) {
-            mfBackgroundDir.mkdirs();
-        }
-
-        mfPictureDir = new File(App.getTempDirPath());
-        if (!mfPictureDir.exists()) {
-            mfPictureDir.mkdirs();
-        }
-
-        // 初始化文件对象
-        mfTakePhoto = new File(mfPictureDir, "TakePhoto.jpg");
-        mfTempCropPicture = new File(mfPictureDir, "TempCrop.jpg");
-
-        mfRecivedPicture = getRecivedPictureFile(this);
-        mfRecivedCropPicture = new File(mfBackgroundDir, _mszRecivedCropPicture);
-
-        // 初始化工具栏
-        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
-        setActionBar(mAToolbar);
-        mAToolbar.setSubtitle(R.string.subtitle_activity_backgroundpicture);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish(); // 点击导航栏返回按钮，触发 finish()
-                }
-            });
-
-        // 设置按钮点击事件
-        findViewById(R.id.activitybackgroundpictureAButton5).setOnClickListener(onOriginNullClickListener);
-        findViewById(R.id.activitybackgroundpictureAButton4).setOnClickListener(onReceivedPictureClickListener);
-        findViewById(R.id.activitybackgroundpictureAButton1).setOnClickListener(onTakePhotoClickListener);
-        findViewById(R.id.activitybackgroundpictureAButton2).setOnClickListener(onSelectPictureClickListener);
-        findViewById(R.id.activitybackgroundpictureAButton3).setOnClickListener(onCropPictureClickListener);
-        findViewById(R.id.activitybackgroundpictureAButton6).setOnClickListener(onCropFreePictureClickListener);
-		findViewById(R.id.activitybackgroundpictureAButton7).setOnClickListener(onPixelPickerClickListener);
-		findViewById(R.id.activitybackgroundpictureAButton8).setOnClickListener(onCleanPixelClickListener);
-
-        updatePreviewBackground();
-
-        // 处理分享的图片
-        Intent intent = getIntent();
-        String action = intent.getAction();
-        String type = intent.getType();
-
-        if (Intent.ACTION_SEND.equals(action) && type != null && isImageType(type)) {
-            BackgroundPicturePreviewDialog dlg = new BackgroundPicturePreviewDialog(this);
-            dlg.show();
-        }
-    }
-
-    private void initEnv() {
-        LogUtils.d(TAG, "initEnv()");
-        _RecivedPictureFileName = "Recived.data";
-    }
-
-    public static String getBackgroundFileName() {
-        return _mszRecivedCropPicture;
-    }
-
-    @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("图片复制失败，请重试");
-        }
-    }
-
-    /**
-     * 更新背景图片预览
-     */
-    public void updatePreviewBackground() {
-        LogUtils.d(TAG, "updatePreviewBackground");
-        //ImageView ivPreviewBackground = (ImageView) findViewById(R.id.activitybackgroundpictureImageView1);
-        bvPreviewBackground = (BackgroundView) findViewById(R.id.activitybackgroundpictureBackgroundView1);
-        BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(this);
-        utils.loadBackgroundPictureBean();
-
-        boolean isUseBackgroundFile = utils.getBackgroundPictureBean().isUseBackgroundFile();
-        if (isUseBackgroundFile && mfRecivedCropPicture.exists()) {
-            //try {
-			String filePath = utils.getBackgroundDir() + getBackgroundFileName();
-			preViewFileBackgroundView = filePath;
-			bvPreviewBackground.previewBackgroundImage(preViewFileBackgroundView);
-			/*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("未使用背景图片");
-			preViewFileBackgroundView = "";
-			bvPreviewBackground.previewBackgroundImage(preViewFileBackgroundView);
-//            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();
-            bean.setIsUseBackgroundFile(false);
-            utils.saveData();
-            updatePreviewBackground();
-        }
-    };
-
-    private View.OnClickListener onSelectPictureClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (checkAndRequestStoragePermission()) {
-                Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-                startActivityForResult(intent, REQUEST_SELECT_PICTURE);
-            }
-        }
-    };
-
-    private View.OnClickListener onCropPictureClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            File fCheck = new File(mfBackgroundDir, getBackgroundFileName());
-            if (fCheck.exists()) {
-                startCropImageActivity(false);
-            } else {
-                ToastUtils.show("没有可剪裁的图片");
-            }
-        }
-    };
-
-    private View.OnClickListener onCropFreePictureClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            File fCheck = new File(mfBackgroundDir, getBackgroundFileName());
-            if (fCheck.exists()) {
-                startCropImageActivity(true);
-            } else {
-                ToastUtils.show("没有可剪裁的图片");
-            }
-        }
-    };
-
-    private View.OnClickListener onTakePhotoClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            LogUtils.d(TAG, "onTakePhotoClickListener");
-            LogUtils.d(TAG, "mfTakePhoto : " + mfTakePhoto.getPath());
-
-            if (mfTakePhoto.exists()) {
-                mfTakePhoto.delete();
-            }
-            try {
-                mfTakePhoto.createNewFile();
-            } catch (IOException e) {
-                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                ToastUtils.show("拍照文件创建失败");
-                return;
-            }
-
-            if (checkAndRequestStoragePermission()) {
-                Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                startActivityForResult(takePictureIntent, REQUEST_TAKE_PHOTO);
-            }
-        }
-    };
-
-    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();
-        }
-    };
-
-	private View.OnClickListener onPixelPickerClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-			// 从文件路径启动像素拾取活动
-			//String imagePath = "/storage/emulated/0/DCIM/Camera/sample.jpg";
-			String imagePath = mfRecivedCropPicture.toString();
-			Intent intent = new Intent(getApplicationContext(), PixelPickerActivity.class);
-			intent.putExtra("imagePath", imagePath);
-			startActivity(intent);
-            //App.getWinBoLLActivityManager().startWinBoLLActivity(getActivity(), intent, PixelPickerActivity.class);
-        }
-    };
-
-	private View.OnClickListener onCleanPixelClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-			BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
-			BackgroundPictureBean bean = utils.getBackgroundPictureBean();
-			bean.setPixelColor(0);
-			utils.saveData();
-			setBackgroundColor();
-        }
-    };
-
-    /**
-     * 压缩图片并保存到接收文件
-     */
-    void compressQualityToRecivedPicture(Bitmap bitmap) {
-        OutputStream outStream = null;
-        try {
-            mfRecivedPicture = getRecivedPictureFile(this);
-            if (!mfRecivedPicture.exists()) {
-                mfRecivedPicture.createNewFile();
-            }
-
-            FileOutputStream fos = new FileOutputStream(mfRecivedPicture);
-            outStream = new BufferedOutputStream(fos);
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outStream);
-            outStream.flush();
-        } catch (IOException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            ToastUtils.show("图片压缩失败");
-        } finally {
-            if (outStream != null) {
-                try {
-                    outStream.close();
-                } catch (IOException e) {
-                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                }
-            }
-            if (bitmap != null && !bitmap.isRecycled()) {
-                bitmap.recycle();
-            }
-        }
-    }
-
-    /**
-     * 启动图片裁剪活动
-     * @param isCropFree 是否自由裁剪
-     */
-    public void startCropImageActivity(boolean isCropFree) {
-        LogUtils.d(TAG, "startCropImageActivity");
-        BackgroundPictureBean bean = mBackgroundPictureUtils.loadBackgroundPictureBean();
-        mfRecivedPicture = getRecivedPictureFile(this);
-        Uri uri = UriUtil.getUriForFile(this, mfRecivedPicture);
-        LogUtils.d(TAG, "uri : " + uri.toString());
-
-        if (mfTempCropPicture.exists()) {
-            mfTempCropPicture.delete();
-        }
-        try {
-            mfTempCropPicture.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());
-
-        Intent intent = new Intent("com.android.camera.action.CROP");
-        intent.setDataAndType(uri, "image/" + _mszCommonFileType);
-        intent.putExtra("crop", "true");
-        intent.putExtra("noFaceDetection", true);
-
-        if (!isCropFree) {
-            intent.putExtra("aspectX", bean.getBackgroundWidth());
-            intent.putExtra("aspectY", bean.getBackgroundHeight());
-        }
-
-        intent.putExtra("return-data", true);
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, cropOutPutUri);
-        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);
-    }
-
-    /**
-     * 保存剪裁后的Bitmap（优化版）
-     */
-    private void saveCropBitmap(Bitmap bitmap) {
-        if (bitmap == null) {
-            ToastUtils.show("剪裁图片为空");
-            return;
-        }
-
-        // 内存优化：大图片自动缩放
-        Bitmap scaledBitmap = bitmap;
-        if (bitmap.getByteCount() > 10 * 1024 * 1024) { // 超过10MB
-            float scale = 1.0f;
-            while (scaledBitmap.getByteCount() > 5 * 1024 * 1024) {
-                scale -= 0.2f; // 每次缩小20%
-                if (scale < 0.2f) break; // 最小缩放到20%
-                scaledBitmap = scaleBitmap(scaledBitmap, scale);
-            }
-            if (scaledBitmap != bitmap) {
-                bitmap.recycle(); // 回收原Bitmap
-            }
-        }
-
-        // 优化：创建保存目录
-        File backgroundDir = new File(mBackgroundPictureUtils.getBackgroundDir());
-        if (!backgroundDir.exists()) {
-            if (!backgroundDir.mkdirs()) {
-                ToastUtils.show("无法创建保存目录");
-                if (scaledBitmap != bitmap) scaledBitmap.recycle();
-                return;
-            }
-        }
-
-        File saveFile = new File(backgroundDir, getBackgroundFileName());
-
-        // 优化：检查文件是否可写
-        if (saveFile.exists() && !saveFile.canWrite()) {
-            if (!saveFile.delete()) {
-                ToastUtils.show("无法删除旧文件");
-                if (scaledBitmap != bitmap) scaledBitmap.recycle();
-                return;
-            }
-        }
-
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(saveFile);
-            boolean success = scaledBitmap.compress(Bitmap.CompressFormat.JPEG, 80, fos);
-            fos.flush();
-            if (success) {
-                ToastUtils.show("保存成功");
-                // 更新数据
-                mBackgroundPictureUtils.getBackgroundPictureBean().setIsUseBackgroundFile(true);
-                updatePreviewBackground();
-            } else {
-                ToastUtils.show("图片压缩保存失败");
-            }
-        } catch (FileNotFoundException e) {
-            LogUtils.e(TAG, "文件未找到" + e);
-            ToastUtils.show("保存失败：文件路径错误");
-        } catch (IOException e) {
-            LogUtils.e(TAG, "写入异常" + e);
-            ToastUtils.show("保存失败：磁盘可能已满或路径错误");
-        } finally {
-            if (fos != null) {
-                try {
-                    fos.close();
-                } catch (IOException e) {
-                    LogUtils.e(TAG, "流关闭异常" + e);
-				}
-			}
-			if (scaledBitmap != null && !scaledBitmap.isRecycled()) {
-				scaledBitmap.recycle();
-			}
-		}
-	}
-
-    /**
-     * 缩放Bitmap
-     */
-    private Bitmap scaleBitmap(Bitmap original, float scale) {
-        if (original == null) {
-            return null;
-        }
-        int width = (int) (original.getWidth() * scale);
-        int height = (int) (original.getHeight() * scale);
-        return Bitmap.createScaledBitmap(original, width, height, true);
-    }
-
-    /**
-     * 分享图片
-     */
-    void sharePicture() {
-        Uri uri = UriUtil.getUriForFile(this, mfRecivedPicture);
-        Intent shareIntent = new Intent(Intent.ACTION_SEND);
-        shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
-        shareIntent.setType("image/" + _mszCommonFileType);
-        shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        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);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == REQUEST_SELECT_PICTURE && resultCode == RESULT_OK) {
-            try {
-                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("图片复制失败，请重试");
-                }
-            } catch (Exception e) {
-                LogUtils.e(TAG, "选择图片异常" + e);
-                ToastUtils.show("选择图片失败：" + e.getMessage());
-            }
-        } else if (requestCode == REQUEST_TAKE_PHOTO && resultCode == RESULT_OK) {
-            LogUtils.d(TAG, "REQUEST_TAKE_PHOTO");
-            Bundle extras = data.getExtras();
-            if (extras != null) {
-                Bitmap imageBitmap = (Bitmap) extras.get("data");
-                if (imageBitmap != null) {
-                    compressQualityToRecivedPicture(imageBitmap);
-                    startCropImageActivity(false);
-                } else {
-                    ToastUtils.show("拍照图片为空");
-                }
-            } else {
-                ToastUtils.show("拍照数据获取失败");
-            }
-        } else if (requestCode == REQUEST_CROP_IMAGE && resultCode == RESULT_OK) {
-            LogUtils.d(TAG, "CROP_IMAGE_REQUEST_CODE");
-            try {
-                Bitmap cropBitmap = null;
-                // 方案1：通过Intent获取剪裁后的Bitmap
-                if (data != null && data.hasExtra("data")) {
-                    cropBitmap = data.getParcelableExtra("data");
-                } else if (mfTempCropPicture.exists()) {
-                    cropBitmap = BitmapFactory.decodeFile(mfTempCropPicture.getPath());
-                } else {
-                    ToastUtils.show("剪裁文件不存在");
-                    return;
-                }
-
-                if (cropBitmap != null) {
-                    saveCropBitmap(cropBitmap);
-                } else {
-                    ToastUtils.show("获取剪裁图片失败");
-                }
-            } catch (OutOfMemoryError e) {
-                LogUtils.e(TAG, "内存溢出" + e);
-                ToastUtils.show("保存失败：内存不足，请尝试裁剪更小的图片");
-            } catch (Exception e) {
-                LogUtils.e(TAG, "剪裁保存异常" + e);
-                ToastUtils.show("保存失败：" + e.getMessage());
-            }/* finally {
-			 // 安全删除临时文件
-			 if (mfTempCropPicture.exists()) {
-			 mfTempCropPicture.delete();
-			 }
-			 }*/
-        } else if (resultCode != RESULT_OK) {
-            LogUtils.d(TAG, "操作取消或失败，requestCode: " + requestCode);
-            ToastUtils.show("操作已取消");
-        }
-    }
-
-    /**
-     * 检查类型是否为图片
-     */
-    private boolean isImageType(String type) {
-        return type.startsWith("image/") || "image/jpeg".equals(type) || 
-            "image/jpg".equals(type) || "image/png".equals(type) || 
-            "image/webp".equals(type);
-    }
-
-    /**
-     * 检查并申请存储权限
-     */
-    private boolean checkAndRequestStoragePermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this, 
-                                                  new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 
-                                                  STORAGE_PERMISSION_REQUEST);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == STORAGE_PERMISSION_REQUEST) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                ToastUtils.show("存储权限已获取");
-            } else {
-                ToastUtils.show("需要存储权限才能保存图片");
-            }
-        }
-    }
-
-	void setBackgroundColor() {
-		BackgroundPictureUtils utils = BackgroundPictureUtils.getInstance(BackgroundPictureActivity.this);
-		BackgroundPictureBean bean = utils.getBackgroundPictureBean();
-		int nPixelColor = bean.getPixelColor();
-		RelativeLayout mainLayout = findViewById(R.id.activitybackgroundpictureRelativeLayout1);
-		mainLayout.setBackgroundColor(nPixelColor);
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		setBackgroundColor();
-	}
-
-	public void onNetworkBackgroundDialog(View view) {
-		// 在需要显示对话框的地方（如网络状态监听回调中）
-		NetworkBackgroundDialog dialog = new NetworkBackgroundDialog(this, new NetworkBackgroundDialog.OnDialogClickListener() {
-				@Override
-				public void onConfirm() {
-					ToastUtils.show("onConfirm");
-					// 处理确认逻辑（如允许后台网络使用）
-					LogUtils.d("MainActivity", "用户允许后台网络使用");
-					// 执行具体业务：如开启后台网络请求服务
-				}
-
-				@Override
-				public void onCancel() {
-					ToastUtils.show("onCancel");
-					// 处理取消逻辑（如禁止后台网络使用）
-					LogUtils.d("MainActivity", "用户禁止后台网络使用");
-					// 执行具体业务：如关闭后台网络请求
-				}
-			});
-
-		// 可选：修改对话框标题和内容（适配自定义场景）
-		dialog.setTitle("网络图片下载对话框");
-		dialog.setContent("是否下载地址中的图片资源，作为应用背景图片？");
-
-		// 显示对话框
-		dialog.show();
-
-	}
-
-    /**
-     * 重写finish方法，确保所有退出场景都触发Toast
-     */
-    @Override
-    public void finish() {
-        if (!isCommitSettings) {
-			YesNoAlertDialog.show(this, "应用背景更改提示：", "是否应用预览图片？", new YesNoAlertDialog.OnDialogResultListener(){
-
-					@Override
-					public void onNo() {
-						isCommitSettings = true;
-						finish();
-					}
-
-					@Override
-					public void onYes() {
-						bvPreviewBackground.saveToBackgroundSources(preViewFileBackgroundView);
-						isCommitSettings = true;
-						finish();
-					}
-				});
-		} else {
-			super.finish();
-		}
-    }
-}
-

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

@@ -0,0 +1,896 @@
+package cc.winboll.studio.powerbell.activities;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.view.View;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.FileProvider;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog;
+import cc.winboll.studio.powerbell.dialogs.ColorPaletteDialog;
+import cc.winboll.studio.powerbell.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
+import cc.winboll.studio.powerbell.utils.BitmapCacheUtils;
+import cc.winboll.studio.powerbell.utils.FileUtils;
+import cc.winboll.studio.powerbell.utils.ImageCropUtils;
+import cc.winboll.studio.powerbell.utils.UriUtils;
+import cc.winboll.studio.powerbell.views.BackgroundView;
+import com.a4455jkjh.colorpicker.ColorPickerDialog;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class BackgroundSettingsActivity extends WinBoLLActivity {
+
+    // ====================== 常量定义 ======================
+    public static final String TAG = "BackgroundSettingsActivity";
+    private static final int SDK_VERSION_TIRAMISU = 33;
+
+    public static final int REQUEST_SELECT_PICTURE = 0;
+    public static final int REQUEST_TAKE_PHOTO = 1;
+    public static final int REQUEST_CROP_IMAGE = 2;
+	private static final int REQUEST_PIXELPICKER = 1001;
+
+    // ====================== 成员变量 ======================
+    private BackgroundSourceUtils mBgSourceUtils;
+    private BitmapCacheUtils mBitmapCache;
+
+    private Toolbar mToolbar;
+    private BackgroundView mBackgroundView;
+    private File mfTakePhoto;
+    volatile boolean isCommitSettings = false;
+    volatile boolean isPreviewBackgroundChanged = false;
+
+    // ====================== 生命周期方法 ======================
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_background_settings);
+        LogUtils.d(TAG, "【生命周期】onCreate 开始初始化");
+
+        // 初始化视图与工具类
+        mBackgroundView = findViewById(R.id.background_view);
+        mBgSourceUtils = BackgroundSourceUtils.getInstance(this);
+        mBgSourceUtils.loadSettings();
+        mBitmapCache = BitmapCacheUtils.getInstance();
+
+        // 初始化临时文件与目录
+        File tempDir = new File(App.getTempDirPath());
+        if (!tempDir.exists()) {
+            tempDir.mkdirs();
+        }
+        mfTakePhoto = new File(tempDir, "TakePhoto.jpg");
+
+//        File selectTempDir = new File(mBgSourceUtils.getBackgroundSourceDirPath(), "SelectTemp");
+//        if (!selectTempDir.exists()) {
+//            selectTempDir.mkdirs();
+//            LogUtils.d(TAG, "【目录初始化】选图临时目录创建完成：" + selectTempDir.getAbsolutePath());
+//        }
+
+        // 初始化界面与事件
+        initToolbar();
+        initClickListeners();
+
+        // 处理分享意图或初始化预览
+        if (handleShareIntent()) {
+            ToastUtils.show("handleShareIntent");
+        } else {
+            mBgSourceUtils.setCurrentSourceToPreview();
+        }
+
+        mBgSourceUtils.createAndUpdatePreviewEnvironmentForCropping(mBgSourceUtils.getPreviewBackgroundBean());
+        doubleRefreshPreview();
+        LogUtils.d(TAG, "【生命周期】onCreate 初始化完成");
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        doubleRefreshPreview();
+        LogUtils.d(TAG, "【生命周期】onPostCreate 执行双重刷新");
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        LogUtils.d(TAG, "【回调触发】requestCode：" + requestCode + "，resultCode：" + resultCode);
+
+        try {
+            if (resultCode != RESULT_OK) {
+                handleOperationCancelOrFail();
+                return;
+            }
+
+            switch (requestCode) {
+                case REQUEST_SELECT_PICTURE:
+                    handleSelectPictureResult(resultCode, data);
+                    break;
+                case REQUEST_TAKE_PHOTO:
+                    handleTakePhotoResult(resultCode, data);
+                    break;
+                case REQUEST_CROP_IMAGE:
+                    handleCropImageResult(requestCode, resultCode, data);
+                    break;
+				case REQUEST_PIXELPICKER:
+                    handlePixelPickerResult(requestCode, resultCode, data);
+                    break;
+                default:
+                    LogUtils.d(TAG, "【回调忽略】未知requestCode");
+                    break;
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【回调异常】" + e.getMessage());
+            ToastUtils.show("操作失败");
+        }
+    }
+
+    @Override
+    public void finish() {
+        LogUtils.d(TAG, "【生命周期】finish 触发，isCommitSettings：" + isCommitSettings + "，isPreviewBackgroundChanged：" + isPreviewBackgroundChanged);
+        if (isCommitSettings) {
+            super.finish();
+        } else {
+            if (isPreviewBackgroundChanged) {
+                YesNoAlertDialog.show(this, "背景更换问题", "是否确定背景图片设置？", new YesNoAlertDialog.OnDialogResultListener() {
+						@Override
+						public void onYes() {
+							//ToastUtils.show("onYes");
+							mBgSourceUtils.commitPreviewSourceToCurrent();
+							isCommitSettings = true;
+							finish();
+						}
+
+						@Override
+						public void onNo() {
+							isCommitSettings = true;
+							finish();
+						}
+					});
+            } else {
+                isCommitSettings = true;
+                finish();
+            }
+        }
+    }
+
+    // ====================== 界面初始化方法 ======================
+    private void initToolbar() {
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+        mToolbar.setSubtitle(getTag());
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "【导航栏】点击返回");
+					finish();
+				}
+			});
+    }
+
+    private void initClickListeners() {
+        LogUtils.d(TAG, "【界面初始化】绑定按钮点击事件");
+        findViewById(R.id.activitybackgroundpictureAButton5).setOnClickListener(onOriginNullClickListener);
+        findViewById(R.id.activitybackgroundpictureAButton4).setOnClickListener(onReceivedPictureClickListener);
+        findViewById(R.id.activitybackgroundpictureAButton1).setOnClickListener(onTakePhotoClickListener);
+        findViewById(R.id.activitybackgroundpictureAButton2).setOnClickListener(onSelectPictureClickListener);
+        findViewById(R.id.activitybackgroundpictureAButton3).setOnClickListener(onCropPictureClickListener);
+        findViewById(R.id.activitybackgroundpictureAButton6).setOnClickListener(onCropFreePictureClickListener);
+        findViewById(R.id.activitybackgroundpictureAButton7).setOnClickListener(onPixelPickerClickListener);
+        findViewById(R.id.activitybackgroundpictureAButton8).setOnClickListener(onCleanPixelClickListener);
+        findViewById(R.id.activitybackgroundsettingsAButton1).setOnClickListener(onColorPaletteClickListener);
+    }
+
+    // ====================== 按钮点击事件 ======================
+    private View.OnClickListener onOriginNullClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】取消背景图片");
+            BackgroundBean previewBackgroundBean = mBgSourceUtils.getPreviewBackgroundBean();
+            previewBackgroundBean.setIsUseBackgroundFile(false);
+            doubleRefreshPreview();
+        }
+    };
+
+    private View.OnClickListener onSelectPictureClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】选择图片");
+			launchImageSelector();
+        }
+    };
+
+    private View.OnClickListener onCropPictureClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】固定比例裁剪");
+            ImageCropUtils.startImageCrop(BackgroundSettingsActivity.this,
+										  mBgSourceUtils.getPreviewBackgroundBean(),
+										  mBackgroundView.getWidth(),
+										  mBackgroundView.getHeight(),
+										  false,
+										  REQUEST_CROP_IMAGE
+										  );
+        }
+    };
+
+    private View.OnClickListener onCropFreePictureClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】自由裁剪");
+            ImageCropUtils.startImageCrop(BackgroundSettingsActivity.this,
+										  mBgSourceUtils.getPreviewBackgroundBean(),
+										  0,
+										  0,
+										  true,
+										  REQUEST_CROP_IMAGE
+										  );
+        }
+    };
+
+    private View.OnClickListener onTakePhotoClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】拍照");
+            // 移除：旧文件删除逻辑
+            try {
+                boolean createSuccess = mfTakePhoto.createNewFile();
+                LogUtils.d(TAG, "【拍照准备】创建新文件：" + (createSuccess ? "成功" : "失败"));
+                if (!createSuccess) {
+                    ToastUtils.show("拍照文件创建失败");
+                    return;
+                }
+            } catch (IOException e) {
+                LogUtils.e(TAG, "【拍照异常】" + e.getMessage());
+                ToastUtils.show("拍照文件创建失败");
+                return;
+            }
+
+            Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+			try {
+				Uri photoUri = getFileProviderUri(mfTakePhoto);
+				takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
+				startActivityForResult(takePictureIntent, REQUEST_TAKE_PHOTO);
+				LogUtils.d(TAG, "【拍照启动】Uri：" + photoUri.toString());
+			} catch (Exception e) {
+				String errMsg = "拍照启动异常：" + e.getMessage();
+				ToastUtils.show(errMsg.substring(0, 20));
+				LogUtils.e(TAG, "【拍照失败】" + e.getMessage());
+			}
+        }
+    };
+
+    private View.OnClickListener onReceivedPictureClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            ToastUtils.show("图片接收功能暂未实现");
+            LogUtils.d(TAG, "【按钮点击】图片接收");
+        }
+    };
+
+    private View.OnClickListener onPixelPickerClickListener = new View.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】像素拾取");
+            String targetImagePath = mBgSourceUtils.getPreviewBackgroundBean().getBackgroundFilePath();
+            File targetFile = new File(targetImagePath);
+            if (targetFile == null || !targetFile.exists() || targetFile.length() <= 0) {
+                ToastUtils.show("无有效图片可拾取像素");
+                LogUtils.e(TAG, "【像素拾取失败】文件无效：" + targetImagePath);
+                return;
+            }
+            Intent intent = new Intent(getApplicationContext(), PixelPickerActivity.class);
+            intent.putExtra("imagePath", targetImagePath);
+            startActivityForResult(intent, REQUEST_PIXELPICKER);
+            LogUtils.d(TAG, "【像素拾取启动】路径：" + targetImagePath);
+        }
+    };
+
+    private View.OnClickListener onCleanPixelClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】清空像素颜色");
+            BackgroundBean bean = mBgSourceUtils.getPreviewBackgroundBean();
+            int oldColor = bean.getPixelColor();
+            bean.setPixelColor(0xFF000000);
+            mBgSourceUtils.saveSettings();
+            doubleRefreshPreview();
+			isPreviewBackgroundChanged = true;
+            ToastUtils.show("像素颜色已清空");
+            LogUtils.d(TAG, "【像素清空】旧颜色：" + oldColor);
+        }
+    };
+
+	private View.OnClickListener onColorPaletteClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            LogUtils.d(TAG, "【按钮点击】调色板按钮");
+
+			// 初始颜色（白色，含透明度）
+			//int initialColor = 0xFFFFFFFF;
+			int initialColor = mBgSourceUtils.getPreviewBackgroundBean().getPixelColor();
+			// 显示对话框
+			ColorPaletteDialog dialog = new ColorPaletteDialog(BackgroundSettingsActivity.this, initialColor, new ColorPaletteDialog.OnColorSelectedListener() {
+					@Override
+					public void onColorSelected(int color) {
+						// 回调返回 0xAARRGGBB 格式颜色，直接使用
+						mBgSourceUtils.getPreviewBackgroundBean().setPixelColor(color);
+						mBgSourceUtils.saveSettings();
+						doubleRefreshPreview();
+						isPreviewBackgroundChanged = true;
+						LogUtils.d("选择颜色", String.format("#%08X", color));
+					}
+				});
+			dialog.show();
+
+            LogUtils.d(TAG, "调色板按钮响应完成。");
+        }
+    };
+
+    // ====================== 工具方法 ======================
+    /**
+     * 生成 FileProvider Uri，适配 Android 7.0+
+     */
+    public Uri getFileProviderUri(File file) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                String FILE_PROVIDER_AUTHORITY = getPackageName() + ".fileprovider";
+                return FileProvider.getUriForFile(this, FILE_PROVIDER_AUTHORITY, file);
+            } else {
+                return Uri.fromFile(file);
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "getFileProviderUri: 生成Uri失败：" + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 校验 Bitmap 是否有效（未被回收且不为空）
+     */
+    private boolean isBitmapValid(Bitmap bitmap) {
+        return bitmap != null && !bitmap.isRecycled();
+    }
+
+    /**
+     * 双重刷新预览，确保背景加载最新数据
+     * 移除：缓存清空逻辑
+     */
+    private void doubleRefreshPreview() {
+        LogUtils.d(TAG, "【工具方法】doubleRefreshPreview 开始执行");
+        if (mBgSourceUtils == null || mBackgroundView == null || isFinishing()) {
+            LogUtils.w(TAG, "【双重刷新】跳过：对象为空或Activity已结束");
+            return;
+        }
+
+        // 第一重刷新
+        try {
+            mBgSourceUtils.loadSettings();
+            mBackgroundView.loadBackgroundBean(mBgSourceUtils.getPreviewBackgroundBean(), true);
+			mBackgroundView.setBackgroundColor(mBgSourceUtils.getPreviewBackgroundBean().getPixelColor());
+            LogUtils.d(TAG, "【双重刷新】第一重完成");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【双重刷新】第一重异常：" + e.getMessage());
+            return;
+        }
+
+        // 第二重刷新（延迟执行）
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					if (mBackgroundView != null && !isFinishing() && mBgSourceUtils != null) {
+						try {
+							mBgSourceUtils.loadSettings();
+							mBackgroundView.loadBackgroundBean(mBgSourceUtils.getPreviewBackgroundBean(), true);
+							mBackgroundView.setBackgroundColor(mBgSourceUtils.getPreviewBackgroundBean().getPixelColor());
+							LogUtils.d(TAG, "【双重刷新】第二重完成");
+						} catch (Exception e) {
+							LogUtils.e(TAG, "【双重刷新】第二重异常：" + e.getMessage());
+						}
+					}
+				}
+			}, 200);
+    }
+
+    /**
+     * 解析裁剪临时文件为 Bitmap，带采样率优化
+     */
+    private Bitmap parseCropTempFileToBitmap(File cropTempFile) {
+        LogUtils.d(TAG, "【工具方法】parseCropTempFileToBitmap 解析文件：" + (cropTempFile != null ? cropTempFile.getAbsolutePath() : "null"));
+        if (cropTempFile == null || !cropTempFile.exists() || !cropTempFile.isFile() || cropTempFile.length() <= 100) {
+            LogUtils.e(TAG, "【Bitmap解析】文件无效");
+            return null;
+        }
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(cropTempFile.getAbsolutePath(), options);
+
+        int maxSize = 2048;
+        int sampleSize = 1;
+        while (options.outWidth / sampleSize > maxSize || options.outHeight / sampleSize > maxSize) {
+            sampleSize *= 2;
+        }
+        sampleSize = Math.min(sampleSize, 16);
+        LogUtils.d(TAG, "【Bitmap解析】采样率：" + sampleSize);
+
+        options.inJustDecodeBounds = false;
+        options.inSampleSize = sampleSize;
+        options.inPreferredConfig = Bitmap.Config.RGB_565;
+        options.inPurgeable = true;
+        options.inInputShareable = true;
+
+        try {
+            Bitmap cropBitmap = BitmapFactory.decodeFile(cropTempFile.getAbsolutePath(), options);
+            if (!isBitmapValid(cropBitmap)) {
+                LogUtils.e(TAG, "【Bitmap解析】解析失败");
+                return null;
+            }
+            LogUtils.d(TAG, "【Bitmap解析】成功，尺寸：" + cropBitmap.getWidth() + "x" + cropBitmap.getHeight());
+            return cropBitmap;
+        } catch (OutOfMemoryError e) {
+            LogUtils.e(TAG, "【Bitmap解析】OOM异常");
+            return null;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【Bitmap解析】异常：" + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 调整 Bitmap 比例至目标比例
+     */
+    private Bitmap adjustBitmapToFinalRatio(Bitmap originalBitmap, float finalCropRatio) {
+        LogUtils.d(TAG, "【工具方法】adjustBitmapToFinalRatio 调整比例，目标比例：" + finalCropRatio);
+        if (!isBitmapValid(originalBitmap) || finalCropRatio <= 0) {
+            LogUtils.e(TAG, "【比例调整】参数无效");
+            return null;
+        }
+
+        int originalWidth = originalBitmap.getWidth();
+        int originalHeight = originalBitmap.getHeight();
+        float originalRatio = (float) originalWidth / originalHeight;
+
+        if (Math.abs(originalRatio - finalCropRatio) < 0.001f) {
+            LogUtils.d(TAG, "【比例调整】比例一致，生成副本");
+            return originalBitmap.copy(originalBitmap.getConfig(), false);
+        }
+
+        int targetWidth, targetHeight;
+        targetHeight = originalHeight;
+        targetWidth = Math.round(targetHeight * finalCropRatio);
+        if (targetWidth > originalWidth) {
+            targetWidth = originalWidth;
+            targetHeight = Math.round(targetWidth / finalCropRatio);
+        }
+        targetWidth = Math.round(targetHeight * finalCropRatio);
+        LogUtils.d(TAG, "【比例调整】调整前：" + originalWidth + "x" + originalHeight + "，调整后：" + targetWidth + "x" + targetHeight);
+
+        try {
+            Bitmap adjustedBitmap = Bitmap.createBitmap(
+				originalBitmap,
+				(originalWidth - targetWidth) / 2,
+				(originalHeight - targetHeight) / 2,
+				targetWidth,
+				targetHeight
+            );
+            return adjustedBitmap;
+        } catch (OutOfMemoryError e) {
+            LogUtils.e(TAG, "【比例调整】OOM异常");
+            return null;
+        }
+    }
+
+    /**
+     * 保存 Bitmap 到目标文件
+     * 移除：原文件删除逻辑
+     */
+    private void saveScaledBitmapToFile(Bitmap bitmap, File targetFile) {
+        LogUtils.d(TAG, "【工具方法】saveScaledBitmapToFile 保存图片：" + targetFile.getAbsolutePath());
+        if (!isBitmapValid(bitmap) || targetFile == null) {
+            LogUtils.e(TAG, "【图片保存】参数无效");
+            return;
+        }
+
+        OutputStream outputStream = null;
+        try {
+            outputStream = new BufferedOutputStream(new FileOutputStream(targetFile));
+            bitmap.compress(CompressFormat.JPEG, 100, outputStream);
+            outputStream.flush();
+            LogUtils.d(TAG, "【图片保存】成功，文件大小：" + targetFile.length() + " bytes");
+        } catch (IOException e) {
+            LogUtils.e(TAG, "【图片保存】异常：" + e.getMessage());
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "【图片保存】关闭流异常");
+                }
+            }
+        }
+    }
+
+    /**
+     * 从裁剪文件中读取比例
+     */
+    private float getRatioFromSystemCropFile(File systemCropFile) {
+        LogUtils.d(TAG, "【工具方法】getRatioFromSystemCropFile 读取比例：" + systemCropFile.getAbsolutePath());
+        if (systemCropFile == null || !systemCropFile.exists() || !systemCropFile.isFile()) {
+            LogUtils.e(TAG, "【比例读取】文件无效");
+            return -1;
+        }
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(systemCropFile.getAbsolutePath(), options);
+
+        int cropWidth = options.outWidth;
+        int cropHeight = options.outHeight;
+        if (cropWidth <= 0 || cropHeight <= 0) {
+            LogUtils.e(TAG, "【比例读取】尺寸无效");
+            return -1;
+        }
+
+        float systemRatio = (float) cropWidth / cropHeight;
+        LogUtils.d(TAG, "【比例读取】成功，比例：" + systemRatio);
+        return systemRatio;
+    }
+
+    // ====================== 业务逻辑方法 ======================
+    /**
+     * 处理分享意图
+     */
+    private boolean handleShareIntent() {
+        Intent intent = getIntent();
+        if (intent != null) {
+            String action = intent.getAction();
+            String type = intent.getType();
+            if (Intent.ACTION_SEND.equals(action) && type != null && isImageType(type)) {
+                BackgroundPicturePreviewDialog dlg = new BackgroundPicturePreviewDialog(this, new BackgroundPicturePreviewDialog.IOnRecivedPictureListener(){
+						@Override
+						public void onAcceptRecivedPicture(Uri uriRecivedPicture) {
+							ToastUtils.show(String.format("uriRecivedPicture %s", uriRecivedPicture));
+						}
+					});
+                dlg.show();
+                LogUtils.d(TAG, "【分享处理】收到分享图片意图");
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断是否为图片类型
+     */
+    boolean isImageType(String lowerMimeType) {
+        return lowerMimeType.equals("image/jpeg")
+			|| lowerMimeType.equals("image/png")
+			|| lowerMimeType.equals("image/tiff")
+			|| lowerMimeType.equals("image/jpg")
+			|| lowerMimeType.equals("image/svg+xml");
+    }
+
+    /**
+     * 启动图片选择器
+     */
+    private void launchImageSelector() {
+        LogUtils.d(TAG, "【业务逻辑】launchImageSelector 启动选择器");
+        Intent[] intents = new Intent[3];
+        Intent getContentIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        getContentIntent.setType("image/*");
+        getContentIntent.addCategory(Intent.CATEGORY_OPENABLE);
+        getContentIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        intents[0] = getContentIntent;
+
+        Intent pickIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        pickIntent.setType("image/*");
+        pickIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        intents[1] = pickIntent;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            Intent openDocIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+            openDocIntent.setType("image/*");
+            openDocIntent.addCategory(Intent.CATEGORY_OPENABLE);
+            openDocIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
+            intents[2] = openDocIntent;
+        }
+
+        Intent validIntent = null;
+        for (Intent intent : intents) {
+            if (intent != null && intent.resolveActivity(getPackageManager()) != null) {
+                validIntent = intent;
+                break;
+            }
+        }
+
+        if (validIntent != null) {
+            Intent chooser = Intent.createChooser(validIntent, "选择图片");
+            chooser.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
+            startActivityForResult(chooser, REQUEST_SELECT_PICTURE);
+            LogUtils.d(TAG, "【选图意图】启动图片选择");
+        } else {
+            LogUtils.d(TAG, "【选图意图】无相册应用");
+            runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+						ToastUtils.show("未找到相册应用，请安装后重试");
+						new AlertDialog.Builder(BackgroundSettingsActivity.this)
+                            .setTitle("无图片选择应用")
+                            .setMessage("需要安装相册应用才能选择图片")
+                            .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    Intent marketIntent = new Intent(Intent.ACTION_VIEW);
+                                    marketIntent.setData(Uri.parse("market://details?id=com.android.gallery3d"));
+                                    if (marketIntent.resolveActivity(getPackageManager()) != null) {
+                                        startActivity(marketIntent);
+                                    } else {
+                                        ToastUtils.show("无法打开应用商店");
+                                    }
+                                }
+                            })
+                            .setNegativeButton("取消", null)
+                            .show();
+					}
+				});
+        }
+    }
+
+    /**
+     * 处理存储权限回调
+     */
+    private void handleStoragePermissionCallback() {
+        if (Environment.isExternalStorageManager()) {
+            LogUtils.d(TAG, "【权限回调】已授予");
+            ToastUtils.show("存储权限已获取");
+        } else {
+            LogUtils.d(TAG, "【权限回调】已拒绝");
+            ToastUtils.show("存储权限不足");
+        }
+    }
+
+    /**
+     * 处理操作取消或失败
+     */
+    private void handleOperationCancelOrFail() {
+        mBgSourceUtils.setCurrentSourceToPreview();
+        LogUtils.d(TAG, "【业务逻辑】操作取消或失败，恢复预览");
+        ToastUtils.show("操作取消或失败");
+        doubleRefreshPreview();
+    }
+
+    /**
+     * 处理拍照结果
+     */
+    private void handleTakePhotoResult(int resultCode, Intent data) {
+        LogUtils.d(TAG, "【业务逻辑】handleTakePhotoResult 处理拍照结果");
+        if (resultCode != RESULT_OK || data == null) {
+            handleOperationCancelOrFail();
+            return;
+        }
+
+        if (!mfTakePhoto.exists() || mfTakePhoto.length() <= 0) {
+            ToastUtils.show("拍照文件无效");
+            return;
+        }
+
+        Bitmap photoBitmap = getTakePhotoBitmap(data);
+        if (isBitmapValid(photoBitmap)) {
+            mBgSourceUtils.compressQualityToRecivedPicture(photoBitmap);
+        } else {
+            ToastUtils.show("拍照图片为空");
+            return;
+        }
+
+        mBgSourceUtils.saveFileToPreviewBean(mfTakePhoto, mfTakePhoto.getAbsolutePath());
+        doubleRefreshPreview();
+
+        ImageCropUtils.startImageCrop(BackgroundSettingsActivity.this,
+									  mBgSourceUtils.getPreviewBackgroundBean(),
+									  mBackgroundView.getWidth(),
+									  mBackgroundView.getHeight(),
+									  false,
+									  REQUEST_CROP_IMAGE
+									  );
+        LogUtils.d(TAG, "【拍照完成】已启动裁剪");
+    }
+
+    /**
+     * 解析拍照返回的 Bitmap
+     */
+    private Bitmap getTakePhotoBitmap(Intent data) {
+        LogUtils.d(TAG, "【业务逻辑】getTakePhotoBitmap 解析拍照Bitmap");
+        if (mfTakePhoto != null && mfTakePhoto.exists()) {
+            LogUtils.d(TAG, "【拍照Bitmap解析】从文件解析");
+            Bitmap photoBitmap = parseCropTempFileToBitmap(mfTakePhoto);
+            if (isBitmapValid(photoBitmap)) {
+                LogUtils.d(TAG, "【拍照Bitmap解析】成功");
+                return photoBitmap;
+            } else {
+                LogUtils.w(TAG, "【拍照Bitmap解析】文件解析失败，尝试Intent");
+            }
+        } else {
+            LogUtils.w(TAG, "【拍照Bitmap解析】文件无效，尝试Intent");
+        }
+
+        if (data != null) {
+            try {
+                Bitmap thumbnailBitmap = data.getParcelableExtra("data");
+                if (isBitmapValid(thumbnailBitmap)) {
+                    LogUtils.d(TAG, "【拍照Bitmap解析】从Intent获取成功");
+                    return thumbnailBitmap;
+                } else {
+                    LogUtils.e(TAG, "【拍照Bitmap解析】Intent解析失败");
+                }
+            } catch (Exception e) {
+                LogUtils.e(TAG, "【拍照Bitmap解析】Intent异常：" + e.getMessage());
+            }
+        } else {
+            LogUtils.e(TAG, "【拍照Bitmap解析】Intent为空");
+        }
+
+        LogUtils.e(TAG, "【拍照Bitmap解析】失败");
+        ToastUtils.show("拍照图片解析失败");
+        return null;
+    }
+
+    /**
+     * 处理选图结果
+     * 移除：缓存清空逻辑
+     */
+    private void handleSelectPictureResult(int resultCode, Intent data) {
+        LogUtils.d(TAG, "【业务逻辑】handleSelectPictureResult 处理选图结果");
+        if (resultCode != RESULT_OK || data == null) {
+            handleOperationCancelOrFail();
+            return;
+        }
+
+        Uri selectedImage = data.getData();
+        if (selectedImage == null) {
+            ToastUtils.show("图片Uri为空");
+            return;
+        }
+        LogUtils.d(TAG, "【选图回调】系统返回Uri : " + selectedImage.toString());
+
+        if (Build.VERSION.SDK_INT >= SDK_VERSION_TIRAMISU) {
+            getContentResolver().takePersistableUriPermission(
+				selectedImage,
+				Intent.FLAG_GRANT_READ_URI_PERMISSION
+            );
+            LogUtils.d(TAG, "【选图权限】已添加持久化权限");
+        }
+
+        if (putUriFileToPreviewSource(selectedImage)) {
+            LogUtils.d(TAG, "【选图同步】路径绑定完成");
+            ImageCropUtils.startImageCrop(BackgroundSettingsActivity.this,
+										  mBgSourceUtils.getPreviewBackgroundBean(),
+										  mBackgroundView.getWidth(),
+										  mBackgroundView.getHeight(),
+										  false,
+										  REQUEST_CROP_IMAGE
+										  );
+        } else {
+            ToastUtils.show("图片同步失败");
+            LogUtils.e(TAG, "【选图同步】文件复制失败");
+        }
+    }
+
+    /**
+     * 将 Uri 文件同步到预览 Bean
+     */
+    boolean putUriFileToPreviewSource(Uri srcUriFile) {
+        String filePath = UriUtils.getFilePathFromUri(this, srcUriFile);
+        if (TextUtils.isEmpty(filePath)) {
+            LogUtils.e(TAG, "putUriFileToPreviewSource: Uri解析路径为空");
+            return false;
+        }
+        File srcFile = new File(filePath);
+        return putUriFileToPreviewSource(srcFile);
+    }
+
+    /**
+     * 将 File 同步到预览 Bean
+     * 保留：核心修复逻辑（更新预览Bean路径）
+     */
+    boolean putUriFileToPreviewSource(File srcFile) {
+        LogUtils.d(TAG, String.format("putUriFileToPreviewSource(File srcFile) srcFile %s", srcFile));
+		mBgSourceUtils.loadSettings();
+		BackgroundBean previewBean = mBgSourceUtils.getPreviewBackgroundBean();
+		File dstFile = new File(previewBean.getBackgroundFilePath());
+		LogUtils.d(TAG, String.format("putUriFileToPreviewSource(File srcFile) dstFile %s", dstFile));
+        if (FileUtils.copyFile(srcFile, dstFile)) {
+			LogUtils.d(TAG, "putUriFileToPreviewSource(File srcFile) 文件拷贝成功。 ");
+			return true;
+		}
+		LogUtils.d(TAG, "putUriFileToPreviewSource(File srcFile) 文件无法拷贝。 ");
+		return false;
+    }
+
+    /**
+     * 处理裁剪结果
+     */
+    private void handleCropImageResult(int requestCode, int resultCode, Intent data) {
+        LogUtils.d(TAG, "【业务逻辑】handleCropImageResult 处理裁剪结果");
+        File cropTempFile = new File(mBgSourceUtils.getPreviewBackgroundBean().getBackgroundScaledCompressFilePath());
+        boolean isFileExist = cropTempFile.exists();
+        boolean isFileReadable = isFileExist ? cropTempFile.canRead() : false;
+        long fileSize = isFileExist ? cropTempFile.length() : 0;
+        boolean isCropSuccess = (resultCode == RESULT_OK) && isFileExist && isFileReadable && fileSize > 100;
+
+        if (isCropSuccess) {
+            isPreviewBackgroundChanged = true;
+            LogUtils.d(TAG, "【裁剪结果】裁剪成功");
+            final BackgroundBean previewBean = mBgSourceUtils.getPreviewBackgroundBean();
+            previewBean.setIsUseBackgroundFile(true);
+            previewBean.setIsUseBackgroundScaledCompressFile(true);
+            mBgSourceUtils.saveSettings();
+			doubleRefreshPreview();
+
+//            float systemFileRatio = getRatioFromSystemCropFile(cropTempFile);
+//            if (systemFileRatio > 0) {
+//                Bitmap cropBitmap = parseCropTempFileToBitmap(cropTempFile);
+//                if (isBitmapValid(cropBitmap)) {
+//                    Bitmap scaledCropBitmap = adjustBitmapToFinalRatio(cropBitmap, systemFileRatio);
+//                    if (isBitmapValid(scaledCropBitmap)) {
+//                        saveScaledBitmapToFile(scaledCropBitmap, cropTempFile);
+//                        scaledCropBitmap.recycle();
+//                    }
+//                    cropBitmap.recycle();
+//                } else {
+//                    LogUtils.e(TAG, "【裁剪结果】裁剪Bitmap解析无效");
+//                }
+//            }
+//
+//            new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+//					@Override
+//					public void run() {
+//						if (!isFinishing()) {
+//							doubleRefreshPreview();
+//							LogUtils.d(TAG, "【裁剪结果】触发双重刷新");
+//						}
+//					}
+//				}, 300);
+        } else {
+            handleOperationCancelOrFail();
+        }
+    }
+
+	private void handlePixelPickerResult(int requestCode, int resultCode, Intent data) {
+		doubleRefreshPreview();
+		isPreviewBackgroundChanged = true;
+	}
+}
+

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

@@ -23,8 +23,11 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.R;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,11 +35,11 @@ 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 class BatteryReportActivity extends WinBoLLActivity implements IWinBoLLActivity {
     public static final String TAG = "BatteryReportActivity";
 
+	private Toolbar mToolbar;
     private RecyclerView rvBatteryReport;
     private BatteryReportAdapter adapter;
     private List<AppBatteryModel> dataList = new ArrayList<AppBatteryModel>(); 
@@ -50,10 +53,34 @@ public class BatteryReportActivity extends Activity {
     private Map<String, String> packageToAppNameCache = new HashMap<String, String>();
     private PackageManager mPackageManager;
 
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_battery_report);
+
+		mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+		mToolbar.setSubtitle(getTag());
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "【导航栏】点击返回");
+					finish();
+				}
+			});
+
         mPackageManager = getPackageManager();
 
         // 权限检查（Java7 传统条件判断）

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

@@ -7,26 +7,37 @@ 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 androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogUtils;
 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.models.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 cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 
-public class ClearRecordActivity extends Activity {
+public class ClearRecordActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "ClearRecordActivity";
 
-    AToolbar mAToolbar;
+    private Toolbar mToolbar;
     TextView mtvRecordText;
     App mApplication;
 	boolean mIsShowRecordWithEnter = false;
 
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
+	
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -34,21 +45,18 @@ public class ClearRecordActivity extends Activity {
         mApplication = (App) getApplication();
 
         // 初始化工具栏
-        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
-        setActionBar(mAToolbar);
-        //mAToolbar.setTitle(getTitle() + " - " + getString(R.string.subtitle_activity_clearrecord));
-        mAToolbar.setSubtitle(R.string.subtitle_activity_clearrecord);
-        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
-        //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
-        setActionBar(mAToolbar);
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish();
-                }
-            });
+		mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+		mToolbar.setSubtitle(getTag());
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "【导航栏】点击返回");
+					finish();
+				}
+			});
 
         // 设置滑动清理控件
         //

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

@@ -24,10 +24,10 @@ import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
 import cc.winboll.studio.libaes.views.AToolbar;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
+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.models.BackgroundBean;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -193,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.getPreviewBackgroundBean();
 					bean.setPixelColor(pixelColor);
-					utils.saveData();
+					utils.saveSettings();
 					Toast.makeText(PixelPickerActivity.this, "已记录像素值", Toast.LENGTH_SHORT).show();
 					setBackgroundColor();
 				}
@@ -217,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.getPreviewBackgroundBean();
 		int nPixelColor = bean.getPixelColor();
 		RelativeLayout mainLayout = findViewById(R.id.activitypixelpickerRelativeLayout1);
 		mainLayout.setBackgroundColor(nPixelColor);
@@ -235,7 +235,7 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
 			Intent intent = new Intent();
-            intent.setClass(this, BackgroundPictureActivity.class);
+            intent.setClass(this, BackgroundSettingsActivity.class);
             startActivity(intent);
             //GlobalApplication.getWinBoLLActivityManager().startWinBoLLActivity(getApplicationContext(), );
             return true;
@@ -247,9 +247,11 @@ public class PixelPickerActivity extends WinBoLLActivity implements IWinBoLLActi
 	@Override
 	public void onBackPressed() {
 		super.onBackPressed();
-		Intent intent = new Intent();
-		intent.setClass(this, BackgroundPictureActivity.class);
-		startActivity(intent);
+		setResult(RESULT_OK);
+		finish();
+//		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,51 @@
+package cc.winboll.studio.powerbell.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libaes.interfaces.IWinBoLLActivity;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.R;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/11/27 14:26
+ * @Describe 应用设置窗口
+ */
+public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivity {
+
+    public static final String TAG = "SettingsActivity";
+    private static final int REQUEST_READ_MEDIA_IMAGES = 1001;
+
+	private Toolbar mToolbar;
+
+	@Override
+	public Activity getActivity() {
+		return this;
+	}
+
+	@Override
+	public String getTag() {
+		return TAG;
+	}
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+		mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+		mToolbar.setSubtitle(getTag());
+        mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "【导航栏】点击返回");
+					finish();
+				}
+			});
+    }
+}

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

@@ -21,6 +21,9 @@ 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.libaes.models.AESThemeBean;
+import cc.winboll.studio.libaes.utils.AESThemeUtil;
+import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.powerbell.BuildConfig;
 import cc.winboll.studio.powerbell.R;
 
@@ -28,15 +31,24 @@ import cc.winboll.studio.powerbell.R;
 public abstract class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "WinBoLLActivity";
-	
+
+    protected volatile AESThemeBean.ThemeType mThemeType;
 	protected TextView mTagView;
 	
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        mThemeType = getThemeType();
+        setThemeStyle();
         super.onCreate(savedInstanceState);
-		changeFullScreen(this);
+    }
+
+    AESThemeBean.ThemeType getThemeType() {
+        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
     }
 	
+    void setThemeStyle() {
+        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
+    }
 
     @Override
     protected void onStart() {
@@ -79,13 +91,13 @@ public abstract class WinBoLLActivity extends AppCompatActivity implements IWinB
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        //GlobalApplication.getWinBoLLActivityManager().add(this);
+        WinBoLLActivityManager.getInstance().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        //GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
+        WinBoLLActivityManager.getInstance().registeRemove(this);
     }
 
     @Override

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.models.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

@@ -2,22 +2,19 @@ package cc.winboll.studio.powerbell.dialogs;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
-import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
-import cc.winboll.studio.powerbell.utils.FileUtils;
-import cc.winboll.studio.powerbell.utils.UriUtil;
+import cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
+import cc.winboll.studio.powerbell.utils.UriUtils;
+import cc.winboll.studio.powerbell.views.BackgroundView;
 import java.io.File;
-import java.io.IOException;
 
 /**
  * @Author ZhanGSKen<zhangsken@qq.com>
@@ -29,21 +26,25 @@ public class BackgroundPicturePreviewDialog extends Dialog {
     public static final String TAG = "BackgroundPicturePreviewDialog";
 
     Context mContext;
-    BackgroundPictureUtils mBackgroundPictureUtils;
+    //BackgroundSourceUtils mBackgroundPictureUtils;
     Button dialogbackgroundpicturepreviewButton1;
     Button dialogbackgroundpicturepreviewButton2;
-    String mszPreReceivedFileName;
+    //String mszPreReceivedFileName;
+	IOnRecivedPictureListener mIOnRecivedPictureListener;
+	Uri mUriRecivedPicture;
+	BackgroundView mBackgroundView;
 
-    public BackgroundPicturePreviewDialog(Context context) {
+    public BackgroundPicturePreviewDialog(Context context, IOnRecivedPictureListener iOnRecivedPictureListener) {
         super(context);
         setContentView(R.layout.dialog_backgroundpicturepreview);
-        initEnv();
+		mIOnRecivedPictureListener = iOnRecivedPictureListener;
+        //initEnv();
         
         mContext = context;
-        mBackgroundPictureUtils = ((BackgroundPictureActivity)context).mBackgroundPictureUtils;
+        //mBackgroundPictureUtils = BackgroundSourceUtils.getInstance(mContext);
         
-        ImageView imageView = findViewById(R.id.dialogbackgroundpicturepreviewImageView1);
-        copyAndViewRecivePicture(imageView);
+        mBackgroundView = findViewById(R.id.backgroundview);
+        previewRecivedPicture();
 
         dialogbackgroundpicturepreviewButton1 = findViewById(R.id.dialogbackgroundpicturepreviewButton1);
         dialogbackgroundpicturepreviewButton1.setOnClickListener(new View.OnClickListener() {
@@ -53,6 +54,7 @@ public class BackgroundPicturePreviewDialog extends Dialog {
                     // 跳转到主窗口
                     Intent i = new Intent(mContext, MainActivity.class);
                     mContext.startActivity(i);
+					dismiss();
                 }
             });
 
@@ -62,79 +64,77 @@ public class BackgroundPicturePreviewDialog extends Dialog {
                 @Override
                 public void onClick(View v) {
                     // 使用分享到的图片
-                    //
-                    //LogUtils.d(TAG, "mszReceivedFileName : " + mszReceivedFileName);
-                    ((IOnRecivedPictureListener)mContext).onAcceptRecivedPicture(mszPreReceivedFileName);
+					mIOnRecivedPictureListener.onAcceptRecivedPicture(mUriRecivedPicture);
                     // 关闭对话框
                     dismiss();
                 }
             });
     }
     
-    void initEnv() {
-        LogUtils.d(TAG, "initEnv()");
-        mszPreReceivedFileName = "PreReceived.data";
-    }
+//    void initEnv() {
+//        LogUtils.d(TAG, "initEnv()");
+//        mszPreReceivedFileName = "PreReceived.data";
+//    }
 
-    void copyAndViewRecivePicture(ImageView imageView) {
-        //AppConfigUtils appConfigUtils = AppConfigUtils.getInstance((GlobalApplication)mContext.getApplicationContext());
-        BackgroundPictureActivity activity = ((BackgroundPictureActivity)mContext);
+    void previewRecivedPicture() {
+        BackgroundSettingsActivity activity = ((BackgroundSettingsActivity)mContext);
 
         //取出文件uri
-        Uri uri = activity.getIntent().getData();
-        if (uri == null) {
-            uri = activity.getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+        mUriRecivedPicture = activity.getIntent().getData();
+        if (mUriRecivedPicture == null) {
+            mUriRecivedPicture = activity.getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
         }
         //获取文件真实地址
-        String szSrcImage = UriUtil.getFilePathFromUri(mContext, uri);
+        String szSrcImage = UriUtils.getFilePathFromUri(mContext, mUriRecivedPicture);
         if (TextUtils.isEmpty(szSrcImage)) {
             Toast.makeText(mContext, "接收到的文件为空。", Toast.LENGTH_SHORT).show();
             dismiss();
             return;
         }
-
-        File fSrcImage = new File(szSrcImage);
-        //mszPreReceivedFileName = DateUtils.getDateNowString() + "-" + fSrcImage.getName();
-        File mfPreReceivedPhoto = new File(activity.mBackgroundPictureUtils.getBackgroundDir(), mszPreReceivedFileName);
-        // 复制源图片到剪裁文件
-        try {
-            FileUtils.copyFileUsingFileChannels(fSrcImage, mfPreReceivedPhoto);
-            LogUtils.d(TAG, "copyFileUsingFileChannels");
-            Drawable drawable = Drawable.createFromPath(mfPreReceivedPhoto.getPath());
-            imageView.setBackground(drawable);
-            //LogUtils.d(TAG, "mszPreReceivedFileName : " + mszPreReceivedFileName);
-        } catch (IOException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
+		mBackgroundView.loadImage(szSrcImage);
+//
+//        File fSrcImage = new File(szSrcImage);
+//        //mszPreReceivedFileName = DateUtils.getDateNowString() + "-" + fSrcImage.getName();
+//        File mfPreReceivedPhoto = new File(BackgroundSourceUtils.getInstance(mContext).getBackgroundSourceDirPath(), mszPreReceivedFileName);
+//        // 复制源图片到剪裁文件
+//        try {
+//            FileUtils.copyFileUsingFileChannels(fSrcImage, mfPreReceivedPhoto);
+//            LogUtils.d(TAG, "copyFileUsingFileChannels");
+//            Drawable drawable = Drawable.createFromPath(mfPreReceivedPhoto.getPath());
+//            imageView.setBackground(drawable);
+//            //LogUtils.d(TAG, "mszPreReceivedFileName : " + mszPreReceivedFileName);
+//        } catch (IOException e) {
+//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+//        }
     }
 
 
     //
     // 创建图片背景图片目录
     //
-    boolean createBackgroundFolder2(String szBackgroundFolder) {
-        // 文件路径参数为空值或无效值时返回false.
-        if (szBackgroundFolder == null | szBackgroundFolder.equals("")) {
-            return false;
-        }
-
-        LogUtils.d(TAG, "Background Folder Is : " + szBackgroundFolder);
-        File f = new File(szBackgroundFolder);
-        if (f.exists()) {
-            if (f.isDirectory()) {
-                return true;
-            } else {
-                // 工作路径不是一个目录
-                LogUtils.d(TAG, "createImageWorkFolder() error : szImageCacheFolder isDirectory return false. -->" + szBackgroundFolder);
-                return false;
-            }
-        } else {
-            return f.mkdirs();
-        }
-    }
+//    boolean createBackgroundFolder2(String szBackgroundFolder) {
+//        // 文件路径参数为空值或无效值时返回false.
+//        if (szBackgroundFolder == null | szBackgroundFolder.equals("")) {
+//            return false;
+//        }
+//
+//        LogUtils.d(TAG, "Background Folder Is : " + szBackgroundFolder);
+//        File f = new File(szBackgroundFolder);
+//        if (f.exists()) {
+//            if (f.isDirectory()) {
+//                return true;
+//            } else {
+//                // 工作路径不是一个目录
+//                LogUtils.d(TAG, "createImageWorkFolder() error : szImageCacheFolder isDirectory return false. -->" + szBackgroundFolder);
+//                return false;
+//            }
+//        } else {
+//            return f.mkdirs();
+//        }
+//    }
 
     public interface IOnRecivedPictureListener {
-        void onAcceptRecivedPicture(String szBackgroundFileName);
+        void onAcceptRecivedPicture(Uri uriRecivedPicture);
     }
 
 }

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

@@ -0,0 +1,747 @@
+package cc.winboll.studio.powerbell.dialogs;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.HorizontalScrollView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.R;
+import com.a4455jkjh.colorpicker.ColorPickerDialog;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/12/16 11:47
+ * @Describe 调色板对话框（支持颜色拾取、RGB输入、透明度/亮度调节，兼容 API29-30+ 小米机型）
+ */
+public class ColorPaletteDialog extends Dialog implements View.OnClickListener, SeekBar.OnSeekBarChangeListener {
+    // ====================== 常量定义（首屏可见，统一管理） ======================
+    public static final String TAG = "ColorPaletteDialog";
+    private static final int MAX_RGB_VALUE = 255;      // RGB分量最大值（0-255）
+    private static final int DEFAULT_BRIGHTNESS = 100; // 默认亮度百分比（100%，无调节）
+    private static final int BRIGHTNESS_STEP = 5;     // 亮度调节步长（每次±5%，精准流畅）
+    private static final int MIN_BRIGHTNESS = 10;     // 亮度最小值（10%，避免全黑看不见）
+    private static final int MAX_BRIGHTNESS = 200;    // 亮度最大值（200%，避免过曝失真）
+    private static final int MAX_ALPHA_PERCENT = 100; // 透明度最大值（100%=不透明）
+    private static final int MIN_ALPHA_PERCENT = 0;   // 透明度最小值（0%=完全透明）
+
+    // ====================== 回调接口（紧跟常量，逻辑关联） ======================
+    public interface OnColorSelectedListener {
+        void onColorSelected(int color); // 返回0xAARRGGBB格式颜色（含透明度）
+    }
+
+    // ====================== 成员变量（按优先级排序：核心数据→控件引用） ======================
+    // 核心数据：原始基准值（用户输入/选择颜色时更新）+ 实时调节值（亮度/透明度变化时更新）
+    private OnColorSelectedListener mListener; // 颜色选择回调（非空校验）
+    private int mInitialColor;                 // 初始颜色（传入的默认颜色）
+    private int mCurrentColor;                 // 当前最终颜色（含亮度+透明度调节）
+    private int mCurrentBrightnessPercent;     // 当前亮度百分比（10%-200%）
+    // 透明度：百分比（0-100%，用户直观操作）+ 原始/实时值（0-255，颜色计算用）
+    private int mOriginalAlphaPercent;         // 原始透明度百分比（基准值，用户输入/选色时更新）
+    private int mCurrentAlphaPercent;          // 实时透明度百分比（调节进度条时更新）
+    private int mOriginalAlpha;                // 原始透明度（0-255，基准值）
+    private int mCurrentAlpha;                 // 实时透明度（0-255，计算用）
+    // RGB：原始基准值+实时调节值
+    private int mOriginalR;                    // 原始R分量（基准值，用户输入/选色时更新）
+    private int mOriginalG;                    // 原始G分量（基准值，用户输入/选色时更新）
+    private int mOriginalB;                    // 原始B分量（基准值，用户输入/选色时更新）
+    private int mCurrentR;                     // 实时R分量（亮度调节后，同步输入框显示）
+    private int mCurrentG;                     // 实时G分量（亮度调节后，同步输入框显示）
+    private int mCurrentB;                     // 实时B分量（亮度调节后，同步输入框显示）
+    // 并发控制标记：是否是应用程序自身在更新颜色（避免循环回调/重复触发）
+    private static volatile boolean isAppSelfUpdatingColor = false;
+
+    // 控件引用（新增透明度进度条+文本）
+    private ImageView ivColorPicker;   // 颜色预览拾取框
+	private ImageView ivColorScaler;   // 颜色渐变拾取框
+    private EditText etR;              // R分量输入框（显示实时调节值）
+    private EditText etG;              // G分量输入框（显示实时调节值）
+    private EditText etB;              // B分量输入框（显示实时调节值）
+    private EditText etColorValue;     // 颜色值输入框（#AARRGGBB，显示最终值）
+    private SeekBar sbAlpha;           // 透明度调节进度条（0-100%）
+    private TextView tvAlphaValue;     // 透明度数值显示（X%）
+    private TextView tvBrightnessMinus;// 亮度减少按钮（-）
+    private TextView tvBrightnessValue;// 亮度数值显示（X%，直观易懂）
+    private TextView tvBrightnessPlus; // 亮度增加按钮（+）
+    private TextView tvConfirm;        // 确认按钮
+    private TextView tvCancel;         // 取消按钮
+
+    // ====================== 构造方法（初始化核心数据，严格校验） ======================
+    public ColorPaletteDialog(Context context, int initialColor, OnColorSelectedListener listener) {
+        super(context, R.style.CustomDialogStyle);
+        this.mInitialColor = initialColor;
+        this.mListener = listener;
+
+        // 1. 强制回调非空，避免后续空指针（容错）
+        if (mListener == null) {
+            throw new IllegalArgumentException("OnColorSelectedListener can not be null!");
+        }
+
+        // 2. 解析初始颜色：原始基准值 = 实时值（初始无调节）
+        // 透明度：初始颜色的alpha（0-255）转百分比（0-100%）
+        this.mOriginalAlpha = Color.alpha(initialColor);
+        this.mOriginalAlphaPercent = alpha2Percent(mOriginalAlpha);
+        this.mCurrentAlpha = mOriginalAlpha;
+        this.mCurrentAlphaPercent = mOriginalAlphaPercent;
+        // RGB：初始颜色的RGB分量
+        this.mOriginalR = Color.red(initialColor);
+        this.mOriginalG = Color.green(initialColor);
+        this.mOriginalB = Color.blue(initialColor);
+        this.mCurrentR = mOriginalR;
+        this.mCurrentG = mOriginalG;
+        this.mCurrentB = mOriginalB;
+
+        // 3. 初始化当前状态（默认亮度100%，当前颜色=初始颜色）
+        this.mCurrentBrightnessPercent = DEFAULT_BRIGHTNESS;
+        this.mCurrentColor = initialColor;
+
+        LogUtils.d(TAG, "init dialog success | 初始颜色：" + String.format("#%08X", initialColor)
+                   + " | 原始RGB：" + mOriginalR + "," + mOriginalG + "," + mOriginalB
+                   + " | 原始透明度：" + mOriginalAlphaPercent + "%"
+                   + " | 初始亮度：" + mCurrentBrightnessPercent + "%");
+    }
+
+    // ====================== 生命周期方法（按执行顺序排列，逻辑清晰） ======================
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE); // 隐藏标题栏
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_color_palette, null);
+        setContentView(view);
+
+        // 初始化流程：控件绑定→数据赋值→监听设置→尺寸适配（小米机型优先适配）
+        initViewBind(view);
+        initData();
+        initListener();
+        adjustDialogSize();
+        LogUtils.d(TAG, "dialog create complete | 适配小米API29-30机型");
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        // 释放资源，避免内存泄漏（回调引用置空）
+        mListener = null;
+        LogUtils.d(TAG, "dialog dismiss | 释放资源完成");
+    }
+
+    // ====================== 初始化核心方法（职责单一，便于维护） ======================
+    /**
+     * 控件绑定（新增透明度进度条+文本绑定）
+     */
+    private void initViewBind(View view) {
+        ivColorPicker = view.findViewById(R.id.iv_color_picker);
+		ivColorScaler = view.findViewById(R.id.iv_color_scaler);
+        etR = view.findViewById(R.id.et_r);
+        etG = view.findViewById(R.id.et_g);
+        etB = view.findViewById(R.id.et_b);
+        etColorValue = view.findViewById(R.id.et_color_value);
+        sbAlpha = view.findViewById(R.id.sb_alpha);
+        tvAlphaValue = view.findViewById(R.id.tv_alpha_value);
+        tvBrightnessMinus = view.findViewById(R.id.tv_brightness_minus);
+        tvBrightnessValue = view.findViewById(R.id.tv_brightness_value);
+        tvBrightnessPlus = view.findViewById(R.id.tv_brightness_plus);
+        tvConfirm = view.findViewById(R.id.tv_confirm);
+        tvCancel = view.findViewById(R.id.tv_cancel);
+
+        // 控件非空校验（小米低版本容错，绑定失败直接关闭对话框）
+        if (ivColorPicker == null || ivColorScaler == null || etR == null || etG == null || etB == null || etColorValue == null
+            || sbAlpha == null || tvAlphaValue == null
+            || tvBrightnessMinus == null || tvBrightnessValue == null || tvBrightnessPlus == null
+            || tvConfirm == null || tvCancel == null) {
+            LogUtils.e(TAG, "view bind failed | 请检查布局ID是否正确！");
+            dismiss();
+            return;
+        }
+        LogUtils.d(TAG, "view bind complete | 所有控件绑定成功");
+    }
+
+    /**
+     * 数据初始化（无监听状态下赋值，避免循环回调）
+     */
+    private void initData() {
+        // 1. 颜色预览（显示当前最终颜色，初始=原始颜色）
+        ivColorPicker.setBackgroundColor(mCurrentColor);
+
+        // 2. RGB输入框（显示「实时分量」，初始=原始值）
+        etR.setText(String.valueOf(mCurrentR));
+        etG.setText(String.valueOf(mCurrentG));
+        etB.setText(String.valueOf(mCurrentB));
+
+        // 3. 颜色值输入框（显示当前最终颜色，格式#AARRGGBB，大写更规范）
+        etColorValue.setText(String.format("#%08X", mCurrentColor));
+
+        // 4. 透明度控件（进度条+文本，初始=原始透明度）
+        sbAlpha.setProgress(mCurrentAlphaPercent);
+        tvAlphaValue.setText(mCurrentAlphaPercent + "%");
+
+        // 5. 亮度控件（显示默认100%，初始化按钮状态）
+        tvBrightnessValue.setText(mCurrentBrightnessPercent + "%");
+        updateBrightnessBtnStatus(); // 禁用边界值按钮（初始100%，都可用）
+
+        LogUtils.d(TAG, "init data complete | 原始透明度：" + mOriginalAlphaPercent + "%");
+    }
+
+    /**
+     * 监听初始化（新增透明度进度条监听）
+     */
+    private void initListener() {
+        // 点击监听（按钮+颜色拾取框）
+        ivColorPicker.setOnClickListener(this);
+        ivColorScaler.setOnClickListener(this);
+        tvConfirm.setOnClickListener(this);
+        tvCancel.setOnClickListener(this);
+        tvBrightnessMinus.setOnClickListener(this);
+        tvBrightnessPlus.setOnClickListener(this);
+        // 透明度进度条监听
+        sbAlpha.setOnSeekBarChangeListener(this);
+        // 输入框监听（RGB+颜色值，避免循环同步）
+        initTextWatcherListener();
+        LogUtils.d(TAG, "all listener init complete | 监听绑定成功");
+    }
+
+    /**
+     * 对话框尺寸适配（小米全面屏+软键盘优化，避免输入框被遮挡）
+     */
+    private void adjustDialogSize() {
+        Window window = getWindow();
+        if (window != null) {
+            WindowManager.LayoutParams lp = window.getAttributes();
+            // 宽度占屏幕80%，高度自适应（适配不同屏幕尺寸）
+            lp.width = (int) (getContext().getResources().getDisplayMetrics().widthPixels * 0.8);
+            lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+            // 软键盘适配：小米虚拟导航栏兼容，避免输入框被遮挡
+            window.setAttributes(lp);
+            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN
+                                    | WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+            LogUtils.d(TAG, "dialog size adjust complete | 适配全面屏+软键盘");
+        }
+    }
+
+    // ====================== 监听子方法（细分类型，逻辑清晰） ======================
+    /**
+     * 输入框文本监听（RGB+颜色值，传入触发ID避免循环同步）
+     */
+    private void initTextWatcherListener() {
+        // RGB输入框监听（复用方法，减少冗余）
+        setEditTextWatcher(etR, R.id.et_r);
+        setEditTextWatcher(etG, R.id.et_g);
+        setEditTextWatcher(etB, R.id.et_b);
+
+        // 颜色值输入框监听（支持#RRGGBB/#AARRGGBB格式）
+        etColorValue.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) {}
+
+				@Override
+				public void afterTextChanged(Editable s) {
+					// 关键：判断非应用自身更新，才执行解析（避免循环回调）
+					if (!isAppSelfUpdatingColor) {
+						parseColorFromStr(s.toString().trim(), R.id.et_color_value);
+					}
+				}
+			});
+    }
+
+    // ====================== 透明度进度条监听实现（核心新增） ======================
+    @Override
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+        // 仅处理用户手动拖动进度条（避免应用自身更新时触发）
+        if (fromUser && !isAppSelfUpdatingColor) {
+            updateAlphaBySeekBar(progress);
+        }
+    }
+
+    @Override
+    public void onStartTrackingTouch(SeekBar seekBar) {}
+
+    @Override
+    public void onStopTrackingTouch(SeekBar seekBar) {}
+
+    /**
+     * 拖动透明度进度条更新颜色（核心新增逻辑）
+     */
+    private synchronized void updateAlphaBySeekBar(int alphaPercent) {
+        if (!isAppSelfUpdatingColor) {
+            isAppSelfUpdatingColor = true; // 标记为应用自身更新
+            try {
+                // 更新实时透明度（百分比+0-255值）
+                mCurrentAlphaPercent = alphaPercent;
+                mCurrentAlpha = percent2Alpha(alphaPercent);
+                // 重新计算最终颜色（基于当前亮度+新透明度）
+                calculateBrightnessAndUpdate();
+                // 同步所有控件
+                updateAllViews();
+                LogUtils.d(TAG, "update alpha by seekbar | 透明度：" + mCurrentAlphaPercent + "%");
+            } finally {
+                // 直接释放标记，避免卡顿
+                isAppSelfUpdatingColor = false;
+            }
+        }
+    }
+
+    // ====================== 颜色核心逻辑（新增透明度参数，全功能兼容） ======================
+    /**
+     * 核心计算：基于原始RGB+当前亮度+当前透明度，计算实时RGB+最终颜色
+     * 逻辑：亮度百分比→调节系数→原始RGB×系数→限制0-255→拼接透明度→最终颜色
+     */
+    private void calculateBrightnessAndUpdate() {
+        // 亮度百分比转调节系数（10%→0.1，100%→1.0，200%→2.0）
+        float brightnessFactor = mCurrentBrightnessPercent / 100.0f;
+
+        // RGB三个分量同时调节（基于原始基准值，避免叠加失真），限制0-255
+        mCurrentR = Math.min(Math.max(Math.round(mOriginalR * brightnessFactor), 0), MAX_RGB_VALUE);
+        mCurrentG = Math.min(Math.max(Math.round(mOriginalG * brightnessFactor), 0), MAX_RGB_VALUE);
+        mCurrentB = Math.min(Math.max(Math.round(mOriginalB * brightnessFactor), 0), MAX_RGB_VALUE);
+
+        // 拼接「实时透明度」+「实时RGB」，得到最终颜色（0xAARRGGBB）
+        mCurrentColor = Color.argb(mCurrentAlpha, mCurrentR, mCurrentG, mCurrentB);
+    }
+
+    /**
+     * 亮度减少（每次减5%，最低10%，防止过暗）
+     */
+    private void decreaseBrightness() {
+        changeBrightness(false);
+    }
+
+    /**
+     * 亮度增加（每次加5%，最高200%，防止过曝）
+     */
+    private void increaseBrightness() {
+        changeBrightness(true);
+    }
+
+    /**
+     * 亮度调节核心方法（统一逻辑，加并发控制，同步所有控件）
+     */
+    private synchronized void changeBrightness(boolean isIncrease) {
+        // 关键：判断非应用自身更新，才执行调节（避免重复触发/循环）
+        if (!isAppSelfUpdatingColor) {
+            isAppSelfUpdatingColor = true; // 标记为应用自身更新
+            try {
+                if (isIncrease) {
+                    if (mCurrentBrightnessPercent >= MAX_BRIGHTNESS) return; // 达到最大值，不处理
+                    mCurrentBrightnessPercent += BRIGHTNESS_STEP; // 增加步长
+                } else {
+                    if (mCurrentBrightnessPercent <= MIN_BRIGHTNESS) return; // 达到最小值，不处理
+                    mCurrentBrightnessPercent -= BRIGHTNESS_STEP; // 减少步长
+                }
+                // 计算亮度调节后的实时RGB+最终颜色（含当前透明度）
+                calculateBrightnessAndUpdate();
+                // 同步所有控件
+                updateAllViews();
+                LogUtils.d(TAG, (isIncrease ? "increase" : "decrease") + " brightness | "
+                           + "亮度：" + mCurrentBrightnessPercent + "% | 实时RGB：" + mCurrentR + "," + mCurrentG + "," + mCurrentB);
+            } finally {
+                // 直接释放标记，避免卡顿
+                isAppSelfUpdatingColor = false;
+            }
+        }
+    }
+
+    /**
+     * 解析颜色字符串（支持#RRGGBB/#AARRGGBB，容错处理，更新原始基准值+实时值）
+     * 新增：解析颜色的透明度，同步更新透明度进度条
+     */
+    private void parseColorFromStr(String colorStr, int triggerViewId) {
+        // 关键：判断非应用自身更新，才执行解析（避免循环回调）
+        if (!isAppSelfUpdatingColor) {
+            isAppSelfUpdatingColor = true; // 标记为应用自身更新
+            try {
+                if (TextUtils.isEmpty(colorStr)) return;
+
+                // 补全#前缀（兼容用户输入习惯，如直接输AARRGGBB）
+                if (!colorStr.startsWith("#")) {
+                    colorStr = "#" + colorStr;
+                }
+
+                // 格式校验（仅支持6位RRGGBB/8位AARRGGBB，避免非法格式）
+                if (colorStr.length() != 7 && colorStr.length() != 9) {
+                    LogUtils.e(TAG, "parse color failed | 格式错误（需#RRGGBB/#AARRGGBB），输入：" + colorStr);
+                    return;
+                }
+
+                // 解析颜色（系统API，安全可靠）
+                int parsedColor = Color.parseColor(colorStr);
+
+                // 更新原始基准值（用户输入颜色，重置基准）
+                // 透明度：解析颜色的alpha（0-255）转百分比（0-100%）
+                mOriginalAlpha = Color.alpha(parsedColor);
+                mOriginalAlphaPercent = alpha2Percent(mOriginalAlpha);
+                // RGB：解析颜色的RGB分量
+                mOriginalR = Color.red(parsedColor);
+                mOriginalG = Color.green(parsedColor);
+                mOriginalB = Color.blue(parsedColor);
+                // 更新实时值（原始值=实时值，无调节）
+                mCurrentAlpha = mOriginalAlpha;
+                mCurrentAlphaPercent = mOriginalAlphaPercent;
+                mCurrentR = mOriginalR;
+                mCurrentG = mOriginalG;
+                mCurrentB = mOriginalB;
+                // 重置亮度为100%
+                mCurrentBrightnessPercent = DEFAULT_BRIGHTNESS;
+                mCurrentColor = parsedColor;
+
+                // 同步所有控件
+                updateAllViews();
+                LogUtils.d(TAG, "parse color success | 解析颜色：" + String.format("#%08X", parsedColor)
+                           + " | 透明度：" + mCurrentAlphaPercent + "% | 重置亮度：" + DEFAULT_BRIGHTNESS + "%");
+            } catch (IllegalArgumentException e) {
+                LogUtils.e(TAG, "parse color failed | 非法颜色格式，输入：" + colorStr, e);
+            } finally {
+                // 直接释放标记，避免卡顿
+                isAppSelfUpdatingColor = false;
+            }
+        }
+    }
+
+    /**
+     * 通过RGB输入框更新颜色（用户输入后，更新原始基准值+实时值，重置亮度为100%）
+     * 新增：透明度基准值保持不变，仅更新RGB
+     */
+    private synchronized void updateColorByRGB(int triggerViewId) {
+        // 关键：判断非应用自身更新，才执行更新（避免循环回调）
+        if (!isAppSelfUpdatingColor) {
+            isAppSelfUpdatingColor = true; // 标记为应用自身更新
+            try {
+                // 解析用户输入的RGB值（限制0-255，非法输入设为0）
+                int inputR = parseInputValue(etR.getText().toString());
+                int inputG = parseInputValue(etG.getText().toString());
+                int inputB = parseInputValue(etB.getText().toString());
+
+                // 更新原始基准值（用户手动输入，作为新的调节基准）
+                mOriginalR = inputR;
+                mOriginalG = inputG;
+                mOriginalB = inputB;
+                // 更新实时值（输入值=实时值，无亮度调节）
+                mCurrentR = inputR;
+                mCurrentG = inputG;
+                mCurrentB = inputB;
+                // 重置亮度为100%（透明度保持当前值不变）
+                mCurrentBrightnessPercent = DEFAULT_BRIGHTNESS;
+                // 计算最终颜色（无亮度调节，拼接当前透明度）
+                mCurrentColor = Color.argb(mCurrentAlpha, mCurrentR, mCurrentG, mCurrentB);
+
+                // 同步所有控件
+                updateAllViews();
+                LogUtils.d(TAG, "update color by RGB | 新原始RGB：" + mOriginalR + "," + mOriginalG + "," + mOriginalB
+                           + " | 透明度：" + mCurrentAlphaPercent + "% | 重置亮度：" + DEFAULT_BRIGHTNESS + "%");
+            } catch (Exception e) {
+                LogUtils.e(TAG, "update color by RGB failed", e);
+            } finally {
+                // 直接释放标记，避免卡顿
+                isAppSelfUpdatingColor = false;
+            }
+        }
+    }
+
+    /**
+     * 核心同步：更新所有控件显示（新增透明度控件同步，统一方法）
+     */
+    private void updateAllViews() {
+        // 1. 同步颜色预览（显示最终颜色，含透明度+亮度）
+        ivColorPicker.setBackgroundColor(mCurrentColor);
+
+        // 2. 同步RGB输入框（显示实时调节值）
+        etR.setText(String.valueOf(mCurrentR));
+        etG.setText(String.valueOf(mCurrentG));
+        etB.setText(String.valueOf(mCurrentB));
+
+        // 3. 同步颜色值输入框（显示最终颜色，含透明度，格式#AARRGGBB）
+        etColorValue.setText(String.format("#%08X", mCurrentColor));
+
+        // 4. 同步透明度控件（进度条+文本，显示实时透明度）
+        sbAlpha.setProgress(mCurrentAlphaPercent);
+        tvAlphaValue.setText(mCurrentAlphaPercent + "%");
+
+        // 5. 同步亮度控件（数值+按钮状态）
+        tvBrightnessValue.setText(mCurrentBrightnessPercent + "%");
+        updateBrightnessBtnStatus();
+
+        LogUtils.d(TAG, "sync all views complete | 最终颜色：" + String.format("#%08X", mCurrentColor)
+                   + " | 实时RGB：" + mCurrentR + "," + mCurrentG + "," + mCurrentB
+                   + " | 透明度：" + mCurrentAlphaPercent + "% | 亮度：" + mCurrentBrightnessPercent + "%");
+    }
+
+    /**
+     * 更新亮度按钮状态（边界值禁用，提升交互体验）
+     */
+    private void updateBrightnessBtnStatus() {
+        // 亮度≤10%：禁用减号（文字变浅灰）；≥200%：禁用加号（文字变浅灰）
+        boolean canMinus = mCurrentBrightnessPercent > MIN_BRIGHTNESS;
+        boolean canPlus = mCurrentBrightnessPercent < MAX_BRIGHTNESS;
+
+        tvBrightnessMinus.setEnabled(canMinus);
+        tvBrightnessPlus.setEnabled(canPlus);
+        tvBrightnessMinus.setTextColor(canMinus ? Color.BLACK : Color.parseColor("#CCCCCC"));
+        tvBrightnessPlus.setTextColor(canPlus ? Color.BLACK : Color.parseColor("#CCCCCC"));
+    }
+
+    // ====================== 工具方法（新增透明度转换工具，通用复用） ======================
+    /**
+     * 透明度：0-255 → 0-100%（颜色计算值转用户直观百分比）
+     */
+    private int alpha2Percent(int alpha) {
+        return Math.round((float) alpha / MAX_RGB_VALUE * MAX_ALPHA_PERCENT);
+    }
+
+    /**
+     * 透明度：0-100% → 0-255（用户操作百分比转颜色计算值）
+     */
+    private int percent2Alpha(int percent) {
+        return Math.round((float) percent / MAX_ALPHA_PERCENT * MAX_RGB_VALUE);
+    }
+
+    /**
+     * 解析输入值（限制0-255，非法输入返回0，容错处理）
+     */
+    private int parseInputValue(String input) {
+        if (TextUtils.isEmpty(input)) return 0;
+        try {
+            int value = Integer.parseInt(input);
+            return Math.min(Math.max(value, 0), MAX_RGB_VALUE); // 限制范围，避免溢出
+        } catch (NumberFormatException e) {
+            LogUtils.e(TAG, "parse input failed | 非法数字，输入：" + input, e);
+            return 0;
+        }
+    }
+
+    /**
+     * RGB输入框监听复用（减少冗余代码，统一逻辑）
+     */
+    private void setEditTextWatcher(EditText editText, final int viewId) {
+        editText.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) {}
+
+				@Override
+				public void afterTextChanged(Editable s) {
+					// 关键：判断非应用自身更新，才执行更新（避免循环回调）
+					if (!isAppSelfUpdatingColor) {
+						updateColorByRGB(viewId); // 输入变化后更新颜色
+					}
+				}
+			});
+    }
+
+    /**
+     * dp转px（适配小米不同分辨率，避免尺寸错乱，通用工具）
+     */
+    private int dp2px(float dp) {
+        return (int) (dp * getContext().getResources().getDisplayMetrics().density + 0.5f);
+    }
+
+	/**
+	 * 显示系统颜色选择器（兼容API29-30，无高版本依赖，小米机型适配）
+	 * 核心调整：新增「水平滚动容器+颜色排列容器」二级结构，内置圆形按钮，无额外drawable依赖
+	 */
+	private void showSystemColorPicker() {
+		LogUtils.d(TAG, "show system color picker | 兼容小米API29-30，支持横向滚动");
+		final android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(getContext());
+		builder.setTitle("选择基础颜色");
+
+		// 50种常用颜色：按「红→橙→黄→绿→青→蓝→紫→粉→棕→灰→黑白」彩虹光谱顺序排列
+        final int[] systemColors = {
+            // 红色系（6种：深红→大红→浅红→玫红→暗红→橘红）
+            0xFFCC0000, 0xFFFF0000, 0xFFFF6666, 0xFFFF1493, 0xFF8B0000, 0xFFFF4500,
+            // 橙色系（5种：深橙→橙→浅橙→橙黄→橘橙）
+            0xFFCC6600, 0xFFFF8800, 0xFFFFAA33, 0xFFFFBB00, 0xFFF5A623,
+            // 黄色系（5种：深黄→黄→浅黄→鹅黄→金黄）
+            0xFFCCCC00, 0xFFFFFF00, 0xFFFFEE99, 0xFFFFFACD, 0xFFFFD700,
+            // 绿色系（7种：深绿→绿→浅绿→草绿→薄荷绿→翠绿→墨绿）
+            0xFF006600, 0xFF00FF00, 0xFF99FF99, 0xFF66CC66, 0xFF98FB98, 0xFF00FF99, 0xFF003300,
+            // 青色系（5种：深青→青→浅青→蓝绿→青绿）
+            0xFF006666, 0xFF00FFFF, 0xFF99FFFF, 0xFF00CCCC, 0xFF40E0D0,
+            // 蓝色系（8种：深蓝→藏蓝→蓝→浅蓝→天蓝→宝蓝→湖蓝→靛蓝）
+            0xFF0000CC, 0xFF00008B, 0xFF0000FF, 0xFF6666FF, 0xFF87CEEB, 0xFF0066FF, 0xFF0099FF, 0xFF4B0082,
+            // 紫色系（6种：深紫→紫→浅紫→紫罗兰→紫红→蓝紫）
+            0xFF660099, 0xFF8800FF, 0xFFAA99FF, 0xFF9370DB, 0xFFCBC3E3, 0xFF8A2BE2,
+            // 粉色系（5种：深粉→粉→浅粉→嫩粉→桃粉）
+            0xFFFF00FF, 0xFFFF99CC, 0xFFFFCCDD, 0xFFFFB6C1, 0xFFFFA5A5,
+            // 棕色系（4种：深棕→棕→浅棕→棕黄）
+            0xFF8B4513, 0xFFA0522D, 0xFFD2B48C, 0xFFCD853F,
+            // 灰色系（6种：深灰→灰→浅灰→银灰→淡灰→浅银灰）
+            0xFF333333, 0xFF666666, 0xFF888888, 0xFFAAAAAA, 0xFFCCCCCC, 0xFFE6E6E6,
+            // 黑白系（3种：黑→白→米白）
+            0xFF000000, 0xFFFFFFFF, 0xFFFFFAFA
+        };
+
+		// 1. 第一级：水平滚动容器
+		HorizontalScrollView horizontalScrollView = new HorizontalScrollView(getContext());
+		horizontalScrollView.setHorizontalScrollBarEnabled(true);
+		horizontalScrollView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
+		horizontalScrollView.setPadding(dp2px(5), dp2px(5), dp2px(5), dp2px(5));
+
+		// 2. 第二级：颜色排列容器（横向）
+		LinearLayout colorLayout = new LinearLayout(getContext());
+		colorLayout.setOrientation(LinearLayout.HORIZONTAL);
+		colorLayout.setGravity(Gravity.CENTER_VERTICAL);
+		colorLayout.setPadding(dp2px(10), dp2px(10), dp2px(10), dp2px(10));
+
+		// 3. 循环添加颜色按钮（内置圆形效果，无额外依赖）
+		for (int i = 0; i < systemColors.length; i++) {
+			final int color = systemColors[i];
+			ImageView colorBtn = new ImageView(getContext());
+			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(dp2px(40), dp2px(40));
+			if (i != systemColors.length - 1) {
+				lp.setMargins(0, 0, dp2px(10), 0); // 按钮间距
+			}
+			colorBtn.setLayoutParams(lp);
+
+			// 核心：内置圆形背景（白色边框+圆形形状，无需drawable文件）
+			GradientDrawable circleBg = new GradientDrawable();
+			circleBg.setShape(GradientDrawable.OVAL); // 圆形
+			circleBg.setColor(color); // 按钮颜色
+			circleBg.setStroke(dp2px(2), Color.WHITE); // 白色边框（2dp宽，区分颜色）
+			colorBtn.setBackground(circleBg); // 设置圆形背景
+
+			colorBtn.setClickable(true);
+			colorBtn.setFocusable(true);
+
+			// 点击事件（逻辑不变）
+			colorBtn.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						if (!isAppSelfUpdatingColor) {
+							isAppSelfUpdatingColor = true;
+							try {
+								mOriginalAlpha = Color.alpha(color);
+								mOriginalAlphaPercent = alpha2Percent(mOriginalAlpha);
+								mOriginalR = Color.red(color);
+								mOriginalG = Color.green(color);
+								mOriginalB = Color.blue(color);
+								mCurrentAlpha = mOriginalAlpha;
+								mCurrentAlphaPercent = mOriginalAlphaPercent;
+								mCurrentR = mOriginalR;
+								mCurrentG = mOriginalG;
+								mCurrentB = mOriginalB;
+								mCurrentBrightnessPercent = DEFAULT_BRIGHTNESS;
+								mCurrentColor = color;
+								updateAllViews();
+								builder.create().dismiss();
+								LogUtils.d(TAG, "select system color | 选择颜色：" + String.format("#%08X", color)
+										   + " | 透明度：" + mCurrentAlphaPercent + "%");
+							} finally {
+								isAppSelfUpdatingColor = false;
+							}
+						}
+					}
+				});
+			colorLayout.addView(colorBtn);
+		}
+
+		// 层级嵌套（滚动容器→颜色容器）
+		horizontalScrollView.addView(colorLayout);
+		builder.setView(horizontalScrollView).setNegativeButton("关闭", null).show();
+	}
+
+    // ====================== 点击事件实现（统一处理，逻辑清晰） ======================
+    @Override
+    public void onClick(View v) {
+		//ToastUtils.show("onClick");
+        int id = v.getId();
+        // 关键：所有点击事件均加判断（避免并发冲突/重复触发）
+        if (!isAppSelfUpdatingColor) {
+            if (id == R.id.iv_color_picker) {
+                showSystemColorPicker(); // 打开系统颜色选择器
+            } if (id == R.id.iv_color_scaler) {
+				//ToastUtils.show("iv_color_scale");
+                openColorScalerDialog(mCurrentColor); // 打开系统颜色选择器
+            } else if (id == R.id.tv_confirm) {
+                mListener.onColorSelected(mCurrentColor); // 确认选择，回调颜色
+                LogUtils.d(TAG, "confirm color | 回调颜色：" + String.format("#%08X", mCurrentColor));
+                dismiss();
+            } else if (id == R.id.tv_cancel) {
+                dismiss(); // 取消，关闭对话框
+                LogUtils.d(TAG, "cancel color | 取消选择，关闭对话框");
+            } else if (id == R.id.tv_brightness_minus) {
+                decreaseBrightness(); // 减少亮度
+            } else if (id == R.id.tv_brightness_plus) {
+                increaseBrightness(); // 增加亮度
+            }
+        }
+    }
+
+	void openColorScalerDialog(int nColor) {
+		//ToastUtils.show("openColorPickerDialog");
+		final ColorScalerDialog dlg = new ColorScalerDialog(getContext(), nColor);
+		dlg.setOnColorChangedListener(new com.a4455jkjh.colorpicker.view.OnColorChangedListener() {
+
+				@Override
+				public void beforeColorChanged() {
+				}
+
+				@Override
+				public void onColorChanged(int color) {
+					dlg.currentColorScalerDialogColor = color;
+				}
+
+				@Override
+				public void afterColorChanged() {
+
+				}
+
+
+			});
+		dlg.show();
+	}
+
+    class ColorScalerDialog extends ColorPickerDialog {
+		public int currentColorScalerDialogColor = 0;
+		public ColorScalerDialog(Context context, int p) {
+			super(context, p);
+		}
+
+		@Override
+		public void dismiss() {
+			super.dismiss();
+			int color = currentColorScalerDialogColor;
+			ToastUtils.show(String.format("dismiss color %d", color));
+			if (!isAppSelfUpdatingColor) {
+							isAppSelfUpdatingColor = true;
+							try {
+								mOriginalAlpha = Color.alpha(color);
+								mOriginalAlphaPercent = alpha2Percent(mOriginalAlpha);
+								mOriginalR = Color.red(color);
+								mOriginalG = Color.green(color);
+								mOriginalB = Color.blue(color);
+								mCurrentAlpha = mOriginalAlpha;
+								mCurrentAlphaPercent = mOriginalAlphaPercent;
+								mCurrentR = mOriginalR;
+								mCurrentG = mOriginalG;
+								mCurrentB = mOriginalB;
+								mCurrentBrightnessPercent = DEFAULT_BRIGHTNESS;
+								mCurrentColor = color;
+								updateAllViews();
+								LogUtils.d(TAG, "select system color | 选择颜色：" + String.format("#%08X", color)
+										   + " | 透明度：" + mCurrentAlphaPercent + "%");
+							} finally {
+								isAppSelfUpdatingColor = false;
+							}
+						}
+		}
+	}
+}
+

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

@@ -15,11 +15,12 @@ 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.utils.PictureUtils;
 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>
@@ -41,15 +42,17 @@ public class NetworkBackgroundDialog extends AlertDialog {
     private Button btnConfirm;
     private Button btnPreview;
     private EditText etURL;
-    BackgroundView bvBackgroundPreview;
+    BackgroundView mBackgroundView;
     Context mContext;
     // 主线程 Handler，用于接收子线程消息并更新 UI
     private Handler mUiHandler;
-	String previewFilePath;
+	String mPreviewFilePath;
+	String mPreviewFileUrl;
+	String mDownloadSavedPath;
 
     // 按钮点击回调接口（Java7 接口实现）
     public interface OnDialogClickListener {
-        void onConfirm(); // 确认按钮点击
+        void onConfirm(String szConfirmFilePath, String previewFileUrl); // 确认按钮点击
         void onCancel();  // 取消按钮点击
     }
 
@@ -87,12 +90,12 @@ public class NetworkBackgroundDialog extends AlertDialog {
                 switch (msg.what) {
                     case MSG_IMAGE_LOAD_SUCCESS:
                         // 图片加载成功，获取文件路径并设置背景
-                        String filePath = (String) msg.obj;
-                        setBackgroundFromPath(filePath);
+                        mDownloadSavedPath = (String) msg.obj;
+						previewBackground(mDownloadSavedPath);
                         break;
                     case MSG_IMAGE_LOAD_FAILED:
                         // 图片加载失败，设置默认背景
-                        bvBackgroundPreview.setBackgroundResource(R.drawable.ic_launcher);
+                        mBackgroundView.setBackgroundResource(R.drawable.ic_launcher);
                         ToastUtils.show("图片预览失败，请检查链接");
                         break;
                 }
@@ -134,8 +137,9 @@ public class NetworkBackgroundDialog extends AlertDialog {
         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);
-
+        mBackgroundView = (BackgroundView) dialogView.findViewById(R.id.bv_background_preview);
+		// 加载初始图片
+		mBackgroundView.setBackgroundResource(R.drawable.ic_launcher);
         // 设置按钮点击事件
         setButtonClickListeners();
     }
@@ -149,6 +153,9 @@ public class NetworkBackgroundDialog extends AlertDialog {
 				@Override
 				public void onClick(View v) {
 					LogUtils.d("NetworkBackgroundDialog", "取消按钮点击");
+					BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(mContext);
+					utils.setCurrentSourceToPreview();
+
 					dismiss(); // 关闭对话框
 					if (listener != null) {
 						listener.onCancel();
@@ -162,11 +169,12 @@ public class NetworkBackgroundDialog extends AlertDialog {
 				public void onClick(View v) {
 					LogUtils.d("NetworkBackgroundDialog", "确认按钮点击");
 					// 确定预览背景资源
-					bvBackgroundPreview.saveToBackgroundSources(previewFilePath);
+					BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(mContext);
+					utils.saveFileToPreviewBean(new File(mPreviewFilePath), mPreviewFileUrl);
 
 					dismiss(); // 关闭对话框
 					if (listener != null) {
-						listener.onConfirm();
+						listener.onConfirm(mPreviewFilePath, mPreviewFileUrl);
 					}
 				}
 			});
@@ -175,14 +183,7 @@ public class NetworkBackgroundDialog extends AlertDialog {
         btnPreview.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					LogUtils.d("NetworkBackgroundDialog", "确认预览点击");
 					downloadImageToAlbumAndPreview();
-					/*String url = etURL.getText().toString().trim();
-					 if (url.isEmpty()) {
-					 ToastUtils.show("请输入图片链接");
-					 return;
-					 }
-					 ImageDownloader.getInstance(mContext).downloadImage(url, mDownloadCallback);*/
 				}
 			});
     }
@@ -191,26 +192,25 @@ public class NetworkBackgroundDialog extends AlertDialog {
      * 根据文件路径设置 BackgroundView 背景（主线程调用）
      * @param filePath 图片文件路径
      */
-    private void setBackgroundFromPath(String filePath) {
+    private void previewBackground(String previewFilePath) {
         FileInputStream fis = null;
         try {
-            File imageFile = new File(filePath);
+            File imageFile = new File(previewFilePath);
             if (!imageFile.exists()) {
-                LogUtils.e(TAG, "图片文件不存在：" + filePath);
-				ToastUtils.show("Test");
-                //bvBackgroundPreview.setBackgroundResource(R.drawable.ic_launcher);
+				ToastUtils.show("图片文件不存在：" + previewFilePath);
+                LogUtils.e(TAG, "图片文件不存在：" + previewFilePath);
+				mBackgroundView.setBackgroundResource(R.drawable.ic_launcher);
                 return;
             }
 
 			// 预览背景
-			previewFilePath = filePath;
-            bvBackgroundPreview.previewBackgroundImage(previewFilePath);
-
-            LogUtils.d(TAG, "图片预览成功：" + filePath);
-
+			mPreviewFilePath = previewFilePath;
+			BackgroundSourceUtils utils = BackgroundSourceUtils.getInstance(mContext);
+			utils.saveFileToPreviewBean(new File(mPreviewFilePath), mPreviewFileUrl);
+			mBackgroundView.loadBackgroundBean(utils.getPreviewBackgroundBean());
         } catch (Exception e) {
             e.printStackTrace();
-            bvBackgroundPreview.setBackgroundResource(R.drawable.ic_launcher);
+            mBackgroundView.setBackgroundResource(R.drawable.ic_launcher);
             LogUtils.e(TAG, "图片预览失败：" + e.getMessage());
         } finally {
             // Java7 手动关闭流，避免资源泄漏
@@ -249,40 +249,20 @@ public class NetworkBackgroundDialog extends AlertDialog {
         this.listener = listener;
     }
 
-    /*ImageDownloader.DownloadCallback mDownloadCallback = new ImageDownloader.DownloadCallback() {
-	 @Override
-	 public void onSuccess(String filePath) {
-	 ToastUtils.show("图片下载成功：" + filePath);
-	 LogUtils.d(TAG, filePath);
-	 // 发送消息到主线程，携带图片路径
-	 Message successMsg = mUiHandler.obtainMessage(MSG_IMAGE_LOAD_SUCCESS, filePath);
-	 mUiHandler.sendMessage(successMsg);
-	 }
-
-	 @Override
-	 public void onFailure(String errorMsg) {
-	 ToastUtils.show("下载失败：" + errorMsg);
-	 LogUtils.e(TAG, errorMsg);
-	 // 发送图片加载失败消息
-	 mUiHandler.sendEmptyMessage(MSG_IMAGE_LOAD_FAILED);
-	 }
-	 };*/
-
 	void downloadImageToAlbumAndPreview() {
-		//String imgUrl = "https://example.com/test.jpg";
-		String imgUrl = etURL.getText().toString();
-		PictureUtils.downloadImageToAlbum(mContext, imgUrl, new PictureUtils.DownloadCallback(){
+		//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) {
-					ToastUtils.show("下载成功：" + savePath);
 					// 发送消息到主线程，携带图片路径
 					Message successMsg = mUiHandler.obtainMessage(MSG_IMAGE_LOAD_SUCCESS, savePath);
 					mUiHandler.sendMessage(successMsg);
 				}
 
 				@Override
-				public void onFailure(Exception e) {
-					ToastUtils.show("下载失败：" + e.getMessage());
+				public void onFailure(String errorMsg) {
+					ToastUtils.show("下载失败：" + errorMsg);
 				}
 			});
 

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

@@ -19,8 +19,11 @@ 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.PixelPickerActivity;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
+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;
@@ -30,328 +33,8 @@ public class MainViewFragment extends Fragment {
 
     public static final String TAG = "MainViewFragment";
 
-    public static final int MSG_RELOAD_APPCONFIG = 0;
-    public static final int MSG_CURRENTVALUEBATTERY = 1;
-
-    static MainViewFragment _mMainViewFragment;
-    AppConfigUtils mAppConfigUtils;
-    View mView;
-    Drawable mDrawableFrame;
-    LinearLayout mllLeftSeekBar;
-    LinearLayout mllRightSeekBar;
-    CheckBox mcbIsEnableChargeReminder;
-    CheckBox mcbIsEnableUsegeReminder;
-    Switch mswIsEnableService;
-    TextView mtvTips;
-
-    // 背景布局
-    //LinearLayout mLinearLayoutloadBackground;
-
-    // 现在电量图示
-    BatteryDrawable mCurrentValueBatteryDrawable;
-    // 现在充电提醒电量图示
-    BatteryDrawable mChargeReminderValueBatteryDrawable;
-    // 现在耗电提醒电量图示
-    BatteryDrawable mUsegeReminderValueBatteryDrawable;
-
-    ImageView mCurrentValueBatteryImageView;
-    ImageView mChargeReminderValueBatteryImageView;
-    ImageView mUsegeReminderValueBatteryImageView;
-
-    VerticalSeekBar mChargeReminderSeekBar;
-    ChargeReminderSeekBarChangeListener mChargeReminderSeekBarChangeListener;
-    TextView mtvChargeReminderValue;
-
-
-    VerticalSeekBar mUsegeReminderSeekBar;
-    UsegeReminderSeekBarChangeListener mUsegeReminderSeekBarChangeListener;
-    TextView mtvUsegeReminderValue;
-    CheckBox mcbUsegeReminderValue;
-    TextView mtvCurrentValue;
-	BackgroundView bvPreviewBackground;
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        mView = inflater.inflate(R.layout.fragment_mainview, container, false);
-        _mMainViewFragment = MainViewFragment.this;
-        mAppConfigUtils = App.getAppConfigUtils(getActivity());
-
-        // 获取指定ID的View实例
-	    bvPreviewBackground = mView.findViewById(R.id.fragmentmainviewBackgroundView1);
-        /*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();
-
-		 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);
-        mllRightSeekBar = (LinearLayout) mView.findViewById(R.id.fragmentmainviewLinearLayout2);
-
-        // 初始化充电电量提醒设置控件
-        mtvChargeReminderValue = (TextView) mView.findViewById(R.id.fragmentandroidviewTextView2);
-        mChargeReminderSeekBar = (VerticalSeekBar) mView.findViewById(R.id.fragmentandroidviewVerticalSeekBar1);
-        mcbIsEnableChargeReminder = mView.findViewById(R.id.fragmentmainviewCheckBox1);
-
-        // 初始化耗电电量提醒设置控件
-        mtvUsegeReminderValue = (TextView) mView.findViewById(R.id.fragmentandroidviewTextView3);
-        mUsegeReminderSeekBar = (VerticalSeekBar) mView.findViewById(R.id.fragmentandroidviewVerticalSeekBar2);
-        mcbIsEnableUsegeReminder = mView.findViewById(R.id.fragmentmainviewCheckBox2);
-
-        // 初始化现在电量显示控件
-        mtvCurrentValue = (TextView) mView.findViewById(R.id.fragmentandroidviewTextView4);
-
-        // 初始化服务总开关
-        mswIsEnableService = (Switch) mView.findViewById(R.id.fragmentandroidviewSwitch1);
-        mtvTips = mView.findViewById(R.id.fragmentandroidviewTextView1);
-
-        // 设置视图显示数据
-        setViewData();
-        // 设置视图控件响应
-        setViewListener();
-
-        // 注册一个广播接收
-        //mMainActivityReceiver = new MainActivityReceiver(this);
-        //mMainActivityReceiver.registerAction();
-
-        // 启动的时候检查一下服务
-        if (mAppConfigUtils.getIsEnableService()
-            && ServiceUtils.isServiceAlive(getActivity(), ControlCenterService.class.getName()) == false) {
-            // 如果配置了服务启动，服务没有启动
-            // 就启动服务
-            Intent intent = new Intent(getActivity(), ControlCenterService.class);
-            getActivity().startForegroundService(intent);
-        }
-
-        return mView;
-    }
-
-    void setViewData() {
-        int nChargeReminderValue = mAppConfigUtils.getChargeReminderValue();
-        int nUsegeReminderValue = mAppConfigUtils.getUsegeReminderValue();
-        int nCurrentValue = mAppConfigUtils.getCurrentValue();
-
-        mllLeftSeekBar.setBackground(mDrawableFrame);
-        mllRightSeekBar.setBackground(mDrawableFrame);
-
-        // 初始化电量图
-        mCurrentValueBatteryDrawable = new BatteryDrawable(getActivity().getColor(R.color.colorCurrent));
-        mCurrentValueBatteryDrawable.setValue(mAppConfigUtils.getCurrentValue());
-        mCurrentValueBatteryImageView = mView.findViewById(R.id.fragmentandroidviewImageView1);
-        mCurrentValueBatteryImageView.setImageDrawable(mCurrentValueBatteryDrawable);
-
-        // 初始化充电电量提醒图
-        mChargeReminderValueBatteryDrawable = new BatteryDrawable(getActivity().getColor(R.color.colorCharge));
-        mChargeReminderValueBatteryDrawable.setValue(nChargeReminderValue);
-        mChargeReminderValueBatteryImageView = mView.findViewById(R.id.fragmentandroidviewImageView3);
-        mChargeReminderValueBatteryImageView.setImageDrawable(mChargeReminderValueBatteryDrawable);
-
-        // 初始化耗电电量提醒图
-        mUsegeReminderValueBatteryDrawable = new BatteryDrawable(getActivity().getColor(R.color.colorUsege));
-        mUsegeReminderValueBatteryDrawable.setValue(nUsegeReminderValue);
-        mUsegeReminderValueBatteryImageView = mView.findViewById(R.id.fragmentandroidviewImageView2);
-        mUsegeReminderValueBatteryImageView.setImageDrawable(mUsegeReminderValueBatteryDrawable);
-
-        // 初始化充电电量提醒设置控件
-        mtvChargeReminderValue.setTextColor(getActivity().getColor(R.color.colorCharge));
-        //LogUtils.d(TAG, "Color.YELLOW is " + Integer.toString(mApplication.getColor(R.color.colorCharge)));
-        mtvChargeReminderValue.setText(Integer.toString(nChargeReminderValue) + "%");
-        mChargeReminderSeekBar.setProgress(nChargeReminderValue);
-        mcbIsEnableChargeReminder.setChecked(mAppConfigUtils.getIsEnableChargeReminder());
-
-        // 初始化耗电电量提醒设置控件
-        mtvUsegeReminderValue.setTextColor(getActivity().getColor(R.color.colorUsege));
-        mtvUsegeReminderValue.setText(Integer.toString(nUsegeReminderValue) + "%");
-        mUsegeReminderSeekBar.setProgress(nUsegeReminderValue);
-        mcbIsEnableUsegeReminder.setChecked(mAppConfigUtils.getIsEnableUsegeReminder());
-
-        // 初始化现在电量显示控件
-        mtvCurrentValue.setTextColor(getActivity().getColor(R.color.colorCurrent));
-        mtvCurrentValue.setText(Integer.toString(nCurrentValue) + "%");
-
-        // 初始化服务总开关
-        mswIsEnableService.setChecked(mAppConfigUtils.getIsEnableService());
-        if (mAppConfigUtils.getIsEnableService()) {
-            //LogUtils.d(TAG, "mApplication.getIsEnableService() " + Boolean.toString(mAppConfigUtils.getIsEnableService()));
-            ControlCenterService.startControlCenterService(getActivity());
-        } else {
-            //LogUtils.d(TAG, "mApplication.getIsEnableService() " + Boolean.toString(mAppConfigUtils.getIsEnableService()));
-            ControlCenterService.stopControlCenterService(getActivity());
-        }
-        mswIsEnableService.setText(getString(R.string.txt_aboveswitch));
-        mtvTips.setText(getString(R.string.txt_aboveswitchtips));
-
-    }
-
-    void setViewListener() {
-        // 初始化充电电量提醒设置控件
-        mChargeReminderSeekBarChangeListener = new ChargeReminderSeekBarChangeListener();
-        mChargeReminderSeekBar.setOnSeekBarChangeListener(mChargeReminderSeekBarChangeListener);
-        mcbIsEnableChargeReminder.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LogUtils.d(TAG, "setIsEnableChargeReminder");
-                    mAppConfigUtils.setIsEnableChargeReminder(mcbIsEnableChargeReminder.isChecked());
-                    //ControlCenterService.updateIsEnableChargeReminder(mcbIsEnableChargeReminder.isChecked());
-                }
-            });
-
-
-        // 初始化耗电电量提醒设置控件
-        mUsegeReminderSeekBarChangeListener = new UsegeReminderSeekBarChangeListener();
-        mUsegeReminderSeekBar.setOnSeekBarChangeListener(mUsegeReminderSeekBarChangeListener);
-        mcbIsEnableUsegeReminder.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LogUtils.d(TAG, "setIsEnableUsegeReminder");
-                    mAppConfigUtils.setIsEnableUsegeReminder(mcbIsEnableUsegeReminder.isChecked());
-                    //ControlCenterService.updateIsEnableUsegeReminder(mcbIsEnableUsegeReminder.isChecked());
-                }
-            });
-
-        // 初始化服务总开关
-        mswIsEnableService.setOnClickListener(new CompoundButton.OnClickListener() {
-
-                @Override
-                public void onClick(View view) {
-                    mAppConfigUtils.setIsEnableService(getActivity(), mswIsEnableService.isChecked());
-                }
-            });
-    }
-
-    void setCurrentValueBattery(int value) {
-        //LogUtils.d(TAG, "setCurrentValueBattery");
-        mtvCurrentValue.setText(Integer.toString(value) + "%");
-        mCurrentValueBatteryDrawable.setValue(value);
-        mCurrentValueBatteryDrawable.invalidateSelf();
-    }
-
-    class ChargeReminderSeekBarChangeListener implements SeekBar.OnSeekBarChangeListener {
-
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            //LogUtils.d(TAG, "call onProgressChanged");
-            int nChargeReminderValue = progress;
-            mtvChargeReminderValue.setText(Integer.toString(nChargeReminderValue) + "%");
-            mChargeReminderValueBatteryDrawable.setValue(nChargeReminderValue);
-            mChargeReminderValueBatteryDrawable.invalidateSelf();
-        }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) {
-            //LogUtils.d(TAG, "call onStartTrackingTouch");
-        }
-
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            //LogUtils.d(TAG, "call onStopTrackingTouch");
-            //取得当前进度条的刻度
-            int nChargeReminderValue = ((VerticalSeekBar)seekBar)._mnProgress;
-
-            mAppConfigUtils.setChargeReminderValue(nChargeReminderValue);
-            mtvChargeReminderValue.setText(Integer.toString(nChargeReminderValue) + "%");
-            //ControlCenterService.updateChargeReminderValue(nChargeReminderValue);
-        }
-    }
-
-    class UsegeReminderSeekBarChangeListener implements SeekBar.OnSeekBarChangeListener {
-
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            //LogUtils.d(TAG, "call onProgressChanged");
-            int nUsegeReminderValue = progress;
-            mtvUsegeReminderValue.setText(Integer.toString(nUsegeReminderValue) + "%");
-            mUsegeReminderValueBatteryDrawable.setValue(nUsegeReminderValue);
-            mUsegeReminderValueBatteryDrawable.invalidateSelf();
-
-        }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) {
-            //LogUtils.d(TAG, "call onStartTrackingTouch");
-        }
-
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            //LogUtils.d(TAG, "call onStopTrackingTouch");
-            //取得当前进度条的刻度
-            int nUsegeReminderValue = ((VerticalSeekBar)seekBar)._mnProgress;
-            LogUtils.d(TAG, "nUsegeReminderValue is " + Integer.toString(nUsegeReminderValue));
-            //LogUtils.d(TAG, "mPowerReminder is " + mApplication);
-            mAppConfigUtils.setUsegeReminderValue(nUsegeReminderValue);
-            //LogUtils.d(TAG, "opopopopopopopop");
-            mtvUsegeReminderValue.setText(Integer.toString(nUsegeReminderValue) + "%");
-            //ControlCenterService.updateUsegeReminderValue(nUsegeReminderValue);
-        }
-    }
-
-    public void reloadBackground() {
-		bvPreviewBackground.reloadBackgroundImage();
-//        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(){
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_RELOAD_APPCONFIG : {
-                        setViewData();
-                        break;
-                    }
-                case MSG_CURRENTVALUEBATTERY : {
-                        setCurrentValueBattery(msg.arg1);
-                        break;
-                    }
-            }
-            super.handleMessage(msg);
-        }
-
-    };
-
-    public static void relaodAppConfigs() {
-        if (_mMainViewFragment != null) {
-            Handler handler = _mMainViewFragment.mHandler;
-            handler.sendMessage(handler.obtainMessage(MSG_RELOAD_APPCONFIG));
-        }
-    }
-
-    public static void sendMsgCurrentValueBattery(int value) {
-        if (_mMainViewFragment != null) {
-            Handler handler = _mMainViewFragment.mHandler;
-            Message msg = handler.obtainMessage(MSG_CURRENTVALUEBATTERY);
-            msg.arg1 = value;
-            handler.sendMessage(msg);
-        }
-    }
+    
+    
 }
     
     

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

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

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

@@ -0,0 +1,255 @@
+package cc.winboll.studio.powerbell.models;
+
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+import java.io.Serializable;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2024/07/18 11:52:28
+ * @Describe 应用背景图片数据类（存储正式/预览背景配置，支持JSON序列化/反序列化）
+ */
+public class BackgroundBean extends BaseBean implements Serializable {
+
+    public static final String TAG = "BackgroundPictureBean";
+
+    // 核心字段：背景图片文件名（对应应用私有目录下的图片文件，与BackgroundSettingsActivity的_mSourceCroppedFile匹配）
+    private String backgroundFileName = "";
+    // 核心字段：背景图片完整路径（解决仅存文件名导致的路径拼接错误，与backgroundScaledCompressFilePath对应）
+    private String backgroundFilePath = "";
+    // 附加字段：图片信息（如Uri、网络地址等，仅作备注，不参与路径生成）
+    private String backgroundFileInfo = "";
+    // 控制字段：是否启用背景图片（true-显示背景图，false-显示透明背景）
+    private boolean isUseBackgroundFile = false;
+    // 核心字段：压缩后背景图片文件名（对应应用私有目录下的压缩图片，与saveCropBitmap的压缩图匹配）
+    private String backgroundScaledCompressFileName = "";
+    // 核心字段：压缩后背景图片完整路径（解决仅存文件名导致的路径拼接错误，适配BackgroundSettingsActivity的私有目录）
+    private String backgroundScaledCompressFilePath = "";
+    // 重命名字段：是否启用压缩背景图（原isUseScaledCompress → 新isUseBackgroundScaledCompressFile，语义更清晰）
+    private boolean isUseBackgroundScaledCompressFile = false;
+    // 裁剪比例字段：背景图宽高比（默认1:1，用于固定比例裁剪）
+    private int backgroundWidth = 100;
+    private int backgroundHeight = 100;
+    // 像素拾取字段：拾取的像素颜色（用于纯色背景）
+    private int pixelColor = 0;
+
+    /**
+     * 无参构造器（必须，JSON反序列化时需默认构造器）
+     */
+    public BackgroundBean() {
+    }
+
+    // ====================================== Getter/Setter 方法（全字段，含重命名+新增字段）======================================
+    public String getBackgroundFileName() {
+        return backgroundFileName;
+    }
+
+    public void setBackgroundFileName(String backgroundFileName) {
+        this.backgroundFileName = backgroundFileName == null ? "" : backgroundFileName; // 防null，避免空指针
+    }
+
+    public String getBackgroundFilePath() {
+        return backgroundFilePath;
+    }
+
+    public void setBackgroundFilePath(String backgroundFilePath) {
+        this.backgroundFilePath = backgroundFilePath == null ? "" : backgroundFilePath; // 防null，避免路径拼接错误
+    }
+
+    public String getBackgroundFileInfo() {
+        return backgroundFileInfo;
+    }
+
+    public void setBackgroundFileInfo(String backgroundFileInfo) {
+        this.backgroundFileInfo = backgroundFileInfo == null ? "" : backgroundFileInfo; // 防null，避免空指针
+    }
+
+    public boolean isUseBackgroundFile() {
+        return isUseBackgroundFile;
+    }
+
+    public void setIsUseBackgroundFile(boolean isUseBackgroundFile) {
+        this.isUseBackgroundFile = isUseBackgroundFile;
+    }
+
+    public String getBackgroundScaledCompressFileName() {
+        return backgroundScaledCompressFileName;
+    }
+
+    public void setBackgroundScaledCompressFileName(String backgroundScaledCompressFileName) {
+        this.backgroundScaledCompressFileName = backgroundScaledCompressFileName == null ? "" : backgroundScaledCompressFileName; // 防null
+    }
+
+    public String getBackgroundScaledCompressFilePath() {
+        return backgroundScaledCompressFilePath;
+    }
+
+    public void setBackgroundScaledCompressFilePath(String backgroundScaledCompressFilePath) {
+        this.backgroundScaledCompressFilePath = backgroundScaledCompressFilePath == null ? "" : backgroundScaledCompressFilePath; // 防null，避免路径错误
+    }
+
+    /**
+     * 重命名：原isUseScaledCompress → 新isUseBackgroundScaledCompressFile（Getter/Setter同步修改）
+     * 语义：明确表示“是否启用背景压缩图文件”，避免与其他压缩逻辑混淆
+     */
+    public boolean isUseBackgroundScaledCompressFile() {
+        return isUseBackgroundScaledCompressFile;
+    }
+
+    public void setIsUseBackgroundScaledCompressFile(boolean isUseBackgroundScaledCompressFile) {
+        this.isUseBackgroundScaledCompressFile = isUseBackgroundScaledCompressFile;
+    }
+
+    public int getBackgroundWidth() {
+        return backgroundWidth;
+    }
+
+    public void setBackgroundWidth(int backgroundWidth) {
+        this.backgroundWidth = backgroundWidth <= 0 ? 100 : backgroundWidth; // 防无效值，确保宽高比有效
+    }
+
+    public int getBackgroundHeight() {
+        return backgroundHeight;
+    }
+
+    public void setBackgroundHeight(int backgroundHeight) {
+        this.backgroundHeight = backgroundHeight <= 0 ? 100 : backgroundHeight; // 防无效值，确保宽高比有效
+    }
+
+    public int getPixelColor() {
+        return pixelColor;
+    }
+
+    public void setPixelColor(int pixelColor) {
+        this.pixelColor = pixelColor;
+    }
+
+    // ====================================== 序列化/反序列化方法（适配重命名字段，兼容旧版本）======================================
+    @Override
+    public String getName() {
+        return BackgroundBean.class.getName(); // 必须重写，BaseBean序列化时需类名标识
+    }
+
+    /**
+     * 序列化：同步重命名字段（原isUseScaledCompress → 新isUseBackgroundScaledCompressFile）
+     * 确保新字段能正常持久化，同时兼容旧版本JSON（可选：保留旧字段写入，避免旧版本读取异常）
+     */
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        BackgroundBean bean = this;
+        jsonWriter.name("backgroundFileName").value(bean.getBackgroundFileName());
+        jsonWriter.name("backgroundFilePath").value(bean.getBackgroundFilePath()); // 新增字段：背景原图完整路径
+        jsonWriter.name("backgroundFileInfo").value(bean.getBackgroundFileInfo());
+        jsonWriter.name("isUseBackgroundFile").value(bean.isUseBackgroundFile());
+        jsonWriter.name("backgroundScaledCompressFileName").value(bean.getBackgroundScaledCompressFileName());
+        jsonWriter.name("backgroundScaledCompressFilePath").value(bean.getBackgroundScaledCompressFilePath());
+        // 关键：新字段序列化（核心）
+        jsonWriter.name("isUseBackgroundScaledCompressFile").value(bean.isUseBackgroundScaledCompressFile());
+        // 兼容旧版本：保留旧字段名写入（可选，避免旧版本Bean读取时缺失字段）
+        jsonWriter.name("isUseScaledCompress").value(bean.isUseBackgroundScaledCompressFile());
+        jsonWriter.name("backgroundWidth").value(bean.getBackgroundWidth());
+        jsonWriter.name("backgroundHeight").value(bean.getBackgroundHeight());
+        jsonWriter.name("pixelColor").value(bean.getPixelColor());
+    }
+
+    /**
+     * 反序列化：同步处理重命名字段（兼容旧版本JSON，新旧字段都能读取）
+     * 逻辑：优先读取新字段，若新字段不存在则读取旧字段（确保升级后旧配置仍有效）
+     */
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        BackgroundBean bean = new BackgroundBean();
+        jsonReader.beginObject();
+        // 临时变量：存储旧字段值（用于兼容）
+        boolean tempUseScaledCompress = false;
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            switch (name) {
+                case "backgroundFileName":
+                    bean.setBackgroundFileName(jsonReader.nextString());
+                    break;
+                case "backgroundFilePath":
+                    bean.setBackgroundFilePath(jsonReader.nextString()); // 新增字段：读取背景原图完整路径
+                    break;
+                case "backgroundFileInfo":
+                    bean.setBackgroundFileInfo(jsonReader.nextString());
+                    break;
+                case "isUseBackgroundFile":
+                    bean.setIsUseBackgroundFile(jsonReader.nextBoolean());
+                    break;
+                case "backgroundScaledCompressFileName":
+                    bean.setBackgroundScaledCompressFileName(jsonReader.nextString());
+                    break;
+                case "backgroundScaledCompressFilePath":
+                    bean.setBackgroundScaledCompressFilePath(jsonReader.nextString());
+                    break;
+					// 关键：读取新字段（优先）
+                case "isUseBackgroundScaledCompressFile":
+                    bean.setIsUseBackgroundScaledCompressFile(jsonReader.nextBoolean());
+                    break;
+					// 兼容旧版本：读取旧字段（若新字段未读取，则用旧字段值）
+                case "isUseScaledCompress":
+                    tempUseScaledCompress = jsonReader.nextBoolean();
+                    break;
+                case "backgroundWidth":
+                    bean.setBackgroundWidth(jsonReader.nextInt());
+                    break;
+                case "backgroundHeight":
+                    bean.setBackgroundHeight(jsonReader.nextInt());
+                    break;
+                case "pixelColor":
+                    bean.setPixelColor(jsonReader.nextInt());
+                    break;
+                default:
+                    jsonReader.skipValue(); // 跳过未知字段，兼容旧版本Bean（避免崩溃）
+                    break;
+            }
+        }
+        jsonReader.endObject();
+        // 兼容逻辑：若新字段未被赋值（旧版本JSON无此字段），则用旧字段值填充
+        if (!jsonReader.toString().contains("isUseBackgroundScaledCompressFile")) {
+            bean.setIsUseBackgroundScaledCompressFile(tempUseScaledCompress);
+        }
+        return bean;
+    }
+
+    // ====================================== 辅助方法（同步更新重命名字段）======================================
+    /**
+     * 重置背景配置（适配“取消背景”功能，同步重置重命名字段）
+     */
+    public void resetBackgroundConfig() {
+        this.backgroundFileName = "";
+        this.backgroundFilePath = ""; // 新增：重置背景原图完整路径
+        this.backgroundScaledCompressFileName = "";
+        this.backgroundScaledCompressFilePath = "";
+        this.backgroundFileInfo = "";
+        this.isUseBackgroundFile = false;
+        this.isUseBackgroundScaledCompressFile = false; // 重命名字段：重置为false
+        this.backgroundWidth = 100;
+        this.backgroundHeight = 100;
+    }
+
+    /**
+     * 检查背景配置是否有效（适配BackgroundSettingsActivity的预览/保存校验）
+     * 同步使用重命名字段判断压缩图是否启用
+     * @return true-配置有效（可显示背景图），false-配置无效
+     */
+    public boolean isBackgroundConfigValid() {
+        // 启用背景图时，需确保：原图路径/文件名 或 压缩图路径/文件名 非空
+        if (!isUseBackgroundFile) {
+            return false;
+        }
+        // 原图校验：路径非空 或 文件名非空
+        boolean isOriginalValid = !backgroundFilePath.isEmpty() || !backgroundFileName.isEmpty();
+        // 压缩图校验：启用压缩图时，路径/文件名需非空
+        boolean isCompressValid = true;
+        if (isUseBackgroundScaledCompressFile()) { // 重命名字段：判断是否启用压缩图
+            isCompressValid = !backgroundScaledCompressFilePath.isEmpty() || !backgroundScaledCompressFileName.isEmpty();
+        }
+        // 逻辑：启用压缩图则需压缩图有效；不启用压缩图则需原图有效
+        return isUseBackgroundScaledCompressFile() ? isCompressValid : isOriginalValid;
+    }
+}

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

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

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

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

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

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

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

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

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.models.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/receivers/GlobalApplicationReceiver.java

@@ -5,10 +5,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import cc.winboll.studio.powerbell.App;
-import cc.winboll.studio.powerbell.fragments.MainViewFragment;
+import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.BatteryUtils;
-import cc.winboll.studio.powerbell.utils.NotificationHelper;
 
 public class GlobalApplicationReceiver extends BroadcastReceiver {
 
@@ -48,7 +47,7 @@ public class GlobalApplicationReceiver extends BroadcastReceiver {
                 //NotificationHelper.cancelRemindNotification(context);
                 
                 App.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity);
-                MainViewFragment.sendMsgCurrentValueBattery(nTheQuantityOfElectricity);
+                MainActivity.sendMsgCurrentValueBattery(nTheQuantityOfElectricity);
                 // 保存好新的电池状态标志
                 _mIsCharging = isCharging;
                 _mnTheQuantityOfElectricityOld = nTheQuantityOfElectricity;

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

@@ -23,15 +23,15 @@ 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.handlers.ControlCenterServiceHandler;
+import cc.winboll.studio.powerbell.models.AppConfigBean;
+import cc.winboll.studio.powerbell.models.NotificationMessage;
 import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver;
 import cc.winboll.studio.powerbell.services.AssistantService;
 import cc.winboll.studio.powerbell.threads.RemindThread;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
-import cc.winboll.studio.powerbell.utils.NotificationHelper;
+import cc.winboll.studio.powerbell.utils.NotificationManagerUtils;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
 
@@ -48,7 +48,7 @@ public class ControlCenterService extends Service {
     AppConfigUtils mAppConfigUtils;
     AppCacheUtils mAppCacheUtils;
     // 前台服务通知工具
-    NotificationHelper mNotificationHelper;
+    NotificationManagerUtils mNotificationManagerUtils;
     Notification notification;
     RemindThread mRemindThread;
     ControlCenterServiceHandler mControlCenterServiceHandler;
@@ -72,7 +72,7 @@ public class ControlCenterService extends Service {
         isServiceRunning = false;
         mAppConfigUtils = App.getAppConfigUtils(this);
         mAppCacheUtils = App.getAppCacheUtils(this);
-        mNotificationHelper = new NotificationHelper(ControlCenterService.this);
+        mNotificationManagerUtils = new NotificationManagerUtils(ControlCenterService.this);
 
 
         if (mMyServiceConnection == null) {
@@ -101,10 +101,10 @@ public class ControlCenterService extends Service {
             wakeupAndBindAssistant();
             // 显示前台通知栏
             // 在Service中
-            NotificationHelper helper = new NotificationHelper(this);
-            Intent intent = new Intent(this, MainActivity.class);
-            notification = helper.showForegroundNotification(intent, getString(R.string.app_name), "Service Running, Click to open app");
-            startForeground(NotificationHelper.FOREGROUND_NOTIFICATION_ID, notification);
+            NotificationManagerUtils notificationManagerUtils = new NotificationManagerUtils(this);
+            //Intent intent = new Intent(this, MainActivity.class);
+            notificationManagerUtils.startForegroundServiceNotify(ControlCenterService.this, new NotificationMessage(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();
@@ -260,9 +260,9 @@ public class ControlCenterService extends Service {
         for (int i = 0; i < 20; i++) {
             msg += szRemindMSG;
         }
-        NotificationHelper helper = new NotificationHelper(ControlCenterService.this);
+        NotificationManagerUtils notificationManagerUtils = new NotificationManagerUtils(ControlCenterService.this);
         Intent intent = new Intent(ControlCenterService.this, MainActivity.class);
-        helper.showTemporaryNotification(intent, getString(R.string.app_name), msg);
+        notificationManagerUtils.showTempAlertNotify(getString(R.string.app_name), msg);
 
 
 

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

@@ -1,48 +0,0 @@
-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

@@ -1,39 +1,249 @@
 package cc.winboll.studio.powerbell.unittest;
 
+import android.content.Intent;
 import android.os.Bundle;
-import android.widget.FrameLayout;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.View;
+import android.widget.Button;
 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.LogUtils;
 import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
+import cc.winboll.studio.powerbell.utils.FileUtils;
+import cc.winboll.studio.powerbell.utils.ImageCropUtils;
+import cc.winboll.studio.powerbell.views.BackgroundView;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/19 18:04
- * @Describe 单元测试启动主页窗口
+ * 终极修复版：放弃FileProvider，直接用私有目录File路径，彻底解决UID冲突
  */
 public class MainUnitTestActivity extends AppCompatActivity {
-
+    // ====================== 常量定义 ======================
     public static final String TAG = "MainUnitTestActivity";
+    public static final int REQUEST_CROP_IMAGE = 0;
+    private static final String ASSETS_TEST_IMAGE_PATH = "unittest/unittest-miku.png";
 
+    // ====================== 成员变量（移除所有Uri相关） ======================
+    private BackgroundView mBackgroundView;
+    private String mAppPrivateDirPath;
+    private File mPrivateTestImageFile; // 仅用File，不用Uri
+    private File mPrivateCropImageFile;
+	BackgroundBean mPreviewBackgroundBean;
+
+    // ====================== 生命周期方法 ======================
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-		// 非调试状态就退出
-		if (!GlobalApplication.isDebugging()) {
-			finish();
-		}
-        setContentView(R.layout.activity_mainunittest);
+        LogUtils.d(TAG, "=== 页面 onCreate 启动 ===");
+
+        initBaseParams();
+        initViewAndEvent();
+        copyAssetsTestImageToPrivateDir();
+        //loadBackgroundByFile(); // 直接用File加载
+		mPreviewBackgroundBean = new BackgroundBean();
+		mPreviewBackgroundBean.setBackgroundFileName(mPrivateTestImageFile.getName());
+		mPreviewBackgroundBean.setBackgroundFilePath(mPrivateTestImageFile.getAbsolutePath());
+		mPreviewBackgroundBean.setBackgroundScaledCompressFileName(mPrivateCropImageFile.getName());
+		mPreviewBackgroundBean.setBackgroundScaledCompressFilePath(mPrivateCropImageFile.getAbsolutePath());
+		mPreviewBackgroundBean.setIsUseBackgroundFile(true);
+		doubleRefreshPreview();
 		
-		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));
+        ToastUtils.show("单元测试页面启动完成");
+        LogUtils.d(TAG, "=== 页面 onCreate 初始化结束 ===");
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        LogUtils.d(TAG, "=== onActivityResult 回调 ===");
+        if (requestCode == REQUEST_CROP_IMAGE) {
+            handleCropResult(resultCode);
+        }
+    }
+
+    // ====================== 初始化相关方法 ======================
+    private void initBaseParams() {
+        LogUtils.d(TAG, "初始化基础参数：工具类+私有目录+File");
+
+        // 私有目录（无需权限，无UID冲突）
+        mAppPrivateDirPath = getExternalFilesDir(Environment.DIRECTORY_PICTURES).getAbsolutePath() + "/PowerBellTest/";
+        File privateDir = new File(mAppPrivateDirPath);
+        if (!privateDir.exists()) {
+            privateDir.mkdirs();
+            LogUtils.d(TAG, "创建私有目录：" + mAppPrivateDirPath);
+        }
+
+        // 初始化File（无Uri）
+        File refFile = new File(ASSETS_TEST_IMAGE_PATH);
+        String uniqueTestName = FileUtils.createUniqueFileName(refFile) + ".png";
+        String uniqueCropName = uniqueTestName.replace(".png", "_crop.png");
+        mPrivateTestImageFile = new File(mAppPrivateDirPath, uniqueTestName);
+        mPrivateCropImageFile = new File(mAppPrivateDirPath, uniqueCropName);
+
+        LogUtils.d(TAG, "测试图File路径：" + mPrivateTestImageFile.getAbsolutePath());
+    }
+
+    private void initViewAndEvent() {
+        LogUtils.d(TAG, "初始化布局与控件事件");
+        setContentView(R.layout.activity_mainunittest);
+        mBackgroundView = (BackgroundView) findViewById(R.id.backgroundview);
+
+        // 跳转主页面按钮
+        Button btnMain = (Button) findViewById(R.id.btn_main_activity);
+        btnMain.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "点击按钮：跳转主页面");
+					startActivity(new Intent(MainUnitTestActivity.this, MainActivity.class));
+				}
+			});
+
+        // 裁剪按钮（直接用File路径启动，无Uri）
+        Button btnCrop = (Button) findViewById(R.id.btn_test_cropimage);
+        btnCrop.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					LogUtils.d(TAG, "点击按钮：启动裁剪（File路径版）");
+					ToastUtils.show("准备启动图片裁剪");
+
+					if (mPrivateTestImageFile.exists() && mPrivateTestImageFile.length() > 100) {
+						startCropTestByFile(); // 直接传File
+					} else {
+						ToastUtils.show("测试图片未准备好，重新拷贝");
+						copyAssetsTestImageToPrivateDir();
+					}
+				}
+			});
+    }
+
+    // 从assets拷贝图片（不变，确保File存在）
+    private void copyAssetsTestImageToPrivateDir() {
+        LogUtils.d(TAG, "开始拷贝assets图片到私有目录");
+        if (mPrivateTestImageFile.exists() && mPrivateTestImageFile.length() > 100) {
+            LogUtils.d(TAG, "图片已存在，无需拷贝");
+            return;
+        }
+
+        InputStream inputStream = null;
+        try {
+            inputStream = getAssets().open(ASSETS_TEST_IMAGE_PATH);
+            FileUtils.copyStreamToFile(inputStream, mPrivateTestImageFile);
+            LogUtils.d(TAG, "图片拷贝成功，大小：" + mPrivateTestImageFile.length() + "字节");
+        } catch (IOException e) {
+            LogUtils.e(TAG, "图片拷贝失败：" + e.getMessage(), e);
+            ToastUtils.show("图片准备失败");
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "关闭流失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    // ====================== 核心业务方法（全改为File路径） ======================
+    /** 直接用File路径加载背景图（无Uri，无冲突） */
+//    private void loadBackgroundByFile() {
+//        LogUtils.d(TAG, "开始加载背景图（File路径版）");
+//        if (mPrivateTestImageFile.exists() && mPrivateTestImageFile.length() > 100) {
+//            mBackgroundView.loadImage(mPrivateTestImageFile.getAbsolutePath()); // 直接传路径
+//            LogUtils.d(TAG, "背景图加载成功：" + mPrivateTestImageFile.getAbsolutePath());
+//            ToastUtils.show("背景图加载成功");
+//        } else {
+//            LogUtils.e(TAG, "背景图加载失败：文件无效");
+//            ToastUtils.show("背景图加载失败");
+//        }
+//    }
+
+    /** 直接用File启动裁剪（关键：调用ImageCropUtils的File重载方法） */
+    private void startCropTestByFile() {
+        LogUtils.d(TAG, "启动裁剪（File路径版），原图：" + mPrivateTestImageFile.getAbsolutePath());
+
+        // 确保输出目录存在
+        File cropParent = mPrivateCropImageFile.getParentFile();
+        if (!cropParent.exists()) {
+            cropParent.mkdirs();
+        }
+
+        // 调用ImageCropUtils的File参数方法（核心：绕开Uri）
+        ImageCropUtils.startImageCrop(
+            this,
+            mPrivateTestImageFile, // 原图File
+            mPrivateCropImageFile, // 输出File
+            0,
+            0,
+            true,
+            REQUEST_CROP_IMAGE
+        );
+
+        LogUtils.d(TAG, "裁剪请求已发送，输出路径：" + mPrivateCropImageFile.getAbsolutePath());
+        ToastUtils.show("已启动图片裁剪");
+    }
+
+    /** 处理裁剪结果（直接校验输出File） */
+    private void handleCropResult(int resultCode) {
+        LogUtils.d(TAG, "裁剪回调处理：resultCode=" + resultCode);
+        if (resultCode == RESULT_OK) {
+            if (mPrivateCropImageFile.exists() && mPrivateCropImageFile.length() > 100) {
+                mBackgroundView.loadImage(mPrivateCropImageFile.getAbsolutePath());
+                LogUtils.d(TAG, "裁剪成功，加载裁剪图：" + mPrivateCropImageFile.getAbsolutePath());
+                ToastUtils.show("裁剪成功");
+				mPreviewBackgroundBean.setIsUseBackgroundScaledCompressFile(true);
+				doubleRefreshPreview();
+            } else {
+                LogUtils.e(TAG, "裁剪成功但输出文件无效");
+                ToastUtils.show("裁剪失败：输出文件无效");
+            }
+        } else if (resultCode == RESULT_CANCELED) {
+            LogUtils.d(TAG, "裁剪取消");
+            ToastUtils.show("裁剪已取消");
+        } else {
+            LogUtils.e(TAG, "裁剪失败：resultCode异常");
+            ToastUtils.show("裁剪失败");
+        }
+    }
+	
+
+    /**
+     * 双重刷新预览，确保背景加载最新数据
+     * 移除：缓存清空逻辑
+     */
+    private void doubleRefreshPreview() {
+        
+        // 第一重刷新
+        try {
+            mBackgroundView.loadBackgroundBean(mPreviewBackgroundBean, true);
+			mBackgroundView.setBackgroundColor(mPreviewBackgroundBean.getPixelColor());
+            LogUtils.d(TAG, "【双重刷新】第一重完成");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【双重刷新】第一重异常：" + e.getMessage());
+            return;
+        }
+
+        // 第二重刷新（延迟执行）
+        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					if (mBackgroundView != null && !isFinishing()) {
+						try {
+							mBackgroundView.loadBackgroundBean(mPreviewBackgroundBean, true);
+							mBackgroundView.setBackgroundColor(mPreviewBackgroundBean.getPixelColor());
+							LogUtils.d(TAG, "【双重刷新】第二重完成");
+						} catch (Exception e) {
+							LogUtils.e(TAG, "【双重刷新】第二重异常：" + e.getMessage());
+						}
+					}
+				}
+			}, 200);
+    }
 }
+

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.models.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.models.AppConfigBean;
+import cc.winboll.studio.powerbell.models.ControlCenterServiceBean;
 import cc.winboll.studio.powerbell.dialogs.YesNoAlertDialog;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
@@ -79,7 +79,7 @@ public class AppConfigUtils {
 
                 @Override
                 public void onNo() {
-                    MainViewFragment.relaodAppConfigs();
+                    MainActivity.relaodAppConfigs();
                 }
             });
     }
@@ -183,7 +183,7 @@ public class AppConfigUtils {
                 @Override
                 public void onNo() {
                     AppConfigUtils.getInstance(activity).loadAppConfigBean();
-                    MainViewFragment.relaodAppConfigs();
+                    MainActivity.relaodAppConfigs();
                 }
             });
     }
@@ -198,6 +198,6 @@ public class AppConfigUtils {
         AppConfigBean.saveBean(mContext, mAppConfigBean);
         // 通知活动窗口和服务配置已更新
         ControlCenterService.updateStatus(mContext, mAppConfigBean);
-        MainViewFragment.relaodAppConfigs();
+        MainActivity.relaodAppConfigs();
     }
 }

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

@@ -0,0 +1,122 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.content.Context;
+import android.util.Log;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/11 09:14
+ * @Describe Assets 目录拷贝工具类
+ * 支持将 assets/images/ 下所有文件、子目录拷贝到指定路径
+ */
+public class AssetsCopyUtils {
+    public static final String TAG = "AssetsCopyUtils";
+    private static final int BUFFER_SIZE = 1024 * 8;
+
+    /**
+     * 拷贝 assets/images/ 目录到指定目标目录
+     * @param context      上下文
+     * @param targetDirPath 目标目录完整路径（如 /sdcard/PowerBell/assets_images）
+     * @return 拷贝是否成功
+     */
+    public static boolean copyAssetsImagesToDir(Context context, String targetDirPath) {
+        // 拷贝 assets/images 根目录
+        return copyAssetsDirToDir(context, "images", targetDirPath);
+    }
+
+    /**
+     * 递归拷贝 assets 下指定目录到目标目录
+     * @param context      上下文
+     * @param assetsDir    assets 下的源目录（如 "images"、"images/subdir"）
+     * @param targetDirPath 目标目录完整路径
+     * @return 拷贝是否成功
+     */
+    public static boolean copyAssetsDirToDir(Context context, String assetsDir, String targetDirPath) {
+        File targetDir = new File(targetDirPath);
+        // 创建目标目录（含多级父目录）
+        if (!targetDir.exists() && !targetDir.mkdirs()) {
+            Log.e(TAG, "创建目标目录失败：" + targetDirPath);
+            return false;
+        }
+
+        try {
+            // 获取 assets 目录下的文件/子目录列表
+            String[] fileList = context.getAssets().list(assetsDir);
+            if (fileList == null || fileList.length == 0) {
+                Log.d(TAG, "assets 目录为空：" + assetsDir);
+                return true;
+            }
+
+            for (String fileName : fileList) {
+                String assetsFilePath = assetsDir + File.separator + fileName;
+                String targetFilePath = targetDirPath + File.separator + fileName;
+
+                // 判断当前项是文件还是子目录
+                String[] subFileList = context.getAssets().list(assetsFilePath);
+                if (subFileList != null && subFileList.length > 0) {
+                    // 是子目录，递归拷贝
+                    if (!copyAssetsDirToDir(context, assetsFilePath, targetFilePath)) {
+                        return false;
+                    }
+                } else {
+                    // 是文件，直接拷贝
+                    if (!copyAssetsFileToDir(context, assetsFilePath, targetFilePath)) {
+                        return false;
+                    }
+                }
+            }
+            Log.d(TAG, "assets 目录拷贝完成：" + assetsDir + " -> " + targetDirPath);
+            return true;
+        } catch (IOException e) {
+            Log.e(TAG, "拷贝 assets 目录异常：" + e.getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 拷贝 assets 下单个文件到指定路径
+     * @param context       上下文
+     * @param assetsFilePath assets 下的文件路径（如 "images/cloud.png"）
+     * @param targetFilePath 目标文件完整路径
+     * @return 拷贝是否成功
+     */
+    public static boolean copyAssetsFileToDir(Context context, String assetsFilePath, String targetFilePath) {
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        try {
+            inputStream = context.getAssets().open(assetsFilePath);
+            File targetFile = new File(targetFilePath);
+            // 覆盖已存在的文件
+            if (targetFile.exists() && !targetFile.delete()) {
+                Log.w(TAG, "覆盖目标文件失败，跳过：" + targetFilePath);
+                return true;
+            }
+
+            outputStream = new FileOutputStream(targetFile);
+            byte[] buffer = new byte[BUFFER_SIZE];
+            int length;
+            while ((length = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, length);
+            }
+            Log.d(TAG, "文件拷贝成功：" + assetsFilePath + " -> " + targetFilePath);
+            return true;
+        } catch (IOException e) {
+            Log.e(TAG, "拷贝文件失败：" + assetsFilePath + "，异常：" + e.getMessage());
+            return false;
+        } finally {
+            // 关闭流
+            try {
+                if (inputStream != null) inputStream.close();
+                if (outputStream != null) outputStream.close();
+            } catch (IOException e) {
+                Log.e(TAG, "关闭流异常：" + e.getMessage());
+            }
+        }
+    }
+}
+

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,703 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.text.TextUtils;
+import androidx.core.content.FileProvider;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.BuildConfig;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2024/07/18 12:07:20
+ * @Describe 背景图片工具集（精简版：复用FileUtils，聚焦业务逻辑）
+ */
+public class BackgroundSourceUtils {
+
+    public static final String TAG = "BackgroundSourceUtils";
+    // 裁剪相关常量（统一定义，避免硬编码）
+    private static final String CROP_CACHE_DIR_NAME = "cache";
+    private static final String CROP_TEMP_FILE_NAME = "SourceCropTemp.jpg";
+    private static final String CROP_RESULT_FILE_NAME = "SourceCropped.jpg";
+    public static final String FILE_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".fileprovider";
+    // 图片操作基础目录
+    private static final String PICTURE_BASE_DIR = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + File.separator + "PowerBell";
+    private static final String SOURCE_DIR_NAME = "BackgroundSource";
+    private static final String COMPRESS_DIR_NAME = "BackgroundCompress";
+
+    // 单例相关
+    private static volatile BackgroundSourceUtils sInstance;
+    private Context mContext;
+    private File currentBackgroundBeanFile;
+    private BackgroundBean currentBackgroundBean;
+    private File previewBackgroundBeanFile;
+    private BackgroundBean previewBackgroundBean;
+
+    // 目录文件相关
+    private File fPictureBaseDir;
+    private File fCropCacheDir;
+    private File fBackgroundSourceDir;
+    private File fBackgroundCompressDir;
+    private File fUtilsDir;
+    private File fModelDir;
+    private File mCropSourceFile;
+    private File mCropResultFile;
+
+    // 双重校验锁单例
+    private BackgroundSourceUtils(Context context) {
+        if (sInstance != null) {
+            throw new RuntimeException("BackgroundSourceUtils 是单例类，禁止重复创建！");
+        }
+        this.mContext = context.getApplicationContext();
+        initNecessaryDirs();
+        initAllFiles();
+        loadSettings();
+    }
+
+    public static BackgroundSourceUtils getInstance(Context context) {
+        if (sInstance == null) {
+            synchronized (BackgroundSourceUtils.class) {
+                if (sInstance == null) {
+                    sInstance = new BackgroundSourceUtils(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    /**
+     * 统一初始化所有必要目录
+     */
+    private void initNecessaryDirs() {
+        LogUtils.d(TAG, "【目录初始化】开始创建所有必要目录");
+        initPictureDirs();
+        initJsonDirs();
+        LogUtils.d(TAG, "【目录初始化】所有必要目录创建完成");
+    }
+
+    /**
+     * 初始化图片操作目录
+     */
+    private void initPictureDirs() {
+        fPictureBaseDir = new File(PICTURE_BASE_DIR);
+        fBackgroundSourceDir = new File(fPictureBaseDir, SOURCE_DIR_NAME);
+        fCropCacheDir = new File(fPictureBaseDir, CROP_CACHE_DIR_NAME);
+        fBackgroundCompressDir = new File(fPictureBaseDir, COMPRESS_DIR_NAME);
+
+        createDirWithPermission(fPictureBaseDir, "图片基础目录");
+        createDirWithPermission(fBackgroundSourceDir, "图片存储目录");
+        createDirWithPermission(fCropCacheDir, "裁剪缓存目录");
+        createDirWithPermission(fBackgroundCompressDir, "压缩图存储目录");
+
+        validatePictureDirs();
+    }
+
+    /**
+     * 初始化JSON配置目录
+     */
+    private void initJsonDirs() {
+        fUtilsDir = mContext.getExternalFilesDir(TAG);
+        if (fUtilsDir == null) {
+            LogUtils.e(TAG, "应用外置存储不可用，切换到应用内部缓存目录");
+            fUtilsDir = mContext.getDataDir();
+        }
+        fModelDir = new File(fUtilsDir, "ModelDir");
+        createDirWithPermission(fModelDir, "JSON配置目录");
+
+        currentBackgroundBeanFile = new File(fModelDir, "currentBackgroundBean.json");
+        previewBackgroundBeanFile = new File(fModelDir, "previewBackgroundBean.json");
+    }
+
+    /**
+     * 创建目录并校验
+     */
+    private void createDirWithPermission(File dir, String dirDesc) {
+        if (dir == null) {
+            LogUtils.e(TAG, dirDesc + "创建失败：目录对象为null");
+            return;
+        }
+        if (!dir.exists()) {
+            LogUtils.d(TAG, dirDesc + "不存在，开始创建：" + dir.getAbsolutePath());
+            dir.mkdirs();
+        }
+    }
+
+    /**
+     * 校验图片目录是否就绪
+     */
+    private void validatePictureDirs() {
+        boolean allReady = fPictureBaseDir.exists() && fBackgroundSourceDir.exists()
+			&& fCropCacheDir.exists() && fBackgroundCompressDir.exists();
+        if (allReady) {
+            LogUtils.d(TAG, "所有图片目录均已就绪");
+        } else {
+            LogUtils.e(TAG, "部分图片目录未就绪，可能影响后续功能");
+        }
+    }
+
+    /**
+     * 初始化所有文件
+     */
+    private void initAllFiles() {
+        clearCropTempFiles();
+        LogUtils.d(TAG, "文件初始化完成");
+    }
+
+    /**
+     * 将File转为ContentUri
+     */
+    public Uri getFileProviderUri(File file) {
+        LogUtils.d(TAG, "【getFileProviderUri调用】文件路径：" + file.getAbsolutePath());
+        Uri contentUri = null;
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                contentUri = FileProvider.getUriForFile(mContext, FILE_PROVIDER_AUTHORITY, file);
+                LogUtils.d(TAG, "7.0+ 生成ContentUri：" + contentUri.toString());
+            } else {
+                contentUri = Uri.fromFile(file);
+                LogUtils.d(TAG, "7.0以下 生成FileUri：" + contentUri.toString());
+            }
+        } catch (IllegalArgumentException e) {
+            LogUtils.e(TAG, "生成Uri失败：" + e.getMessage(), e);
+            contentUri = null;
+        }
+        return contentUri;
+    }
+
+    /**
+     * 检查背景是否为空并创建空白背景Bean
+     */
+    boolean checkEmptyBackgroundAndCreateBlankBackgroundBean(BackgroundBean checkBackgroundBean) {
+        LogUtils.d(TAG, "【checkEmptyBackgroundAndCreateBlankBackgroundBean调用】开始检查背景Bean");
+        File fCheckBackgroundFile = new File(checkBackgroundBean.getBackgroundFilePath());
+        if (!fCheckBackgroundFile.exists()) {
+            String newCropFileName = genNewCropFileName();
+            String fileSuffix = "png";
+            mCropSourceFile = new File(fCropCacheDir, newCropFileName + "." + fileSuffix);
+            mCropResultFile = new File(fCropCacheDir, "SelectCompress_" + newCropFileName + "." + fileSuffix);
+
+            AssetsCopyUtils.copyAssetsFileToDir(mContext, "images/blank10x10.png", mCropSourceFile.getAbsolutePath());
+            try {
+                mCropResultFile.createNewFile();
+            } catch (IOException e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            }
+
+            loadSettings();
+            previewBackgroundBean.setIsUseBackgroundFile(true);
+            previewBackgroundBean.setIsUseBackgroundScaledCompressFile(false);
+            previewBackgroundBean.setBackgroundFileName(mCropSourceFile.getName());
+            previewBackgroundBean.setBackgroundFilePath(mCropSourceFile.getAbsolutePath());
+            previewBackgroundBean.setBackgroundScaledCompressFileName(mCropResultFile.getName());
+            previewBackgroundBean.setBackgroundScaledCompressFilePath(mCropResultFile.getAbsolutePath());
+            saveSettings();
+            LogUtils.d(TAG, "背景Bean为空，已创建空白背景并更新配置");
+            return true;
+        }
+        LogUtils.d(TAG, "背景Bean文件存在，无需创建空白背景");
+        return false;
+    }
+
+	String genNewCropFileName() {
+		return UUID.randomUUID().toString() + System.currentTimeMillis();
+	}
+
+    /**
+     * 创建并更新预览剪裁环境
+     */
+    public boolean createAndUpdatePreviewEnvironmentForCropping(BackgroundBean oldPreviewBackgroundBean) {
+        LogUtils.d(TAG, "【createAndUpdatePreviewEnvironmentForCropping调用】开始初始化预览剪裁环境");
+        InputStream is = null;
+        FileOutputStream fos = null;
+        try {
+            clearCropTempFiles();
+            if (checkEmptyBackgroundAndCreateBlankBackgroundBean(oldPreviewBackgroundBean)) {
+                LogUtils.d(TAG, "空白背景创建成功，直接返回");
+                return true;
+            }
+
+            Uri uri = UriUtils.getUriForFile(mContext, oldPreviewBackgroundBean.getBackgroundFilePath());
+			LogUtils.d(TAG, String.format("createAndUpdatePreviewEnvironmentForCropping: uri %s", uri));
+			String fileSuffix = UriUtils.getSuffixFromUri(mContext, uri);
+			LogUtils.d(TAG, String.format("createAndUpdatePreviewEnvironmentForCropping: fileSuffix = %s", fileSuffix));
+            String newCropFileName = genNewCropFileName();
+            mCropSourceFile = new File(fCropCacheDir, newCropFileName + "." + fileSuffix);
+            mCropResultFile = new File(fCropCacheDir, "SelectCompress_" + newCropFileName + ".png");
+
+            if (FileUtils.isFileExists(oldPreviewBackgroundBean.getBackgroundScaledCompressFilePath())) {
+                FileUtils.copyFile(new File(oldPreviewBackgroundBean.getBackgroundScaledCompressFilePath()), mCropResultFile);
+            } else {
+                mCropResultFile.createNewFile();
+            }
+
+            if (FileUtils.isFileExists(oldPreviewBackgroundBean.getBackgroundFilePath())) {
+                FileUtils.copyFile(new File(oldPreviewBackgroundBean.getBackgroundFilePath()), mCropSourceFile);
+            } else {
+                mCropSourceFile.createNewFile();
+                is = mContext.getContentResolver().openInputStream(uri);
+                if (is == null) {
+                    LogUtils.e(TAG, "ContentResolver打开Uri失败：" + uri.toString());
+                    return false;
+                }
+                fos = new FileOutputStream(mCropSourceFile);
+                byte[] buffer = new byte[1024 * 8];
+                int readLen;
+                while ((readLen = is.read(buffer)) != -1) {
+                    fos.write(buffer, 0, readLen);
+                }
+                fos.flush();
+                try {
+                    fos.getFD().sync();
+                } catch (IOException e) {
+                    LogUtils.w(TAG, "文件同步到磁盘失败，flush兜底：" + e.getMessage());
+                    fos.flush();
+                }
+            }
+
+            loadSettings();
+            previewBackgroundBean.setBackgroundFileName(mCropSourceFile.getName());
+            previewBackgroundBean.setBackgroundFilePath(mCropSourceFile.getAbsolutePath());
+            previewBackgroundBean.setBackgroundScaledCompressFileName(mCropResultFile.getName());
+            previewBackgroundBean.setBackgroundScaledCompressFilePath(mCropResultFile.getAbsolutePath());
+            saveSettings();
+
+            LogUtils.d(TAG, "预览剪裁环境初始化成功");
+            LogUtils.d(TAG, "→ 原Uri：" + uri.toString());
+            LogUtils.d(TAG, "→ 剪裁数据源：" + mCropSourceFile.getAbsolutePath());
+            LogUtils.d(TAG, "→ 剪裁结果文件：" + mCropResultFile.getAbsolutePath());
+            return true;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "预览剪裁环境初始化异常：" + e.getMessage(), e);
+            clearCropTempFiles();
+            return false;
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "输入流关闭失败：" + e.getMessage());
+                }
+            }
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "输出流关闭失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * 加载背景配置
+     */
+    public void loadSettings() {
+        currentBackgroundBean = BackgroundBean.loadBeanFromFile(currentBackgroundBeanFile.getAbsolutePath(), BackgroundBean.class);
+        if (currentBackgroundBean == null) {
+            currentBackgroundBean = new BackgroundBean();
+            BackgroundBean.saveBeanToFile(currentBackgroundBeanFile.getAbsolutePath(), currentBackgroundBean);
+            LogUtils.d(TAG, "正式背景Bean不存在，已创建新实例");
+        }
+
+        previewBackgroundBean = BackgroundBean.loadBeanFromFile(previewBackgroundBeanFile.getAbsolutePath(), BackgroundBean.class);
+        if (previewBackgroundBean == null) {
+            previewBackgroundBean = new BackgroundBean();
+            BackgroundBean.saveBeanToFile(previewBackgroundBeanFile.getAbsolutePath(), previewBackgroundBean);
+            LogUtils.d(TAG, "预览背景Bean不存在，已创建新实例");
+        }
+    }
+
+    // ------------------------------ 对外提供的核心方法 ------------------------------
+    public BackgroundBean getCurrentBackgroundBean() {
+        return currentBackgroundBean;
+    }
+
+    public BackgroundBean getPreviewBackgroundBean() {
+        return previewBackgroundBean;
+    }
+
+    public String getPreviewBackgroundScaledCompressFilePath() {
+        String compressFileName = previewBackgroundBean.getBackgroundScaledCompressFileName();
+        if (TextUtils.isEmpty(compressFileName)) {
+            LogUtils.e(TAG, "预览压缩背景文件名为空");
+            return "";
+        }
+        File file = new File(fBackgroundCompressDir, compressFileName);
+        return file.getAbsolutePath();
+    }
+
+    public String getCurrentBackgroundScaledCompressFilePath() {
+        String compressFileName = currentBackgroundBean.getBackgroundScaledCompressFileName();
+        if (TextUtils.isEmpty(compressFileName)) {
+            LogUtils.e(TAG, "正式压缩背景文件名为空");
+            return "";
+        }
+        File file = new File(fBackgroundCompressDir, compressFileName);
+        return file.getAbsolutePath();
+    }
+
+    /**
+     * 保存配置
+     */
+    public void saveSettings() {
+        if (currentBackgroundBean != null && previewBackgroundBean != null) {
+            BackgroundBean.saveBeanToFile(currentBackgroundBeanFile.getAbsolutePath(), currentBackgroundBean);
+            BackgroundBean.saveBeanToFile(previewBackgroundBeanFile.getAbsolutePath(), previewBackgroundBean);
+            LogUtils.d(TAG, "两份背景配置保存成功");
+        } else {
+            LogUtils.e(TAG, "配置保存失败：current/preview Bean存在空值");
+        }
+    }
+
+    public String getBackgroundSourceDirPath() {
+        return fBackgroundSourceDir.getAbsolutePath();
+    }
+
+    public String getBackgroundCompressDirPath() {
+        return fBackgroundCompressDir.getAbsolutePath();
+    }
+
+    public String getCropCacheDir() {
+        return fCropCacheDir.getAbsolutePath();
+    }
+
+    public String getFileProviderAuthority() {
+        return FILE_PROVIDER_AUTHORITY;
+    }
+
+    // ------------------------------ 核心业务方法 ------------------------------
+    /**
+     * 保存裁剪结果图到预览Bean
+     */
+    public BackgroundBean saveFileToPreviewBean(File sourceFile, String fileInfo) {
+        LogUtils.d(TAG, "【saveFileToPreviewBean调用】源文件路径：" + (sourceFile != null ? sourceFile.getAbsolutePath() : "null"));
+        if (sourceFile == null || !sourceFile.exists() || sourceFile.length() <= 0) {
+            LogUtils.e(TAG, "源文件无效，拒绝保存");
+            return previewBackgroundBean;
+        }
+
+        String originalImageDir = mContext.getExternalFilesDir(Environment.DIRECTORY_PICTURES).getAbsolutePath();
+        if (sourceFile.getAbsolutePath().contains(originalImageDir)) {
+            LogUtils.w(TAG, "禁止复制原图，跳过保存");
+            return previewBackgroundBean;
+        }
+
+        if (!fBackgroundSourceDir.exists() && !fBackgroundSourceDir.mkdirs()) {
+            LogUtils.e(TAG, "BackgroundSource目录创建失败");
+            return previewBackgroundBean;
+        }
+
+        String uniqueFileName = "bg_" + System.currentTimeMillis() + "_" + sourceFile.getName();
+        File targetFile = new File(fBackgroundSourceDir, uniqueFileName);
+        if (FileUtils.copyFile(sourceFile, targetFile)) {
+            LogUtils.d(TAG, "裁剪结果图保存成功：" + targetFile.getAbsolutePath());
+            previewBackgroundBean.setBackgroundFileName(uniqueFileName);
+            previewBackgroundBean.setBackgroundFilePath(targetFile.getAbsolutePath());
+            previewBackgroundBean.setBackgroundFileInfo(fileInfo);
+            previewBackgroundBean.setIsUseBackgroundFile(true);
+            saveSettings();
+        } else {
+            LogUtils.e(TAG, "裁剪结果图复制失败");
+        }
+        return previewBackgroundBean;
+    }
+
+    /**
+     * 提交预览背景到正式背景
+     */
+    public void commitPreviewSourceToCurrent() {
+        LogUtils.d(TAG, "【commitPreviewSourceToCurrent调用】开始深拷贝预览Bean到正式Bean");
+		//ToastUtils.show("【commitPreviewSourceToCurrent调用】开始深拷贝预览Bean到正式Bean");
+        currentBackgroundBean = new BackgroundBean();
+        currentBackgroundBean.setBackgroundFileName(previewBackgroundBean.getBackgroundFileName());
+        currentBackgroundBean.setBackgroundFilePath(previewBackgroundBean.getBackgroundFilePath());
+        currentBackgroundBean.setBackgroundFileInfo(previewBackgroundBean.getBackgroundFileInfo());
+        currentBackgroundBean.setIsUseBackgroundFile(previewBackgroundBean.isUseBackgroundFile());
+        currentBackgroundBean.setBackgroundScaledCompressFileName(previewBackgroundBean.getBackgroundScaledCompressFileName());
+        currentBackgroundBean.setBackgroundScaledCompressFilePath(previewBackgroundBean.getBackgroundScaledCompressFilePath());
+        currentBackgroundBean.setIsUseBackgroundScaledCompressFile(previewBackgroundBean.isUseBackgroundScaledCompressFile());
+        currentBackgroundBean.setBackgroundWidth(previewBackgroundBean.getBackgroundWidth());
+        currentBackgroundBean.setBackgroundHeight(previewBackgroundBean.getBackgroundHeight());
+        currentBackgroundBean.setPixelColor(previewBackgroundBean.getPixelColor());
+
+        String previewFileName = previewBackgroundBean.getBackgroundFileName();
+        String previewCropFileName = previewBackgroundBean.getBackgroundScaledCompressFileName();
+        File previewFile = new File(previewBackgroundBean.getBackgroundFilePath());
+        File previewCropFile = new File(previewBackgroundBean.getBackgroundScaledCompressFilePath());
+        File currentFile = new File(fBackgroundSourceDir, previewFileName);
+        File currentCropFile = new File(fBackgroundCompressDir, previewCropFileName);
+        FileUtils.copyFile(previewFile, currentFile);
+        FileUtils.copyFile(previewCropFile, currentCropFile);
+        currentBackgroundBean.setBackgroundFilePath(currentFile.getAbsolutePath());
+        currentBackgroundBean.setBackgroundScaledCompressFilePath(currentCropFile.getAbsolutePath());
+
+        saveSettings();
+        LogUtils.d(TAG, "预览背景提交到正式背景成功，两份实例完全独立");
+        ToastUtils.show("背景图片应用成功");
+    }
+
+    /**
+     * 将正式背景同步到预览背景
+     */
+    public void setCurrentSourceToPreview() {
+        LogUtils.d(TAG, "【setCurrentSourceToPreview调用】开始深拷贝正式Bean到预览Bean");
+        previewBackgroundBean = new BackgroundBean();
+        previewBackgroundBean.setBackgroundFileName(currentBackgroundBean.getBackgroundFileName());
+        previewBackgroundBean.setBackgroundFilePath(currentBackgroundBean.getBackgroundFilePath());
+        previewBackgroundBean.setBackgroundFileInfo(currentBackgroundBean.getBackgroundFileInfo());
+        previewBackgroundBean.setIsUseBackgroundFile(currentBackgroundBean.isUseBackgroundFile());
+        previewBackgroundBean.setBackgroundScaledCompressFileName(currentBackgroundBean.getBackgroundScaledCompressFileName());
+        previewBackgroundBean.setBackgroundScaledCompressFilePath(currentBackgroundBean.getBackgroundScaledCompressFilePath());
+        previewBackgroundBean.setIsUseBackgroundScaledCompressFile(currentBackgroundBean.isUseBackgroundScaledCompressFile());
+        previewBackgroundBean.setBackgroundWidth(currentBackgroundBean.getBackgroundWidth());
+        previewBackgroundBean.setBackgroundHeight(currentBackgroundBean.getBackgroundHeight());
+        previewBackgroundBean.setPixelColor(currentBackgroundBean.getPixelColor());
+
+        saveSettings();
+        LogUtils.d(TAG, "正式背景同步到预览背景成功");
+    }
+
+    /**
+     * 清理单个旧文件
+     */
+    private void clearOldFile(File file, String fileDesc) {
+        if (file == null) {
+            return;
+        }
+        if (file.exists()) {
+            file.delete();
+            LogUtils.d(TAG, fileDesc + "已删除");
+        }
+    }
+
+    /**
+     * 清理裁剪临时文件
+     */
+    void clearCropTempFiles() {
+        File[] files = fCropCacheDir.listFiles();
+        if (files == null) {
+            return;
+        }
+        for (File file : files) {
+            clearOldFile(file, "旧裁剪缓存文件：" + file.getAbsolutePath());
+        }
+        mCropSourceFile = null;
+        mCropResultFile = null;
+    }
+
+    /**
+     * 复制文件
+     */
+    public boolean copyFile(File source, File target) {
+        LogUtils.d(TAG, "【copyFile调用】源文件：" + (source != null ? source.getAbsolutePath() : "null") + " 目标：" + (target != null ? target.getAbsolutePath() : "null"));
+        if (source == null || TextUtils.isEmpty(source.getPath()) || (source.exists() && source.length() <= 0)) {
+            if (target == null) {
+                LogUtils.e(TAG, "目录创建失败：目标对象为null");
+                return false;
+            }
+            File targetDir = target.isFile() ? target.getParentFile() : target;
+            createDirWithPermission(targetDir, "空源文件场景-目录创建");
+            LogUtils.d(TAG, "空源文件场景，目录创建完成");
+            return true;
+        }
+        return FileUtils.copyFile(source, target);
+    }
+
+    /**
+     * 获取目录类型描述
+     */
+    public String getDirTypeDesc(File dir) {
+        if (dir == null) {
+            return "未知目录（null）";
+        }
+        String dirPath = dir.getAbsolutePath();
+        String publicPicturePath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath();
+        String externalFilesPath = mContext.getExternalFilesDir(null) != null ? mContext.getExternalFilesDir(null).getAbsolutePath() : "";
+        String cachePath = mContext.getCacheDir().getAbsolutePath();
+
+        if (!TextUtils.isEmpty(publicPicturePath)) {
+            if (dirPath.contains(publicPicturePath + File.separator + "PowerBell" + File.separator + COMPRESS_DIR_NAME)) {
+                return "系统公共图片目录（/Pictures/PowerBell/BackgroundCompress，压缩图统一存储目录）";
+            } else if (dirPath.contains(publicPicturePath + File.separator + "PowerBell")) {
+                return "系统公共图片目录（/Pictures/PowerBell，图片存储/裁剪目录）";
+            }
+        } else if (!TextUtils.isEmpty(externalFilesPath) && dirPath.contains(externalFilesPath)) {
+            return "应用私有外部目录（getExternalFilesDir()，JSON配置目录）";
+        } else if (dirPath.contains(cachePath)) {
+            return "应用内部缓存目录（getCacheDir()，兜底目录）";
+        } else {
+            return "外部存储目录（非应用私有，权限受限）";
+        }
+        return "未知目录";
+    }
+
+    /**
+     * 迁移旧压缩图路径到新目录
+     */
+    private void migrateCompressPathToNewDir(BackgroundBean bean, boolean isCurrentBean) {
+        LogUtils.d(TAG, "【migrateCompressPathToNewDir调用】开始迁移" + (isCurrentBean ? "正式" : "预览") + "Bean压缩路径");
+        String oldCompressPath = bean.getBackgroundScaledCompressFilePath();
+        String beanType = isCurrentBean ? "正式Bean" : "预览Bean";
+
+        if (TextUtils.isEmpty(oldCompressPath) || oldCompressPath.contains(fBackgroundCompressDir.getAbsolutePath())) {
+            LogUtils.d(TAG, beanType + "无需迁移：旧路径为空或已在目标目录");
+            return;
+        }
+
+        File oldCompressFile = new File(oldCompressPath);
+        if (!oldCompressFile.exists() || !oldCompressFile.isFile() || oldCompressFile.length() <= 0) {
+            LogUtils.w(TAG, beanType + "旧压缩文件无效，无需迁移：" + oldCompressPath);
+            String compressFileName = bean.getBackgroundScaledCompressFileName();
+            if (!TextUtils.isEmpty(compressFileName)) {
+                File newCompressFile = new File(fBackgroundCompressDir, compressFileName);
+                bean.setBackgroundScaledCompressFilePath(newCompressFile.getAbsolutePath());
+                saveSettings();
+                LogUtils.d(TAG, beanType + "压缩路径已重置到目标目录");
+            }
+            return;
+        }
+
+        String compressFileName = bean.getBackgroundScaledCompressFileName();
+        if (TextUtils.isEmpty(compressFileName)) {
+            compressFileName = "ScaledCompress_" + System.currentTimeMillis() + ".jpg";
+        }
+        File newCompressFile = new File(fBackgroundCompressDir, compressFileName);
+
+        boolean copySuccess = FileUtils.copyFile(oldCompressFile, newCompressFile);
+        if (copySuccess) {
+            bean.setBackgroundScaledCompressFilePath(newCompressFile.getAbsolutePath());
+            saveSettings();
+            clearOldFile(oldCompressFile, beanType + "旧压缩文件（迁移后清理）");
+            LogUtils.d(TAG, beanType + "压缩路径迁移成功：" + oldCompressPath + " → " + newCompressFile.getAbsolutePath());
+        } else {
+            LogUtils.e(TAG, beanType + "压缩文件复制失败，迁移终止");
+        }
+    }
+
+    /**
+     * 获取图片旋转角度
+     */
+    public int getImageRotateAngle(String imagePath) {
+        LogUtils.d(TAG, "【getImageRotateAngle调用】图片路径：" + imagePath);
+        if (TextUtils.isEmpty(imagePath)) {
+            LogUtils.e(TAG, "图片路径为空");
+            return 0;
+        }
+        File imageFile = new File(imagePath);
+        if (!imageFile.exists() || !imageFile.isFile() || imageFile.length() <= 0) {
+            LogUtils.e(TAG, "图片文件无效：" + imagePath);
+            return 0;
+        }
+
+        InputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(imageFile);
+            ExifInterface exifInterface = new ExifInterface(inputStream);
+            int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
+            switch (orientation) {
+                case ExifInterface.ORIENTATION_ROTATE_90:
+                    return 90;
+                case ExifInterface.ORIENTATION_ROTATE_180:
+                    return 180;
+                case ExifInterface.ORIENTATION_ROTATE_270:
+                    return 270;
+                default:
+                    return 0;
+            }
+        } catch (IOException e) {
+            LogUtils.w(TAG, "读取EXIF异常：" + e.getMessage());
+            return 0;
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "流关闭失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * 压缩图片并保存（默认路径）
+     */
+    public void compressQualityToRecivedPicture(Bitmap bitmap) {
+        LogUtils.d(TAG, "【compressQualityToRecivedPicture调用】使用默认路径压缩图片");
+        String defaultCompressPath = getPreviewBackgroundScaledCompressFilePath();
+        compressQualityToRecivedPicture(bitmap, defaultCompressPath);
+    }
+
+    /**
+     * 压缩图片并保存（指定路径）
+     */
+    public void compressQualityToRecivedPicture(Bitmap bitmap, String targetCompressPath) {
+        LogUtils.d(TAG, "【compressQualityToRecivedPicture调用】指定路径压缩图片，目标路径：" + targetCompressPath);
+        if (bitmap == null || bitmap.isRecycled()) {
+            ToastUtils.show("压缩失败：图片为空");
+            LogUtils.e(TAG, "Bitmap为空或已回收");
+            return;
+        }
+
+        OutputStream outStream = null;
+        FileOutputStream fos = null;
+        try {
+            LogUtils.d(TAG, "Bitmap原始大小：" + bitmap.getByteCount() / 1024 + "KB");
+            File targetCompressFile = new File(targetCompressPath);
+            if (targetCompressFile.exists()) {
+                targetCompressFile.delete();
+            }
+            targetCompressFile.createNewFile();
+
+            fos = new FileOutputStream(targetCompressFile);
+            outStream = new BufferedOutputStream(fos);
+            boolean compressSuccess = bitmap.compress(Bitmap.CompressFormat.JPEG, 80, outStream);
+            outStream.flush();
+            try {
+                fos.getFD().sync();
+                LogUtils.d(TAG, "图片已强制同步到磁盘");
+            } catch (IOException e) {
+                LogUtils.w(TAG, "sync失败，flush兜底：" + e.getMessage());
+                outStream.flush();
+            }
+
+            LogUtils.d(TAG, "图片压缩" + (compressSuccess ? "成功" : "失败") + "，大小：" + targetCompressFile.length() / 1024 + "KB");
+            ToastUtils.show(compressSuccess ? "图片压缩成功" : "图片压缩失败");
+        } catch (IOException e) {
+            LogUtils.e(TAG, "图片压缩IO异常：" + e.getMessage(), e);
+            ToastUtils.show("图片压缩失败");
+        } finally {
+            if (outStream != null) {
+                try {
+                    outStream.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "BufferedOutputStream关闭失败：" + e.getMessage());
+                }
+            }
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    LogUtils.e(TAG, "FileOutputStream关闭失败：" + e.getMessage());
+                }
+            }
+            if (bitmap != null && !bitmap.isRecycled()) {
+                bitmap.recycle();
+            }
+        }
+    }
+}
+

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

@@ -0,0 +1,206 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.text.TextUtils;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import cc.winboll.studio.libappbase.LogUtils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/11 01:57
+ * @Describe 单例 Bitmap 缓存工具类（Java 7 兼容）
+ * 功能：内存缓存 Bitmap，支持路径关联缓存、全局获取、缓存清空
+ * 特点：1. 单例模式  2. 压缩加载避免OOM  3. 路径- Bitmap 映射  4. 线程安全
+ */
+public class BitmapCacheUtils {
+    public static final String TAG = "BitmapCacheUtils";
+    // 最大图片尺寸（适配1080P屏幕，可根据需求调整）
+    private static final int MAX_WIDTH = 1080;
+    private static final int MAX_HEIGHT = 1920;
+
+    // 单例实例（volatile 保证多线程可见性）
+    private static volatile BitmapCacheUtils sInstance;
+    // 路径-Bitmap 缓存容器（内存缓存）
+    private final Map<String, Bitmap> mBitmapCacheMap;
+
+    // 私有构造器（单例模式）
+    private BitmapCacheUtils() {
+        mBitmapCacheMap = new HashMap<>();
+    }
+
+    /**
+     * 获取单例实例（双重校验锁，线程安全）
+     */
+    public static BitmapCacheUtils getInstance() {
+        if (sInstance == null) {
+            synchronized (BitmapCacheUtils.class) {
+                if (sInstance == null) {
+                    sInstance = new BitmapCacheUtils();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    /**
+     * 核心接口：根据图片路径缓存 Bitmap 到内存
+     * @param imagePath 图片绝对路径
+     * @return 缓存成功的 Bitmap / null（路径无效/文件不存在/解码失败）
+     */
+    public Bitmap cacheBitmap(String imagePath) {
+        if (TextUtils.isEmpty(imagePath)) {
+            LogUtils.e(TAG, "cacheBitmap: 图片路径为空");
+            return null;
+        }
+
+        File imageFile = new File(imagePath);
+        if (!imageFile.exists() || !imageFile.isFile() || imageFile.length() <= 0) {
+            LogUtils.e(TAG, "cacheBitmap: 图片文件无效（不存在/非文件/空文件） - " + imagePath);
+            return null;
+        }
+
+        // 已缓存则直接返回，避免重复加载
+        if (mBitmapCacheMap.containsKey(imagePath)) {
+            Bitmap cachedBitmap = mBitmapCacheMap.get(imagePath);
+            // 额外校验缓存的Bitmap是否有效
+            if (cachedBitmap != null && !cachedBitmap.isRecycled()) {
+                LogUtils.d(TAG, "cacheBitmap: 图片已缓存，直接返回 - " + imagePath);
+                return cachedBitmap;
+            } else {
+                // 缓存的Bitmap已失效，移除后重新加载
+                mBitmapCacheMap.remove(imagePath);
+                LogUtils.w(TAG, "cacheBitmap: 缓存Bitmap已失效，移除后重新加载 - " + imagePath);
+            }
+        }
+
+        // 压缩加载 Bitmap（避免OOM）
+        Bitmap bitmap = decodeCompressedBitmap(imagePath);
+        if (bitmap != null) {
+            // 存入缓存容器
+            mBitmapCacheMap.put(imagePath, bitmap);
+            LogUtils.d(TAG, "cacheBitmap: 图片缓存成功 - " + imagePath);
+        } else {
+            LogUtils.e(TAG, "cacheBitmap: 图片解码失败 - " + imagePath);
+        }
+        return bitmap;
+    }
+
+    /**
+     * 核心接口：根据路径获取缓存的 Bitmap
+     * @param imagePath 图片绝对路径
+     * @return 缓存的有效 Bitmap / null（未缓存/已回收）
+     */
+    public Bitmap getCachedBitmap(String imagePath) {
+        if (TextUtils.isEmpty(imagePath)) {
+            return null;
+        }
+        Bitmap bitmap = mBitmapCacheMap.get(imagePath);
+        // 校验Bitmap是否有效
+        if (bitmap != null && bitmap.isRecycled()) {
+            mBitmapCacheMap.remove(imagePath);
+            return null;
+        }
+        return bitmap;
+    }
+
+    /**
+     * 清空所有 Bitmap 缓存（释放内存）
+     */
+    public void clearAllCache() {
+        synchronized (mBitmapCacheMap) {
+            for (Bitmap bitmap : mBitmapCacheMap.values()) {
+                if (bitmap != null && !bitmap.isRecycled()) {
+                    bitmap.recycle(); // 主动回收 Bitmap
+                }
+            }
+            mBitmapCacheMap.clear();
+        }
+        LogUtils.d(TAG, "clearAllCache: 所有 Bitmap 缓存已清空");
+    }
+
+    /**
+     * 移除指定路径的 Bitmap 缓存
+     * @param imagePath 图片绝对路径
+     */
+    public void removeCachedBitmap(String imagePath) {
+        if (TextUtils.isEmpty(imagePath)) {
+            return;
+        }
+        synchronized (mBitmapCacheMap) {
+            Bitmap bitmap = mBitmapCacheMap.remove(imagePath);
+            if (bitmap != null && !bitmap.isRecycled()) {
+                bitmap.recycle();
+                LogUtils.d(TAG, "removeCachedBitmap: 移除并回收缓存 - " + imagePath);
+            }
+        }
+    }
+
+    /**
+     * 压缩解码 Bitmap（按最大尺寸缩放，避免OOM）
+     * @param imagePath 图片绝对路径
+     * @return 解码后的 Bitmap / null（文件无效/解码失败）
+     */
+    private Bitmap decodeCompressedBitmap(String imagePath) {
+        // 前置校验：确保文件有效
+        File imageFile = new File(imagePath);
+        if (!imageFile.exists() || !imageFile.isFile() || imageFile.length() <= 0) {
+            LogUtils.e(TAG, "decodeCompressedBitmap: 文件无效，跳过解码 - " + imagePath);
+            return null;
+        }
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        // 第一步：只获取图片尺寸，不加载像素
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(imagePath, options);
+
+        // 校验尺寸是否有效
+        if (options.outWidth <= 0 || options.outHeight <= 0) {
+            LogUtils.e(TAG, "decodeCompressedBitmap: 图片尺寸无效 - " + imagePath);
+            return null;
+        }
+
+        // 计算缩放比例
+        int sampleSize = calculateInSampleSize(options, MAX_WIDTH, MAX_HEIGHT);
+
+        // 第二步：加载压缩后的 Bitmap
+        options.inJustDecodeBounds = false;
+        options.inSampleSize = sampleSize;
+        options.inPreferredConfig = Bitmap.Config.RGB_565; // 节省内存（比ARGB_8888少一半内存）
+        options.inPurgeable = true;
+        options.inInputShareable = true;
+
+        try {
+            return BitmapFactory.decodeFile(imagePath, options);
+        } catch (OutOfMemoryError e) {
+            LogUtils.e(TAG, "decodeCompressedBitmap: OOM异常 - " + imagePath);
+            return null;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "decodeCompressedBitmap: 解码异常 - " + imagePath, e);
+            return null;
+        }
+    }
+
+    /**
+     * 计算 Bitmap 缩放比例
+     */
+    private int calculateInSampleSize(BitmapFactory.Options options, int maxWidth, int maxHeight) {
+        int rawWidth = options.outWidth;
+        int rawHeight = options.outHeight;
+        int inSampleSize = 1;
+
+        if (rawWidth > maxWidth || rawHeight > maxHeight) {
+            int halfWidth = rawWidth / 2;
+            int halfHeight = rawHeight / 2;
+            while ((halfWidth / inSampleSize) >= maxWidth && (halfHeight / inSampleSize) >= maxHeight) {
+                inSampleSize *= 2;
+            }
+        }
+        return inSampleSize;
+    }
+}
+

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

@@ -0,0 +1,101 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Environment;
+import android.util.Log;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/08 21:11
+ * @Describe 把 R.drawable 中的图片保存为 File 对象的工具类
+ * 适配 PowerBell 项目：支持指定保存路径、自动创建目录、处理PNG图片压缩
+ */
+public class DrawableToFileUtils {
+    private static final String TAG = "DrawableToFileUtils";
+    
+    /**
+     * 核心方法：将 R.drawable 图片保存为 File 对象
+     * @param context 上下文（用于获取 Resources）
+     * @param drawableResId 图片资源ID（如 R.drawable.ic_test_png）
+     * @param fileName 保存的文件名（需带 .png 后缀，如 "test_drawable.png"）
+     * @return 保存成功返回 File 对象，失败返回 null
+     */
+    public static File saveDrawableToFile(Context context, int drawableResId, String filePath) {
+        // 1. 校验参数（避免空指针/无效参数）
+        if (context == null || drawableResId == 0 || filePath == null || filePath.isEmpty()) {
+            LogUtils.e(TAG, "【保存失败】参数无效（context为空/资源ID为0/文件名为空）");
+            return null;
+        }
+        if (!filePath.endsWith(".png")) {
+            filePath += ".png"; // 强制添加 .png 后缀，确保图片格式正确
+            LogUtils.d(TAG, "【格式适配】自动添加.png后缀，最终文件名：" + filePath);
+        }
+
+        // 3. 构建目标 File 对象（最终保存的文件路径）
+        File targetFile = new File(filePath);
+        LogUtils.d(TAG, "【保存路径】目标文件路径：" + targetFile.getAbsolutePath());
+
+        // 4. 读取 drawable 资源为 Bitmap（处理高清图/缩放问题）
+        Bitmap bitmap = null;
+        try {
+            // 读取 drawable 资源（适配不同分辨率的图片，避免变形）
+            bitmap = BitmapFactory.decodeResource(context.getResources(), drawableResId);
+            if (bitmap == null) {
+                LogUtils.e(TAG, "【读取失败】无法读取drawable资源（资源ID：" + drawableResId + "）");
+                return null;
+            }
+            LogUtils.d(TAG, "【读取成功】drawable资源转Bitmap成功（宽：" + bitmap.getWidth() + "，高：" + bitmap.getHeight() + "）");
+
+            // 5. 将 Bitmap 写入 File（PNG格式，无损保存）
+            FileOutputStream fos = new FileOutputStream(targetFile);
+            // 压缩参数：PNG格式，质量100（无损），写入输出流
+            boolean isSaved = bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+            fos.flush(); // 刷新输出流
+            fos.close(); // 关闭输出流
+
+            // 6. 校验保存结果（文件是否存在且有效）
+            if (isSaved && targetFile.exists() && targetFile.length() > 100) {
+                LogUtils.d(TAG, "【保存成功】drawable图片保存为File：" + targetFile.getAbsolutePath());
+                return targetFile; // 保存成功，返回File对象
+            } else {
+                LogUtils.e(TAG, "【保存失败】图片写入文件无效（文件大小：" + (targetFile.exists() ? targetFile.length() : 0) + "字节）");
+                // 保存失败，删除无效文件
+                if (targetFile.exists()) {
+                    targetFile.delete();
+                    LogUtils.d(TAG, "【清理无效文件】已删除无效文件：" + targetFile.getAbsolutePath());
+                }
+                return null;
+            }
+        } catch (IOException e) {
+            LogUtils.e(TAG, "【保存异常】写入文件时出错：" + e.getMessage());
+            LogUtils.e(TAG, "【异常堆栈】" + Log.getStackTraceString(e));
+            return null;
+        } finally {
+            // 回收Bitmap资源（避免内存溢出）
+            if (bitmap != null && !bitmap.isRecycled()) {
+                bitmap.recycle();
+                LogUtils.d(TAG, "【资源回收】Bitmap资源已回收");
+            }
+        }
+    }
+
+    /**
+     * 重载方法：自定义保存路径（灵活适配不同场景）
+     * @param context 上下文
+     * @param drawableResId 图片资源ID
+     * @param saveDirPath 自定义保存目录路径（如 "/storage/emulated/0/PowerBell/custom/"）
+     * @param fileName 保存的文件名（带.png后缀）
+     * @return 保存成功返回File对象，失败返回null
+     */
+    public static File saveDrawableToFile(Context context, int drawableResId, String saveDirPath, String fileName) {
+		File filePath = new File(saveDirPath, fileName);
+        return saveDrawableToFile(context, drawableResId, filePath.getAbsolutePath());
+    }
+}
+

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

@@ -1,176 +1,290 @@
 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;
+import android.content.Context;
+import android.net.Uri;
 
 /**
- * 文件读取工具类
+ * 文件操作工具类
+ * 功能：文件读写、复制、图片转换、文件名处理等常用文件操作
+ * 适配：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);
+        }
+    }
+
+	/**
+	 * 复制输入流到文件（兼容Uri解析失败场景）
+	 */
+	public static void copyStreamToFile(InputStream inputStream, File file) throws IOException {
+		if (inputStream == null || file == null) {
+			throw new IllegalArgumentException("InputStream或File不能为空");
+		}
+		File parentDir = file.getParentFile();
+		if (!parentDir.exists() && !parentDir.mkdirs()) {
+			throw new IOException("无法创建父目录：" + parentDir.getAbsolutePath());
+		}
+		try {
+			OutputStream outputStream = new FileOutputStream(file);
+			byte[] buffer = new byte[1024];
+			int length;
+			while ((length = inputStream.read(buffer)) != -1) {
+				outputStream.write(buffer, 0, length);
+			}
+			outputStream.flush();
+		} finally {
+			try {
+				inputStream.close();
+			} catch (IOException e) {
+				LogUtils.e("FileUtils", "关闭输入流失败：" + e.getMessage());
+			}
+		}
+	}
+	
+	public static boolean isFileExists(String path) {
+		File file = new File(path);
+		return file.exists();
+	}
+	
+	/**
+	 * 获取文件后缀（不带点，忽略大小写，适配空文件名/无后缀场景）
+	 * @param file 目标文件
+	 * @return 后缀字符串（无后缀返回空字符串，非空统一小写）
+	 */
+	public static String getFileSuffix(File file) {
+		if (file == null || file.getName().isEmpty()) {
+			return ""; // 空文件/空文件名，返回空
+		}
+		String fileName = file.getName();
+		int lastDotIndex = fileName.lastIndexOf(".");
+		// 无后缀（没有点，或点在开头/结尾）
+		if (lastDotIndex == -1 || lastDotIndex == 0 || lastDotIndex == fileName.length() - 1) {
+			return "";
+		}
+		// 截取后缀并转小写（统一格式，避免 PNG/png 差异）
+		return fileName.substring(lastDotIndex + 1).toLowerCase();
+	}
 }
+

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

@@ -0,0 +1,302 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import androidx.core.content.FileProvider;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
+import com.yalantis.ucrop.UCrop;
+import java.io.File;
+
+/**
+ * 图片裁剪工具类（集成 uCrop 2.2.8 终极兼容版，强制输出 PNG 格式，全程保留透明通道，支持 Uri/File 双传参）
+ */
+public class ImageCropUtils {
+    public static final String TAG = "ImageCropUtils";
+    // FileProvider 授权（与 AndroidManifest 配置一致）
+    private static final String FILE_PROVIDER_SUFFIX = ".fileprovider";
+    // 强制输出格式：固定为 PNG（保留透明通道）
+    private static final String FORCE_OUTPUT_SUFFIX = "png";
+    private static final android.graphics.Bitmap.CompressFormat FORCE_COMPRESS_FORMAT = android.graphics.Bitmap.CompressFormat.PNG;
+
+    // ====================== 核心裁剪方法（强制 PNG 输出，优化逻辑）======================
+    /**
+     * 【Uri 传参版】启动 uCrop 裁剪 - 强制输出 PNG，保留透明通道
+     * @param activity 上下文
+     * @param inputUri 输入图片 Uri（本应用 FileProvider Uri，非空）
+     * @param outputUri 输出图片 Uri（本应用 FileProvider Uri，非空）
+     * @param aspectX 固定比例 X（自由裁剪传 0）
+     * @param aspectY 固定比例 Y（自由裁剪传 0）
+     * @param isFreeCrop 是否自由裁剪
+     * @param requestCode 裁剪请求码
+     */
+    public static void startImageCrop(Activity activity,
+                                      Uri inputUri,
+                                      Uri outputUri,
+                                      int aspectX,
+                                      int aspectY,
+                                      boolean isFreeCrop,
+                                      int requestCode) {
+        // 1. 输入参数校验
+        if (activity == null || activity.isFinishing()) {
+            LogUtils.e(TAG, "【裁剪异常】Activity 无效或已销毁");
+            return;
+        }
+        if (inputUri == null || outputUri == null) {
+            LogUtils.e(TAG, "【裁剪异常】输入/输出 Uri 为空");
+            showToast(activity, "图片 Uri 无效，无法裁剪");
+            return;
+        }
+        if (!isValidUri(activity, inputUri)) {
+            LogUtils.e(TAG, "【裁剪异常】输入 Uri 无效：" + inputUri);
+            showToast(activity, "原图 Uri 无效，无法裁剪");
+            return;
+        }
+
+        // 2. 核心：强制修正输出为 PNG（忽略原图格式，统一转 PNG）
+        File outputFile = uriToFile(activity, outputUri);
+        if (outputFile == null) {
+            LogUtils.e(TAG, "【裁剪异常】输出 Uri 转 File 失败：" + outputUri);
+            showToast(activity, "裁剪输出路径无效");
+            return;
+        }
+        outputFile = correctFileSuffix(outputFile, FORCE_OUTPUT_SUFFIX); // 强制 .png 后缀
+        outputUri = getFileProviderUri(activity, outputFile); // 重新生成 PNG 对应的 Uri
+
+        // 3. 初始化 uCrop + 强制 PNG 配置（保留透明核心）
+        UCrop uCrop = UCrop.of(inputUri, outputUri);
+		uCrop.withAspectRatio(aspectX, aspectY);
+        UCrop.Options options = initCropOptions(activity, isFreeCrop, aspectX, aspectY); // 移除 isPng 参数
+
+        // 4. 启动裁剪
+        uCrop.withOptions(options);
+        uCrop.start(activity, requestCode);
+        LogUtils.d(TAG, "【裁剪启动成功（Uri 版）】强制输出 PNG（透明保留），输出路径：" + outputFile.getAbsolutePath());
+    }
+
+    /**
+     * 【File 传参版】启动 uCrop 裁剪 - 强制输出 PNG，保留透明通道
+     * @param activity 上下文
+     * @param inputFile 输入图片文件（任意格式）
+     * @param outputFile 输出图片文件（最终强制转为 PNG）
+     * @param aspectX 固定比例 X（自由裁剪传 0）
+     * @param aspectY 固定比例 Y（自由裁剪传 0）
+     * @param isFreeCrop 是否自由裁剪
+     * @param requestCode 裁剪请求码
+     */
+    public static void startImageCrop(Activity activity,
+                                      File inputFile,
+                                      File outputFile,
+                                      int aspectX,
+                                      int aspectY,
+                                      boolean isFreeCrop,
+                                      int requestCode) {
+        // 1. 输入参数校验
+        if (activity == null || activity.isFinishing()) {
+            LogUtils.e(TAG, "【裁剪异常】Activity 无效或已销毁");
+            return;
+        }
+        if (inputFile == null || !inputFile.exists() || inputFile.length() <= 100) {
+            LogUtils.e(TAG, "【裁剪异常】输入图片文件无效");
+            showToast(activity, "无有效图片可裁剪");
+            return;
+        }
+        if (outputFile == null) {
+            LogUtils.e(TAG, "【裁剪异常】输出文件路径为空");
+            showToast(activity, "裁剪输出路径无效");
+            return;
+        }
+
+        // 2. 核心：强制修正输出为 PNG（忽略原图格式）
+        Uri inputUri = getFileProviderUri(activity, inputFile);
+        outputFile = correctFileSuffix(outputFile, FORCE_OUTPUT_SUFFIX); // 强制 .png 后缀
+        Uri outputUri = getFileProviderUri(activity, outputFile);
+
+        // 3. 初始化 uCrop + 强制 PNG 配置
+        UCrop uCrop = UCrop.of(inputUri, outputUri);
+		uCrop.withAspectRatio(aspectX, aspectY);
+        UCrop.Options options = initCropOptions(activity, isFreeCrop, aspectX, aspectY); // 移除 isPng 参数
+
+        // 4. 启动裁剪
+        uCrop.withOptions(options);
+        uCrop.start(activity, requestCode);
+        LogUtils.d(TAG, "【裁剪启动成功（File 版）】强制输出 PNG（透明保留），输出路径：" + outputFile.getAbsolutePath());
+    }
+
+    /**
+     * 【BackgroundBean 传参版】启动 uCrop 裁剪 - 强制输出 PNG，保留透明通道
+     */
+    public static void startImageCrop(Activity activity,
+                                      BackgroundBean cropBean,
+                                      int aspectX,
+                                      int aspectY,
+                                      boolean isFreeCrop,
+                                      int requestCode) {
+        File inputFile = new File(cropBean.getBackgroundFilePath());
+        File outputFile = new File(cropBean.getBackgroundScaledCompressFilePath());
+        startImageCrop(activity, inputFile, outputFile, aspectX, aspectY, isFreeCrop, requestCode);
+    }
+
+    // ====================== 裁剪结果处理（保持兼容，优化日志）======================
+    public static String handleCropResult(int requestCode, int resultCode, Intent data, int cropRequestCode) {
+        if (requestCode != cropRequestCode) return null;
+
+        if (resultCode == Activity.RESULT_OK && data != null) {
+            Uri outputUri = UCrop.getOutput(data);
+            if (outputUri != null) {
+                String outputPath = uriToPath(outputUri);
+                LogUtils.d(TAG, "【裁剪成功】强制输出 PNG（透明保留），输出路径：" + outputPath);
+                return outputPath;
+            }
+        } else if (resultCode == UCrop.RESULT_ERROR) {
+            Throwable error = UCrop.getError(data);
+            LogUtils.e(TAG, "【裁剪失败】原因：" + (error != null ? error.getMessage() : "未知错误"));
+        } else {
+            LogUtils.d(TAG, "【裁剪取消】用户手动取消");
+        }
+        return null;
+    }
+
+    // ====================== 辅助方法（优化适配强制 PNG 逻辑）======================
+    /** 校验 Uri 有效性（确保是图片类型） */
+    private static boolean isValidUri(Activity activity, Uri uri) {
+        try {
+            String type = activity.getContentResolver().getType(uri);
+            return type != null && type.startsWith("image/");
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【Uri 校验失败】原因：" + e.getMessage());
+            return false;
+        }
+    }
+
+    /** Uri 转 File（适配 FileProvider Uri 和普通 Uri） */
+    private static File uriToFile(Activity activity, Uri uri) {
+        if (uri == null) return null;
+        try {
+            if (uri.getScheme().equals("file")) {
+                return new File(uri.getPath());
+            }
+            String filePath = uri.getPath();
+            if (filePath == null) return null;
+            if (filePath.contains("/external_files/")) {
+                filePath = filePath.replace("/external_files/", activity.getExternalFilesDir("").getAbsolutePath() + "/");
+            } else if (filePath.contains("/cache/")) {
+                filePath = filePath.replace("/cache/", activity.getCacheDir().getAbsolutePath() + "/");
+            }
+            return new File(filePath);
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【Uri 转 File 失败】uri=" + uri + "，原因：" + e.getMessage());
+            return null;
+        }
+    }
+
+    /** Uri 提取文件路径 */
+    private static String uriToPath(Uri uri) {
+        if (uri == null) return null;
+        try {
+            if (uri.getScheme().equals("file")) {
+                return uri.getPath();
+            }
+            String path = uri.getPath();
+            if (path == null) return null;
+            String[] prefixes = {"/external/", "/external_files/", "/cache/", "/files/"};
+            for (String prefix : prefixes) {
+                if (path.contains(prefix)) {
+                    path = path.substring(path.indexOf(prefix) + prefix.length());
+                    String externalRoot = android.os.Environment.getExternalStorageDirectory().getAbsolutePath();
+                    return externalRoot + "/" + path;
+                }
+            }
+            return path;
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【Uri 转路径失败】uri=" + uri + "，原因：" + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 统一初始化裁剪配置（强制 PNG 专属配置，保留透明核心）
+     * 移除 isPng 参数，全程用 PNG 配置
+     */
+    private static UCrop.Options initCropOptions(Activity activity, boolean isFreeCrop, int aspectX, int aspectY) {
+		
+        UCrop.Options options = new UCrop.Options();
+
+        // 裁剪模式配置（自由裁剪/固定比例）
+        options.setFreeStyleCropEnabled(isFreeCrop); // 开启自由裁剪
+
+        // 裁剪配置（优化体验）
+        //options.setCompressionFormat(android.graphics.Bitmap.CompressFormat.JPEG); // 输出格式
+        //options.setCompressionQuality(100); // 图片质量
+        //options.setHideBottomControls(true); // 隐藏底部控制栏（简化界面）
+        //options.setToolbarTitle("图片裁剪"); // 工具栏标题
+        //options.setToolbarColor(activity.getResources().getColor(R.color.colorPrimary)); // 工具栏颜色（适配项目主题）
+        //options.setStatusBarColor(activity.getResources().getColor(R.color.colorPrimaryDark)); // 状态栏颜色
+		
+
+        // 2. 核心：强制 PNG 保留透明（固定配置，无需判断原图格式）
+        options.setCompressionFormat(FORCE_COMPRESS_FORMAT); // 强制 PNG 压缩
+        options.setCompressionQuality(100); // PNG 100% 质量，不损失透明
+        options.setDimmedLayerColor(activity.getResources().getColor(android.R.color.transparent)); // 遮罩透明（关键）
+        options.setCropFrameColor(activity.getResources().getColor(R.color.colorPrimary)); // 裁剪框主题色
+        options.setCropGridColor(activity.getResources().getColor(R.color.colorAccent)); // 网格线主题色
+
+        // 3. 通用 UI 配置（保持原有风格）
+        options.setHideBottomControls(true); // 隐藏底部控制栏
+        options.setToolbarTitle("图片裁剪");
+        options.setToolbarColor(activity.getResources().getColor(R.color.colorPrimary));
+        options.setToolbarWidgetColor(activity.getResources().getColor(android.R.color.white));
+        options.setStatusBarColor(activity.getResources().getColor(R.color.colorPrimaryDark));
+
+        return options;
+    }
+
+    /**
+     * 修正文件后缀（强制转为 .png，覆盖原有任何图片后缀）
+     */
+    private static File correctFileSuffix(File originFile, String targetSuffix) {
+        String originName = originFile.getName();
+        // 强制替换所有图片后缀为 targetSuffix（避免漏改）
+        originName = originName.replaceAll("\\.(jpg|jpeg|png|bmp|gif)$", "") + "." + targetSuffix;
+        return new File(originFile.getParent(), originName);
+    }
+
+    /** 生成 FileProvider Uri（适配 Android 7.0+） */
+    private static Uri getFileProviderUri(Activity activity, File file) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                String authority = activity.getPackageName() + FILE_PROVIDER_SUFFIX;
+                return FileProvider.getUriForFile(activity, authority, file);
+            } else {
+                return Uri.fromFile(file);
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "【Uri 生成失败】原因：" + e.getMessage());
+            return null;
+        }
+    }
+
+    /** 显示 Toast（避免崩溃） */
+    private static void showToast(Activity activity, String msg) {
+        if (activity != null && !activity.isFinishing()) {
+            android.widget.Toast.makeText(activity, msg, android.widget.Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    // ====================== 公有辅助方法（供外部调用）======================
+    public static Uri getFileProviderUriPublic(Activity activity, File file) {
+        return getFileProviderUri(activity, file);
+    }
+
+    public static File getFileFromUriPublic(Activity activity, Uri uri) {
+        return uriToFile(activity, uri);
+    }
+
+    public static String getPathFromUriPublic(Uri uri) {
+        return uriToPath(uri);
+    }
+}
+

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

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

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

@@ -0,0 +1,416 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.media.RingtoneManager;
+import android.os.Build;
+import android.view.View;
+import android.widget.RemoteViews;
+import androidx.core.app.NotificationCompat;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.models.NotificationMessage;
+import cc.winboll.studio.powerbell.services.ControlCenterService;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/13 20:44
+ * @Describe 全局通知管理工具类（整合所有通知能力，适配API29-30，兼容Java7，所有通知统一跳转MainActivity）
+ */
+public class NotificationManagerUtils {
+	// ====================== 常量定义（统一管理，避免冲突，首屏可见）======================
+	public static final String TAG = "NotificationManagerUtils";
+	// 通知渠道（4大渠道，场景隔离，API26+必填）
+	// 1. 前台服务保活渠道（低优先级，无打扰）
+	private static final String CHANNEL_ID_FOREGROUND_SERVICE = "channel_foreground_service";
+	private static final String CHANNEL_NAME_FOREGROUND_SERVICE = "前台服务保活通知";
+	private static final String CHANNEL_DESC_FOREGROUND_SERVICE = "后台服务运行状态，无声音无震动，不打扰用户";
+	// 2. 电量提醒渠道（高优先级，闹钟铃声+震动，强提醒）
+	private static final String CHANNEL_ID_BATTERY_REMIND = "channel_battery_remind";
+	private static final String CHANNEL_NAME_BATTERY_REMIND = "电量异常提醒通知";
+	private static final String CHANNEL_DESC_BATTERY_REMIND = "电量过高/过低提醒，强震动+闹钟铃声，突破免打扰";
+	// 3. 通用临时通知渠道（高优先级，仅震动，普通告警）
+	private static final String CHANNEL_ID_TEMP_ALERT = "channel_temp_alert";
+	private static final String CHANNEL_NAME_TEMP_ALERT = "通用临时提醒通知";
+	private static final String CHANNEL_DESC_TEMP_ALERT = "普通即时告警，仅震动提醒，自动取消";
+	// 通知ID（唯一区分，避免覆盖，按场景分段）
+	public static final int NOTIFY_ID_FOREGROUND_SERVICE = 1001; // 前台服务
+	public static final int NOTIFY_ID_BATTERY_REMIND = 1002;    // 电量提醒
+	public static final int NOTIFY_ID_TEMP_ALERT = 1003;        // 通用临时通知
+	public static final int NOTIFY_ID_CUSTOM_LAYOUT = 1004;     // 自定义布局通知
+	// 通用配置
+	private static final int PENDING_INTENT_FLAGS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M 
+	? PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE 
+	: PendingIntent.FLAG_UPDATE_CURRENT; // API30安全标志
+	private static final long[] VIBRATE_PATTERN = new long[]{100, 200, 300, 400}; // 标准震动节奏
+	//private static final String DEFAULT_JUMP_PACKAGE = "cc.winboll.studio.powerbell"; // 默认跳转包名（API29+必填）
+
+	// ====================== 成员变量（按场景分组，私有封装，避免外部篡改）======================
+	private final Context mContext;
+	private final NotificationManager mNotificationManager;
+	// 前台服务通知专属
+	private Notification mForegroundServiceNotify;
+	private RemoteViews mForegroundServiceRemoteViews;
+	// 电量提醒通知专属
+	private Notification mBatteryRemindNotify;
+	private RemoteViews mBatteryRemindRemoteViews;
+
+	// ====================== 构造方法（单例思想/实例化通用，自动初始化渠道）======================
+	public NotificationManagerUtils(Context context) {
+		LogUtils.d(TAG, "【初始化】全局通知管理工具类 构造方法调用");
+		this.mContext = context.getApplicationContext(); // 用应用上下文，避免内存泄漏
+		this.mNotificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+		createAllNotificationChannels(); // 自动创建所有渠道（API26+）
+		LogUtils.d(TAG, "【初始化】全局通知管理工具类 完成，渠道创建状态：" + (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? "已创建4个渠道" : "无需创建"));
+	}
+
+	// ====================== 核心基础能力（渠道创建+Intent构建，复用逻辑，减少冗余）======================
+	/**
+	 * 创建所有通知渠道（API26+专属，低版本自动跳过，确保通知正常显示）
+	 */
+	@SuppressWarnings("deprecation")
+	public void createAllNotificationChannels() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			LogUtils.d(TAG, "【渠道管理】开始创建所有通知渠道");
+			createForegroundServiceChannel();
+			createBatteryRemindChannel();
+			createTempAlertChannel();
+			LogUtils.d(TAG, "【渠道管理】4个通知渠道创建完成（含3个核心渠道+预留扩展）");
+		}
+	}
+
+	/**
+	 * 创建前台服务保活渠道（IMPORTANCE_LOW，无声音无震动，不打扰用户）
+	 */
+	private void createForegroundServiceChannel() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			NotificationChannel channel = new NotificationChannel(
+				CHANNEL_ID_FOREGROUND_SERVICE,
+				CHANNEL_NAME_FOREGROUND_SERVICE,
+				NotificationManager.IMPORTANCE_LOW
+			);
+			channel.setDescription(CHANNEL_DESC_FOREGROUND_SERVICE);
+			channel.setSound(null, null);
+			channel.enableVibration(false);
+			channel.setShowBadge(false); // 不显示应用角标
+			channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET); // 锁屏隐藏
+			mNotificationManager.createNotificationChannel(channel);
+			LogUtils.d(TAG, "【渠道管理】前台服务保活渠道创建成功：" + CHANNEL_NAME_FOREGROUND_SERVICE);
+		}
+	}
+
+	/**
+	 * 创建电量提醒渠道（IMPORTANCE_HIGH，闹钟铃声+震动，突破免打扰）
+	 */
+	private void createBatteryRemindChannel() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			NotificationChannel channel = new NotificationChannel(
+				CHANNEL_ID_BATTERY_REMIND,
+				CHANNEL_NAME_BATTERY_REMIND,
+				NotificationManager.IMPORTANCE_HIGH
+			);
+			channel.setDescription(CHANNEL_DESC_BATTERY_REMIND);
+			channel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION), null); // 闹钟铃声
+			channel.enableVibration(true);
+			channel.setVibrationPattern(VIBRATE_PATTERN);
+			channel.setBypassDnd(true); // 突破免打扰
+			channel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC); // 锁屏可见
+			channel.setShowBadge(true);
+			mNotificationManager.createNotificationChannel(channel);
+			LogUtils.d(TAG, "【渠道管理】电量提醒渠道创建成功：" + CHANNEL_NAME_BATTERY_REMIND);
+		}
+	}
+
+	/**
+	 * 创建通用临时通知渠道（IMPORTANCE_HIGH，仅震动，普通告警）
+	 */
+	private void createTempAlertChannel() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			NotificationChannel channel = new NotificationChannel(
+				CHANNEL_ID_TEMP_ALERT,
+				CHANNEL_NAME_TEMP_ALERT,
+				NotificationManager.IMPORTANCE_HIGH
+			);
+			channel.setDescription(CHANNEL_DESC_TEMP_ALERT);
+			//channel.setSound(null, null); // 仅震动，不发声
+			channel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION), null); // 闹钟铃声
+			channel.enableVibration(true);
+			channel.setVibrationPattern(VIBRATE_PATTERN);
+			channel.setBypassDnd(false); // 不突破免打扰
+			channel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
+			channel.setShowBadge(true);
+			mNotificationManager.createNotificationChannel(channel);
+			LogUtils.d(TAG, "【渠道管理】通用临时通知渠道创建成功：" + CHANNEL_NAME_TEMP_ALERT);
+		}
+	}
+
+	/**
+	 * 构建固定跳转PendingIntent（所有通知统一跳转MainActivity，适配API29-30安全规范）
+	 * @return 安全的PendingIntent，确保跳转稳定不泄露
+	 */
+	private PendingIntent buildFixedPendingIntent() {
+		// 固定跳MainActivity，不支持自定义目标
+		Intent intent = new Intent(mContext, MainActivity.class);
+		// API29+ 强制要求：明确包名，避免跳转目标模糊
+		intent.setPackage(mContext.getPackageName());
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); // 跳转时清除栈顶，避免重复创建Activity
+		LogUtils.d(TAG, "【Intent构建】所有通知统一跳转：MainActivity，包名：" + mContext.getPackageName());
+
+		PendingIntent pendingIntent = PendingIntent.getActivity(
+			mContext,
+			0,
+			intent,
+			PENDING_INTENT_FLAGS
+		);
+		LogUtils.d(TAG, "【Intent构建】PendingIntent创建成功，安全标志：" + PENDING_INTENT_FLAGS);
+		return pendingIntent;
+	}
+
+	// ====================== 场景1：前台服务保活通知（支持自定义布局+更新）======================
+	/**
+	 * 初始化前台服务通知自定义布局（RemoteViews）
+	 */
+	private void initForegroundServiceRemoteViews(ControlCenterService service, NotificationMessage msg) {
+		LogUtils.d(TAG, "【布局初始化】开始初始化前台服务通知布局，标题：" + msg.getTitle());
+		mForegroundServiceRemoteViews = new RemoteViews(service.getPackageName(), R.layout.view_servicenotification);
+		mForegroundServiceRemoteViews.setTextViewText(R.id.remoteviewTextView1, msg.getTitle());
+		mForegroundServiceRemoteViews.setTextViewText(R.id.remoteviewTextView3, msg.getContent());
+		mForegroundServiceRemoteViews.setImageViewResource(R.id.remoteviewImageView1, R.drawable.ic_launcher);
+		LogUtils.d(TAG, "【布局初始化】前台服务通知布局填充完成");
+	}
+
+	/**
+	 * 启动前台服务保活通知（ControlCenterService专用，API26+强制要求，保活后台服务）
+	 */
+	public void startForegroundServiceNotify(ControlCenterService service, NotificationMessage msg) {
+		LogUtils.d(TAG, "【前台服务通知】开始构建保活通知，内容：" + msg.getContent());
+		if (service == null || msg == null) {
+			LogUtils.e(TAG, "【前台服务通知】构建失败：Service/NotificationMessage为空");
+			return;
+		}
+
+		// 1. 构建固定跳转Intent（统一跳MainActivity）
+		PendingIntent pendingIntent = buildFixedPendingIntent();
+		// 2. 构建基础通知（兼容API26+渠道，低版本用Builder）
+		Notification.Builder builder;
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			builder = new Notification.Builder(service, CHANNEL_ID_FOREGROUND_SERVICE);
+		} else {
+			builder = new Notification.Builder(service);
+		}
+		mForegroundServiceNotify = builder
+			.setSmallIcon(R.drawable.ic_launcher)
+			.setLargeIcon(BitmapFactory.decodeResource(service.getResources(), R.drawable.ic_launcher))
+			.setContentTitle(msg.getTitle())
+			.setContentText(msg.getContent())
+			.setWhen(System.currentTimeMillis())
+			.setColor(Color.parseColor("#F00606")) // 小图标背景色
+			.setContentIntent(pendingIntent)
+			.setOngoing(true) // 常驻通知，不可滑动取消（保活关键）
+			.setAutoCancel(false) // 禁止点击取消
+			.build();
+		// 3. 设置自定义布局
+		initForegroundServiceRemoteViews(service, msg);
+		mForegroundServiceNotify.contentView = mForegroundServiceRemoteViews;
+		mForegroundServiceNotify.bigContentView = mForegroundServiceRemoteViews;
+		// 4. 启动前台服务（必须调用，否则Service易被回收）
+		service.startForeground(NOTIFY_ID_FOREGROUND_SERVICE, mForegroundServiceNotify);
+		LogUtils.d(TAG, "【前台服务通知】保活通知启动成功，通知ID：" + NOTIFY_ID_FOREGROUND_SERVICE);
+	}
+
+	/**
+	 * 更新前台服务保活通知内容（无需重启服务，直接刷新布局）
+	 */
+	public void updateForegroundServiceNotify(ControlCenterService service, NotificationMessage msg) {
+		LogUtils.d(TAG, "【前台服务通知】开始更新保活通知，新内容：" + msg.getContent());
+		if (mForegroundServiceNotify == null || mForegroundServiceRemoteViews == null) {
+			LogUtils.e(TAG, "【前台服务通知】更新失败：通知对象未初始化，先调用startForegroundServiceNotify");
+			return;
+		}
+		// 更新自定义布局数据
+		initForegroundServiceRemoteViews(service, msg);
+		mForegroundServiceNotify.contentView = mForegroundServiceRemoteViews;
+		mForegroundServiceNotify.bigContentView = mForegroundServiceRemoteViews;
+		// 发送更新
+		mNotificationManager.notify(NOTIFY_ID_FOREGROUND_SERVICE, mForegroundServiceNotify);
+		LogUtils.d(TAG, "【前台服务通知】保活通知更新成功");
+	}
+
+	// ====================== 场景2：电量提醒通知（支持自定义布局+更新+单独取消）======================
+	/**
+	 * 初始化电量提醒通知自定义布局（RemoteViews，支持充电/耗电切换）
+	 */
+	private void initBatteryRemindRemoteViews(ControlCenterService service, NotificationMessage msg) {
+		LogUtils.d(TAG, "【布局初始化】开始初始化电量提醒布局，提醒类型：" + msg.getRemindMSG());
+		mBatteryRemindRemoteViews = new RemoteViews(service.getPackageName(), R.layout.view_remindnotification);
+		mBatteryRemindRemoteViews.setTextViewText(R.id.viewremindnotificationTextView1, msg.getTitle());
+		mBatteryRemindRemoteViews.setImageViewResource(R.id.remoteviewImageView1, R.drawable.ic_launcher);
+		// 切换布局（+：充电提醒，-：耗电提醒）
+		String remindType = msg.getRemindMSG() != null ? msg.getRemindMSG().trim() : "";
+		if ("+".equals(remindType)) {
+			mBatteryRemindRemoteViews.setViewVisibility(R.id.remoteviewUsege, View.GONE);
+			mBatteryRemindRemoteViews.setViewVisibility(R.id.remoteviewCharge, View.VISIBLE);
+			LogUtils.d(TAG, "【布局初始化】电量提醒布局切换：充电提醒");
+		} else if ("-".equals(remindType)) {
+			mBatteryRemindRemoteViews.setViewVisibility(R.id.remoteviewCharge, View.GONE);
+			mBatteryRemindRemoteViews.setViewVisibility(R.id.remoteviewUsege, View.VISIBLE);
+			LogUtils.d(TAG, "【布局初始化】电量提醒布局切换：耗电提醒");
+		} else {
+			mBatteryRemindRemoteViews.setViewVisibility(R.id.remoteviewCharge, View.GONE);
+			mBatteryRemindRemoteViews.setViewVisibility(R.id.remoteviewUsege, View.VISIBLE);
+			LogUtils.w(TAG, "【布局初始化】未知电量提醒类型：" + remindType);
+		}
+	}
+
+	/**
+	 * 初始化电量提醒通知（仅构建，不发送，配合update触发提醒）
+	 */
+	public void initBatteryRemindNotify(ControlCenterService service, NotificationMessage msg) {
+		LogUtils.d(TAG, "【电量提醒通知】开始初始化提醒通知，标题：" + msg.getTitle());
+		if (service == null || msg == null) {
+			LogUtils.e(TAG, "【电量提醒通知】初始化失败：Service/NotificationMessage为空");
+			return;
+		}
+		// 1. 构建固定跳转Intent（统一跳MainActivity）
+		PendingIntent pendingIntent = buildFixedPendingIntent();
+		// 2. 构建基础通知
+		Notification.Builder builder;
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			builder = new Notification.Builder(service, CHANNEL_ID_BATTERY_REMIND);
+		} else {
+			builder = new Notification.Builder(service);
+		}
+		mBatteryRemindNotify = builder
+			.setSmallIcon(R.drawable.ic_launcher)
+			.setLargeIcon(BitmapFactory.decodeResource(service.getResources(), R.drawable.ic_launcher))
+			.setContentTitle(msg.getTitle())
+			.setContentText(msg.getContent())
+			.setWhen(System.currentTimeMillis())
+			.setColor(Color.parseColor("#F00606"))
+			.setContentIntent(pendingIntent)
+			.setAutoCancel(true) // 点击取消
+			.build();
+		// 3. 初始化自定义布局
+		initBatteryRemindRemoteViews(service, msg);
+		mBatteryRemindNotify.contentView = mBatteryRemindRemoteViews;
+		mBatteryRemindNotify.bigContentView = mBatteryRemindRemoteViews;
+		LogUtils.d(TAG, "【电量提醒通知】初始化完成");
+	}
+
+	/**
+	 * 发送/更新电量提醒通知（初始化后调用，触发强提醒）
+	 */
+	public void sendOrUpdateBatteryRemindNotify() {
+		LogUtils.d(TAG, "【电量提醒通知】开始发送/更新提醒");
+		if (mBatteryRemindNotify == null || mBatteryRemindRemoteViews == null) {
+			LogUtils.e(TAG, "【电量提醒通知】发送失败：通知未初始化，先调用initBatteryRemindNotify");
+			return;
+		}
+		mNotificationManager.notify(NOTIFY_ID_BATTERY_REMIND, mBatteryRemindNotify);
+		LogUtils.d(TAG, "【电量提醒通知】发送/更新成功，通知ID：" + NOTIFY_ID_BATTERY_REMIND);
+	}
+
+	/**
+	 * 单独取消电量提醒通知（静态方法，外部可直接调用，无需实例化）
+	 */
+	public static void cancelBatteryRemindNotify(Context context) {
+		LogUtils.d(TAG, "【电量提醒通知】开始取消提醒，通知ID：" + NOTIFY_ID_BATTERY_REMIND);
+		if (context == null) {
+			LogUtils.e(TAG, "【电量提醒通知】取消失败：Context为空");
+			return;
+		}
+		NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+		manager.cancel(NOTIFY_ID_BATTERY_REMIND);
+		LogUtils.d(TAG, "【电量提醒通知】取消成功");
+	}
+
+	// ====================== 场景3：通用临时通知（简单文本，自动取消，无需自定义布局）======================
+	/**
+	 * 显示通用临时通知（普通告警，仅震动，自动取消，统一跳转MainActivity）
+	 * @param title 通知标题
+	 * @param content 通知内容
+	 */
+	public void showTempAlertNotify(String title, String content) {
+		LogUtils.d(TAG, "【通用临时通知】开始构建，标题：" + title + "，内容：" + content);
+		if (title == null || content == null) {
+			LogUtils.e(TAG, "【通用临时通知】构建失败：标题/内容为空");
+			return;
+		}
+		// 1. 构建固定跳转Intent（统一跳MainActivity）
+		PendingIntent pendingIntent = buildFixedPendingIntent();
+		// 2. 用NotificationCompat.Builder（兼容所有版本，简化逻辑）
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext, CHANNEL_ID_TEMP_ALERT)
+			.setSmallIcon(R.drawable.ic_launcher)
+			.setLargeIcon(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.ic_launcher))
+			.setContentTitle(title)
+			.setContentText(content)
+			.setWhen(System.currentTimeMillis())
+			.setContentIntent(pendingIntent)
+			.setPriority(NotificationCompat.PRIORITY_HIGH)
+			.setAutoCancel(true)
+			.setVibrate(VIBRATE_PATTERN);
+		// 3. 发送通知
+		Notification notification = builder.build();
+		mNotificationManager.notify(NOTIFY_ID_TEMP_ALERT, notification);
+		LogUtils.d(TAG, "【通用临时通知】显示成功，通知ID：" + NOTIFY_ID_TEMP_ALERT);
+	}
+
+	// ====================== 场景4：自定义布局通知（灵活扩展，支持复杂样式）======================
+	/**
+	 * 显示自定义布局通知（支持普通布局+大布局，通用所有场景，统一跳转MainActivity）
+	 * @param contentView 普通自定义布局（必填）
+	 * @param bigContentView 下拉大布局（可选）
+	 */
+	public void showCustomLayoutNotify(RemoteViews contentView, RemoteViews bigContentView) {
+		LogUtils.d(TAG, "【自定义布局通知】开始构建，布局ID：" + (contentView != null ? contentView.getLayoutId() : null));
+		if (contentView == null) {
+			LogUtils.e(TAG, "【自定义布局通知】构建失败：普通布局contentView为空");
+			return;
+		}
+		// 1. 构建固定跳转Intent（统一跳MainActivity）
+		PendingIntent pendingIntent = buildFixedPendingIntent();
+		// 2. 构建自定义布局通知
+		NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext, CHANNEL_ID_TEMP_ALERT)
+			.setSmallIcon(R.drawable.ic_launcher) // 必传，不可省略
+			.setContentIntent(pendingIntent)
+			.setContent(contentView)
+			.setPriority(NotificationCompat.PRIORITY_HIGH)
+			.setAutoCancel(true);
+		// 添加大布局（可选）
+		if (bigContentView != null) {
+			builder.setCustomBigContentView(bigContentView);
+			LogUtils.d(TAG, "【自定义布局通知】已添加下拉大布局，布局ID：" + bigContentView.getLayoutId());
+		}
+		// 3. 发送通知
+		Notification notification = builder.build();
+		mNotificationManager.notify(NOTIFY_ID_CUSTOM_LAYOUT, notification);
+		LogUtils.d(TAG, "【自定义布局通知】显示成功，通知ID：" + NOTIFY_ID_CUSTOM_LAYOUT);
+	}
+
+	// ====================== 通知取消工具（支持精准取消/全取消）======================
+	/**
+	 * 取消指定ID的通知（精准取消，灵活控制）
+	 */
+	public void cancelNotifyById(int notifyId) {
+		LogUtils.d(TAG, "【通知管理】开始取消通知，ID：" + notifyId);
+		mNotificationManager.cancel(notifyId);
+		LogUtils.d(TAG, "【通知管理】通知取消成功，ID：" + notifyId);
+	}
+
+	/**
+	 * 取消所有通知（谨慎使用，会清除所有场景的通知）
+	 */
+	public void cancelAllNotifies() {
+		LogUtils.d(TAG, "【通知管理】开始取消所有通知");
+		mNotificationManager.cancelAll();
+		LogUtils.d(TAG, "【通知管理】所有通知取消完成");
+	}
+}
+

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

@@ -1,247 +0,0 @@
-package cc.winboll.studio.powerbell.utils;
-
-/*
- * 参考：
- * https://blog.csdn.net/qq_35507234/article/details/90676587
- * https://blog.csdn.net/qq_16628781/article/details/51548324
- */
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.media.RingtoneManager;
-import android.os.Build;
-import android.view.View;
-import android.widget.RemoteViews;
-import androidx.annotation.RequiresApi;
-import cc.winboll.studio.powerbell.MainActivity;
-import cc.winboll.studio.powerbell.R;
-import cc.winboll.studio.powerbell.beans.NotificationMessage;
-import cc.winboll.studio.powerbell.services.ControlCenterService;
-
-public class NotificationUtils2 {
-
-    public static final String TAG = NotificationHelper.class.getSimpleName();
-
-    Context mContext;
-    NotificationManager mNotificationManager;
-
-    Notification mForegroundNotification;
-    PendingIntent mForegroundPendingIntent;
-    Notification mRemindNotification;
-    PendingIntent mRemindPendingIntent;
-    RemoteViews mrvServiceNotificationView;
-    RemoteViews mrvRemindNotificationView;
-
-    static enum NotificationType { MIN, MAX };
-    private static int _mnServiceNotificationID = 1;
-    private static int _mnRemindNotificationID = 2;
-    private static String _mszChannelIDService = "1";
-    private static String _mszChannelNameService = "Service";
-    private static String _mszChannelIDRemind = "2";
-    private static String _mszChannelNameRemind = "Remind";
-
-//    public NotificationUtils(Context context) {
-//        mContext = context;
-//        mNotificationManager = (NotificationManager) context.getSystemService(
-//            Context.NOTIFICATION_SERVICE);
-//    }
-
-    public NotificationUtils2(Context context) {
-        mContext = context;
-        mNotificationManager = context.getSystemService(NotificationManager.class);
-        //createNotificationChannels();
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    public void createNotificationChannels() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            createServiceChannel();
-            createRemindChannel();
-        }
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private void createServiceChannel() {
-        NotificationChannel channel = new NotificationChannel(
-            _mszChannelIDService,
-            _mszChannelNameService,
-            NotificationManager.IMPORTANCE_LOW
-        );
-        channel.setDescription("Background service updates");
-        channel.setSound(null, null);
-        channel.enableVibration(false);
-        mNotificationManager.createNotificationChannel(channel);
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.O)
-    private void createRemindChannel() {
-        NotificationChannel channel = new NotificationChannel(
-            _mszChannelIDRemind,
-            _mszChannelNameRemind,
-            NotificationManager.IMPORTANCE_HIGH
-        );
-        channel.setDescription("Critical reminders");
-        channel.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM), null);
-        channel.enableVibration(true);
-        channel.setVibrationPattern(new long[]{100, 200, 300, 400});
-        channel.setBypassDnd(true);
-        channel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);
-        mNotificationManager.createNotificationChannel(channel);
-    }
-
-    // 创建并发送服务通知
-    //
-    public void createForegroundNotification(ControlCenterService service, NotificationMessage notificationMessage) {
-        //创建Notification，传入Context和channelId
-        Intent intent = new Intent();//这个intent会传给目标,可以使用getIntent来获取
-        intent.setPackage(service.getPackageName());
-        //LogUtils.d(TAG, "mService.getPackageName() : " + service.getPackageName());
-        intent.setClass(service, MainActivity.class);
-        //LogUtils.d(TAG, "MainActivity.class.getName() : " + MainActivity.class.getName());
-        //这里放一个count用来区分每一个通知
-        //intent.putExtra("intent", "intent--->" + count);//这里设置一个数据,带过去
-
-        //参数1:context 上下文对象
-        //参数2:发送者私有的请求码(Private request code for the sender)
-        //参数3:intent 意图对象
-        //参数4:必须为FLAG_ONE_SHOT,FLAG_NO_CREATE,FLAG_CANCEL_CURRENT,FLAG_UPDATE_CURRENT,中的一个
-        //mForegroundPendingIntent = PendingIntent.getActivity(mService, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			mForegroundPendingIntent = PendingIntent.getActivity(service,
-																 1, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-		} else {
-			mForegroundPendingIntent = PendingIntent.getActivity(service,
-																 1, intent, PendingIntent.FLAG_IMMUTABLE);
-		}
-
-        mForegroundNotification = new Notification.Builder(service, _mszChannelIDService)
-            .setAutoCancel(true)
-            .setContentTitle(notificationMessage.getTitle())
-            .setContentText(notificationMessage.getContent())
-            .setWhen(System.currentTimeMillis())
-            .setSmallIcon(R.drawable.ic_launcher)
-            //设置红色
-            .setColor(Color.parseColor("#F00606"))
-            .setLargeIcon(BitmapFactory.decodeResource(service.getResources(), R.drawable.ic_launcher))
-            .setContentIntent(mForegroundPendingIntent)
-            .build();
-
-        setForegroundNotificationRemoteViews(service, notificationMessage);
-        service.startForeground(_mnServiceNotificationID, mForegroundNotification);
-    }
-
-    void initmrvRemindNotificationView(ControlCenterService service, NotificationMessage notificationMessage) {
-        mrvRemindNotificationView = new RemoteViews(service.getPackageName(), R.layout.view_remindnotification);
-        mrvRemindNotificationView.setTextViewText(R.id.viewremindnotificationTextView1, notificationMessage.getTitle());
-        String szRemindMSG = notificationMessage.getRemindMSG();
-        //LogUtils.d(TAG, "szRemindMSG : " + szRemindMSG);
-        //mrvRemindNotificationView.setTextViewText(R.id.remoteviewTextView2, szRemindMSG);
-        if (szRemindMSG != null) {
-            if (szRemindMSG.trim().equals("-")) {
-                //LogUtils.d(TAG, "-");
-                mrvRemindNotificationView.setViewVisibility(R.id.remoteviewCharge, View.GONE);
-                mrvRemindNotificationView.setViewVisibility(R.id.remoteviewUsege, View.VISIBLE);
-            } else if (szRemindMSG.trim().equals("+")) {
-                //LogUtils.d(TAG, "+");
-                mrvRemindNotificationView.setViewVisibility(R.id.remoteviewUsege, View.GONE);
-                mrvRemindNotificationView.setViewVisibility(R.id.remoteviewCharge, View.VISIBLE);
-            }
-            mrvRemindNotificationView.setImageViewResource(R.id.remoteviewImageView1, R.drawable.ic_launcher);
-            //给我remoteViews上的控件tv_content添加监听事件
-            //remoteViews.setOnClickPendingIntent(R.id.remoteviewLinearLayout1, pi);
-            //return mrvServiceNotificationView;
-        }
-    }
-
-    void initmrvServiceNotificationView(ControlCenterService service, NotificationMessage notificationMessage) {
-        mrvServiceNotificationView = new RemoteViews(service.getPackageName(), R.layout.view_servicenotification);
-        mrvServiceNotificationView.setTextViewText(R.id.remoteviewTextView1, notificationMessage.getTitle());
-        //String szRemindMSG = notificationMessage.getRemindMSG();
-        //mrvServiceNotificationView.setTextViewText(R.id.remoteviewTextView2, szRemindMSG);
-        //rvServiceNotificationView.setTextViewText(R.id.remoteviewTextView3, notificationMessage.getContent() + Integer.toString(nTest));
-        mrvServiceNotificationView.setTextViewText(R.id.remoteviewTextView3, notificationMessage.getContent());
-        mrvServiceNotificationView.setImageViewResource(R.id.remoteviewImageView1, R.drawable.ic_launcher);
-        //给我remoteViews上的控件tv_content添加监听事件
-        //remoteViews.setOnClickPendingIntent(R.id.remoteviewLinearLayout1, pi);
-        //return mrvServiceNotificationView;
-    }
-
-    void setForegroundNotificationRemoteViews(ControlCenterService service, NotificationMessage notificationMessage) {
-        initmrvServiceNotificationView(service, notificationMessage);
-        mForegroundNotification.contentView = mrvServiceNotificationView;
-        mForegroundNotification.bigContentView = mrvServiceNotificationView;
-    }
-
-    void setRemindNotificationRemoteViews(ControlCenterService service, NotificationMessage notificationMessage) {
-        initmrvRemindNotificationView(service, notificationMessage);
-        mRemindNotification.contentView = mrvRemindNotificationView;
-        mRemindNotification.bigContentView = mrvRemindNotificationView;
-    }
-
-    // 更新服务通知
-    //
-    public void updateForegroundNotification(ControlCenterService service, NotificationMessage notificationMessage) {
-        setForegroundNotificationRemoteViews(service, notificationMessage);
-        mNotificationManager.notify(_mnServiceNotificationID, mForegroundNotification);
-
-    }
-
-    // 创建并发送电量提醒通知
-    //
-    public void updateRemindNotification(ControlCenterService service, NotificationMessage notificationMessage) {
-        //LogUtils.d(TAG, "updateRemindNotification : " + notificationMessage.getRemindMSG());
-        setRemindNotificationRemoteViews(service, notificationMessage);
-        mNotificationManager.notify(_mnRemindNotificationID, mRemindNotification);
-    }
-
-    public void createRemindNotification(ControlCenterService service, NotificationMessage notificationMessage) {
-        //LogUtils.d(TAG, "notificationMessage : " + notificationMessage.getRemindMSG());
-        //创建Notification，传入Context和channelId
-        Intent intent = new Intent();//这个intent会传给目标,可以使用getIntent来获取
-        intent.setPackage(service.getPackageName());
-        intent.setClass(service, MainActivity.class);
-        //这里放一个count用来区分每一个通知
-        //intent.putExtra("intent", "intent--->" + count);//这里设置一个数据,带过去
-
-        //参数1:context 上下文对象
-        //参数2:发送者私有的请求码(Private request code for the sender)
-        //参数3:intent 意图对象
-        //参数4:必须为FLAG_ONE_SHOT,FLAG_NO_CREATE,FLAG_CANCEL_CURRENT,FLAG_UPDATE_CURRENT,中的一个
-        //mRemindPendingIntent = PendingIntent.getActivity(mService, 1, intent, PendingIntent.FLAG_CANCEL_CURRENT);
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			mRemindPendingIntent = PendingIntent.getActivity(service,
-                                                             1, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-		} else {
-			mRemindPendingIntent = PendingIntent.getActivity(service,
-                                                             1, intent, PendingIntent.FLAG_IMMUTABLE);
-		}
-
-        mRemindNotification = new Notification.Builder(service, _mszChannelIDRemind)
-            .setAutoCancel(true)
-            .setContentTitle(notificationMessage.getTitle())
-            .setContentText(notificationMessage.getContent())
-            .setWhen(System.currentTimeMillis())
-            .setSmallIcon(R.drawable.ic_launcher)
-            //设置红色
-            .setColor(Color.parseColor("#F00606"))
-            .setLargeIcon(BitmapFactory.decodeResource(service.getResources(), R.drawable.ic_launcher))
-            .setContentIntent(mRemindPendingIntent)
-            .build();
-        setRemindNotificationRemoteViews(service, notificationMessage);
-    }
-    
-    public static void cancelRemindNotification(Context context){
-        // 获取 NotificationManager 实例
-        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        // 撤回指定 ID 的通知栏消息
-        notificationManager.cancel(_mnRemindNotificationID);
-    }
-}
-
-

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

@@ -0,0 +1,350 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ComponentName;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.os.PowerManager;
+import android.provider.Settings;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/12/14 03:05
+ * @Describe 权限申请工具类（Java7兼容版）
+ * 适配 小米手机+API29-30，整合自启动、电池优化、全文件管理权限，专注后台保活核心权限
+ */
+public class PermissionUtils {
+    // ====================== 常量定义（首屏可见，统一管理，避免冲突）======================
+    // 日志标签
+    public static final String TAG = "PermissionUtils";
+    // 权限请求码（按场景分段，避免重复）
+    public static final int REQUEST_IGNORE_BATTERY_OPTIMIZATION = 1000; // 电池优化权限
+    public static final int REQUEST_AUTO_START = 1001;                   // 自启动权限（小米专属）
+    public static final int REQUEST_ALL_FILE_MANAGE = 1002;              // 全文件管理权限（API30+）
+    // SDK版本常量（适配API29-30，替代系统枚举，Java7兼容）
+    private static final int SDK_VERSION_Q = 29;                         // Android 10（API29）
+    private static final int SDK_VERSION_R = 30;                         // Android 11（API30）
+    // 小米自启动权限页面配置（专属跳转路径，精准适配）
+    private static final String XIAOMI_AUTO_START_PACKAGE = "com.miui.securitycenter";
+    private static final String XIAOMI_AUTO_START_CLASS = "com.miui.permcenter.autostart.AutoStartManagementActivity";
+
+    // ====================== 单例模式（Java7标准双重校验锁，线程安全+懒加载）======================
+    private static volatile PermissionUtils sInstance;
+
+    private PermissionUtils() {}
+
+    public static PermissionUtils getInstance() {
+        if (sInstance == null) {
+            synchronized (PermissionUtils.class) {
+                if (sInstance == null) {
+                    sInstance = new PermissionUtils();
+                    LogUtils.d(TAG, "初始化：PermissionUtils 单例创建成功");
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    // ====================== 核心权限1：全文件管理权限（API29-30适配，通用所有机型）======================
+    /**
+     * 检查全文件管理权限（适配API30+ MANAGE_EXTERNAL_STORAGE，兼容API29-旧权限）
+     * @param activity 上下文Activity（不可为null）
+     * @return true=权限已授予，false=权限未授予
+     */
+    public boolean checkAllFileManagePermission(Activity activity) {
+        LogUtils.d(TAG, "全文件权限-检查：开始校验，系统版本=" + Build.VERSION.SDK_INT);
+        if (activity == null) {
+            LogUtils.e(TAG, "全文件权限-检查：失败，Activity为空");
+            return false;
+        }
+
+        // API30+：校验 MANAGE_EXTERNAL_STORAGE 特殊权限
+        if (Build.VERSION.SDK_INT >= SDK_VERSION_R) {
+            boolean hasManagePerm = Environment.isExternalStorageManager();
+            LogUtils.d(TAG, "全文件权限-检查：API30+，MANAGE_EXTERNAL_STORAGE权限=" + (hasManagePerm ? "已授予" : "未授予"));
+            return hasManagePerm;
+        } else if (Build.VERSION.SDK_INT == SDK_VERSION_Q) {
+            LogUtils.d(TAG, "全文件权限-检查：API29，无需申请，默认支持文件管理");
+            return true;
+        } else {
+            boolean hasWritePerm = ContextCompat.checkSelfPermission(activity,
+																	 android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+            LogUtils.d(TAG, "全文件权限-检查：API29以下，WRITE_EXTERNAL_STORAGE权限=" + (hasWritePerm ? "已授予" : "未授予"));
+            return hasWritePerm;
+        }
+    }
+
+    /**
+     * 申请全文件管理权限（适配API30+特殊权限流程，兼容API29-旧权限申请）
+     * @param activity 申请权限的Activity（不可为null）
+     */
+    public void requestAllFileManagePermission(Activity activity) {
+        LogUtils.d(TAG, "全文件权限-申请：开始处理，系统版本=" + Build.VERSION.SDK_INT);
+        if (activity == null || activity.isFinishing()) {
+            LogUtils.e(TAG, "全文件权限-申请：失败，Activity无效/已销毁");
+            return;
+        }
+
+        // 先检查权限，已授予直接返回
+        if (checkAllFileManagePermission(activity)) {
+            LogUtils.d(TAG, "全文件权限-申请：已拥有权限，无需发起");
+            return;
+        }
+
+        // API30+：跳转系统特殊权限申请页（用户手动授权）
+        if (Build.VERSION.SDK_INT >= SDK_VERSION_R) {
+            try {
+                Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                intent.setData(Uri.parse("package:" + activity.getPackageName()));
+                activity.startActivityForResult(intent, REQUEST_ALL_FILE_MANAGE);
+                LogUtils.d(TAG, "全文件权限-申请：API30+，跳转特殊权限申请页");
+            } catch (Exception e) {
+                // 备用跳转：系统设置首页，引导手动操作
+                Intent intent = new Intent(Settings.ACTION_SETTINGS);
+                activity.startActivityForResult(intent, REQUEST_ALL_FILE_MANAGE);
+                LogUtils.w(TAG, "全文件权限-申请：跳转失败，引导手动开启");
+                showAllFileManageTipsDialog(activity);
+            }
+        } else {
+            ActivityCompat.requestPermissions(activity,
+											  new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE},
+											  REQUEST_ALL_FILE_MANAGE);
+            LogUtils.d(TAG, "全文件权限-申请：API29以下，发起WRITE_EXTERNAL_STORAGE权限申请");
+        }
+    }
+
+    // ====================== 核心权限2：自启动权限（小米专属，API29-30适配）======================
+    /**
+     * 检查自启动权限（仅小米机型需要，非小米直接返回无需申请）
+     * @param activity 上下文Activity（不可为null）
+     * @return true=小米机型（需手动开启）；false=非小米机型（无需申请）
+     */
+//    public boolean checkAutoStartPermission(Activity activity) {
+//        LogUtils.d(TAG, "自启动权限-检查：开始，设备品牌=" + Build.BRAND);
+//        if (activity == null) {
+//            LogUtils.e(TAG, "自启动权限-检查：失败，Activity为空");
+//            return false;
+//        }
+//
+//        boolean isXiaomi = Build.BRAND.toLowerCase().contains("xiaomi");
+//        LogUtils.d(TAG, "自启动权限-检查：结果=" + (isXiaomi ? "小米机型（需开启）" : "非小米机型（无需申请）"));
+//        return isXiaomi;
+//    }
+
+    /**
+     * 请求自启动权限（小米专属，多方案跳转，适配API29-30机型差异）
+     * @param activity 申请权限的Activity（不可为null）
+     */
+    public void requestAutoStartPermission(Activity activity) {
+        LogUtils.d(TAG, "自启动权限-申请：开始处理");
+        if (activity == null || activity.isFinishing()) {
+            LogUtils.e(TAG, "自启动权限-申请：失败，Activity无效/已销毁");
+            return;
+        }
+
+        // 非小米机型，直接返回
+//        if (!checkAutoStartPermission(activity)) {
+//            LogUtils.d(TAG, "自启动权限-申请：非小米机型，无需处理");
+//            return;
+//        }
+
+        // API30+ 小米：优先精准跳转自启动管理页
+        if (Build.VERSION.SDK_INT >= SDK_VERSION_R) {
+            try {
+                // 方案1：组件名精准跳转（成功率最高）
+                Intent intent = new Intent();
+                intent.setComponent(new ComponentName(XIAOMI_AUTO_START_PACKAGE, XIAOMI_AUTO_START_CLASS));
+                activity.startActivityForResult(intent, REQUEST_AUTO_START);
+                LogUtils.d(TAG, "自启动权限-申请：API30+，组件名跳转自启动管理页");
+            } catch (Exception e1) {
+                try {
+                    // 方案2：Action备用跳转（兼容机型差异）
+                    Intent intent = new Intent("miui.intent.action.OP_AUTO_START");
+                    intent.setClassName(XIAOMI_AUTO_START_PACKAGE, XIAOMI_AUTO_START_CLASS);
+                    activity.startActivityForResult(intent, REQUEST_AUTO_START);
+                    LogUtils.d(TAG, "自启动权限-申请：API30+，Action跳转自启动管理页");
+                } catch (Exception e2) {
+                    // 方案3：终极备用，跳转系统设置+提示
+                    Intent intent = new Intent(Settings.ACTION_SETTINGS);
+                    activity.startActivityForResult(intent, REQUEST_AUTO_START);
+                    LogUtils.w(TAG, "自启动权限-申请：跳转失败，引导手动操作");
+                    showAutoStartTipsDialog(activity);
+                }
+            }
+            return;
+        }
+
+        // API29 小米：低版本兼容跳转
+        try {
+            Intent intent = new Intent(XIAOMI_AUTO_START_CLASS);
+            intent.setPackage(XIAOMI_AUTO_START_PACKAGE);
+            activity.startActivityForResult(intent, REQUEST_AUTO_START);
+            LogUtils.d(TAG, "自启动权限-申请：API29，低版本跳转自启动管理页");
+        } catch (Exception e) {
+            Intent intent = new Intent(Settings.ACTION_SETTINGS);
+            activity.startActivityForResult(intent, REQUEST_AUTO_START);
+            showAutoStartTipsDialog(activity);
+        }
+    }
+
+    // ====================== 核心权限3：电池优化权限（通用所有机型，API29-30适配）======================
+    /**
+     * 检查忽略电池优化权限（精准判断，API23+有效，低版本视为已拥有）
+     * @param activity 上下文Activity（不可为null）
+     * @return true=已忽略优化；false=未忽略（需申请）
+     */
+    public boolean checkIgnoreBatteryOptimizationPermission(Activity activity) {
+        LogUtils.d(TAG, "电池优化权限-检查：开始，系统版本=" + Build.VERSION.SDK_INT);
+        if (activity == null) {
+            LogUtils.e(TAG, "电池优化权限-检查：失败，Activity为空");
+            return false;
+        }
+
+        // API23以下无此权限，视为已拥有
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            LogUtils.d(TAG, "电池优化权限-检查：API23以下，无需校验，视为已拥有");
+            return true;
+        }
+
+        // API23+ 精准校验权限状态
+        PowerManager powerManager = (PowerManager) activity.getSystemService(Activity.POWER_SERVICE);
+        if (powerManager == null) {
+            LogUtils.e(TAG, "电池优化权限-检查：获取PowerManager失败，校验异常");
+            return false;
+        }
+        boolean isIgnored = powerManager.isIgnoringBatteryOptimizations(activity.getPackageName());
+        LogUtils.d(TAG, "电池优化权限-检查：结果=" + (isIgnored ? "已忽略优化" : "未忽略（需申请）"));
+        return isIgnored;
+    }
+
+    /**
+     * 请求忽略电池优化权限（多方案跳转，适配API29-30，自动判断是否需要申请）
+     * @param activity 申请权限的Activity（不可为null）
+     */
+    public void requestIgnoreBatteryOptimizationPermission(Activity activity) {
+        LogUtils.d(TAG, "电池优化权限-申请：开始处理");
+        if (activity == null || activity.isFinishing()) {
+            LogUtils.e(TAG, "电池优化权限-申请：失败，Activity无效/已销毁");
+            return;
+        }
+
+        // 已拥有权限，直接返回
+        if (checkIgnoreBatteryOptimizationPermission(activity)) {
+            LogUtils.d(TAG, "电池优化权限-申请：已拥有权限，无需发起");
+            return;
+        }
+
+        try {
+            // 方案1：直接跳转一键授权页（优先使用，用户操作简单）
+            Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+            intent.setData(Uri.parse("package:" + activity.getPackageName()));
+            activity.startActivityForResult(intent, REQUEST_IGNORE_BATTERY_OPTIMIZATION);
+            LogUtils.d(TAG, "电池优化权限-申请：跳转一键授权页");
+        } catch (Exception e) {
+            // 方案2：备用跳转优化管理页+提示
+            Intent intent = new Intent(Settings.ACTION_BATTERY_SAVER_SETTINGS);
+            activity.startActivityForResult(intent, REQUEST_IGNORE_BATTERY_OPTIMIZATION);
+            LogUtils.w(TAG, "电池优化权限-申请：跳转失败，引导手动操作");
+            showBatteryOptTipsDialog(activity);
+        }
+    }
+
+    // ====================== 辅助方法：手动开启提示弹窗（适配跳转失败场景）======================
+    /**
+     * 全文件管理权限手动开启提示弹窗
+     */
+    private void showAllFileManageTipsDialog(final Activity activity) {
+        new AlertDialog.Builder(activity)
+			.setTitle("全文件管理权限申请提示")
+			.setMessage("请手动开启全文件管理权限，否则文件操作功能异常：\n1. 进入设置 → 应用 → 本应用 → 权限\n2. 找到「文件管理」/「存储」权限，开启「允许管理所有文件」")
+			.setPositiveButton("知道了", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+				}
+			})
+			.setCancelable(false)
+			.show();
+        LogUtils.d(TAG, "全文件权限：显示手动开启提示弹窗");
+    }
+
+    /**
+     * 自启动权限手动开启提示弹窗（小米专属）
+     */
+    private void showAutoStartTipsDialog(final Activity activity) {
+        new AlertDialog.Builder(activity)
+			.setTitle("自启动权限申请提示")
+			.setMessage("请手动开启自启动权限，否则应用后台保活异常：\n1. 进入小米安全中心 → 应用管理 → 自启动管理\n2. 找到本应用，开启「允许自启动」开关")
+			.setPositiveButton("知道了", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+				}
+			})
+			.setCancelable(false)
+			.show();
+        LogUtils.d(TAG, "自启动权限：显示手动开启提示弹窗");
+    }
+
+    /**
+     * 电池优化权限手动开启提示弹窗
+     */
+    private void showBatteryOptTipsDialog(final Activity activity) {
+        new AlertDialog.Builder(activity)
+			.setTitle("电池优化权限申请提示")
+			.setMessage("请手动忽略电池优化，否则应用后台运行被限制：\n1. 进入设置 → 电池 → 电池优化\n2. 找到本应用，选择「不优化」选项")
+			.setPositiveButton("知道了", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+				}
+			})
+			.setCancelable(false)
+			.show();
+        LogUtils.d(TAG, "电池优化权限：显示手动开启提示弹窗");
+    }
+
+	public void startPermissionRequest(final Activity activity) {
+		// 电池优化权限（通用所有机型）
+		if (!checkIgnoreBatteryOptimizationPermission(activity)) {
+			YesNoAlertDialog.show(activity, activity.getString(R.string.app_name) + "权限申请提示：", "本应用要正常使用，需要申请电池优化与自启动权限。是否进入权限设置步骤？", new YesNoAlertDialog.OnDialogResultListener(){
+					@Override
+					public void onNo() {
+						ToastUtils.show(activity.getString(R.string.app_name) + "应用可能无法正常使用。");
+					}
+					@Override
+					public void onYes() {
+						requestIgnoreBatteryOptimizationPermission(activity);
+					}
+				});
+		}
+    }
+
+	public void handlePermissionRequest(final Activity activity, int requestCode, int resultCode, Intent data) {
+        if (requestCode == PermissionUtils.REQUEST_IGNORE_BATTERY_OPTIMIZATION) {
+			// 自启动权限（小米专属）
+			// 小米机型，发起自启动权限申请
+			requestAutoStartPermission(activity);
+		} else if (requestCode == PermissionUtils.REQUEST_AUTO_START) {
+			// 自启动权限（小米专属）
+			if (App.isDebugging() && !checkAllFileManagePermission(activity)) {
+				// 小米机型，发起自启动权限申请
+				requestAllFileManagePermission(activity);
+			}
+		}
+    }
+}
+

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

@@ -1,207 +0,0 @@
-package cc.winboll.studio.powerbell.utils;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Environment;
-import android.util.Log;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/21 18:55
- * @Describe
- * 图片下载工具类（指定目录保存：Pictures/PowerBell/BackgroundHistory）
- */
-public class PictureUtils {
-    private static final String TAG = "PictureUtils";
-    private static final String ROOT_DIR = "PowerBell/BackgroundHistory"; // 自定义目录结构
-    private static OkHttpClient sOkHttpClient;
-
-    static {
-        sOkHttpClient = new OkHttpClient();
-    }
-
-    /**
-     * 下载网络图片到指定目录（外部存储/Pictures/PowerBell/BackgroundHistory）
-     * @param context 上下文（用于通知相册刷新）
-     * @param imgUrl 图片网络URL
-     * @param callback 下载结果回调（成功/失败）
-     */
-    public static void downloadImageToAlbum(final Context context, final String imgUrl, final DownloadCallback callback) {
-        // 检查参数合法性
-        if (context == null) {
-            if (callback != null) {
-                callback.onFailure(new IllegalArgumentException("Context不能为空"));
-            }
-            return;
-        }
-        if (imgUrl == null || imgUrl.isEmpty()) {
-            if (callback != null) {
-                callback.onFailure(new IllegalArgumentException("图片URL为空"));
-            }
-            return;
-        }
-
-        startDownload(context, imgUrl, callback);
-    }
-
-    /**
-     * 执行实际的下载逻辑
-     */
-    private static void startDownload(final Context context, final String imgUrl, final DownloadCallback callback) {
-        Request request = new Request.Builder().url(imgUrl).build();
-        sOkHttpClient.newCall(request).enqueue(new Callback() {
-				@Override
-				public void onResponse(Call call, Response response) throws IOException {
-					if (!response.isSuccessful()) {
-						if (callback != null) {
-							callback.onFailure(new IOException("请求失败，响应码：" + response.code()));
-						}
-						return;
-					}
-
-					InputStream inputStream = null;
-					FileOutputStream outputStream = null;
-					try {
-						inputStream = response.body().byteStream();
-						// 1. 获取并创建指定保存目录（外部存储/Pictures/PowerBell/BackgroundHistory）
-						File saveDir = getTargetSaveDir(context);
-						if (!saveDir.exists()) {
-							boolean isDirCreated = saveDir.mkdirs(); // 递归创建多级目录
-							if (!isDirCreated) {
-								if (callback != null) {
-									callback.onFailure(new IOException("创建目录失败：" + saveDir.getAbsolutePath()));
-								}
-								return;
-							}
-						}
-
-						// 2. 解析图片后缀
-						String fileSuffix = getImageSuffix(imgUrl, response);
-						// 3. 生成时间戳文件名
-						String fileName = generateTimeFileName() + fileSuffix;
-						// 4. 创建文件
-						final File saveFile = new File(saveDir, fileName);
-
-						// 5. 写入文件
-						outputStream = new FileOutputStream(saveFile);
-						byte[] buffer = new byte[1024 * 4];
-						int len;
-						while ((len = inputStream.read(buffer)) != -1) {
-							outputStream.write(buffer, 0, len);
-						}
-						outputStream.flush();
-
-						// 6. 通知相册刷新（使图片显示在系统相册中）
-						notifyAlbumRefresh(context, saveFile);
-
-						// 成功回调
-						if (callback != null) {
-							callback.onSuccess(saveFile.getAbsolutePath());
-						}
-
-					} catch (Exception e) {
-						Log.e(TAG, "下载图片异常", e);
-						if (callback != null) {
-							callback.onFailure(e);
-						}
-					} finally {
-						// 关闭资源
-						if (inputStream != null) inputStream.close();
-						if (outputStream != null) outputStream.close();
-						if (response.body() != null) response.body().close();
-					}
-				}
-
-				@Override
-				public void onFailure(Call call, final IOException e) {
-					Log.e(TAG, "下载图片失败", e);
-					if (callback != null) {
-						callback.onFailure(e);
-					}
-				}
-			});
-    }
-
-    /**
-     * 获取目标保存目录：外部存储/Pictures/PowerBell/BackgroundHistory
-     */
-    private static File getTargetSaveDir(Context context) {
-        // 优先使用公共Pictures目录（兼容多数设备）
-        File publicPicturesDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
-        if (publicPicturesDir.exists()) {
-            return new File(publicPicturesDir, ROOT_DIR);
-        }
-        // 备选：应用私有Pictures目录（若公共目录不可用）
-        File appPicturesDir = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES);
-        if (appPicturesDir != null) {
-            return new File(appPicturesDir, ROOT_DIR);
-        }
-        // 极端情况：外部存储根目录
-        return new File(Environment.getExternalStorageDirectory(), ROOT_DIR);
-    }
-
-    /**
-     * 解析图片后缀名
-     */
-    private static String getImageSuffix(String imgUrl, Response response) {
-        // 优先从URL解析
-        if (imgUrl.lastIndexOf('.') != -1) {
-            String suffix = imgUrl.substring(imgUrl.lastIndexOf('.'));
-            if (suffix.length() <= 5 && (suffix.contains("png") || suffix.contains("jpg") || suffix.contains("jpeg") || suffix.contains("gif"))) {
-                return suffix.toLowerCase(Locale.getDefault());
-            }
-        }
-        // 从响应头解析
-        String contentType = response.header("Content-Type");
-        if (contentType != null) {
-            if (contentType.contains("png")) return ".png";
-            if (contentType.contains("jpeg") || contentType.contains("jpg")) return ".jpg";
-            if (contentType.contains("gif")) return ".gif";
-        }
-        return ".jpg"; // 默认后缀
-    }
-
-    /**
-     * 生成时间戳文件名
-     */
-    private static String generateTimeFileName() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS", Locale.getDefault());
-        return sdf.format(new Date());
-    }
-
-    /**
-     * 通知相册刷新
-     */
-    private static void notifyAlbumRefresh(Context context, File file) {
-        try {
-            Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-            Uri uri = Uri.fromFile(file);
-            intent.setData(uri);
-            context.sendBroadcast(intent);
-        } catch (Exception e) {
-            Log.e(TAG, "通知相册刷新失败", e);
-        }
-    }
-
-    /**
-     * 下载结果回调接口
-     */
-    public interface DownloadCallback {
-        void onSuccess(String savePath); // 下载成功（子线程回调）
-        void onFailure(Exception e);    // 下载失败（子线程回调）
-    }
-}
-

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.models.BatteryInfoBean;
 import java.util.ArrayList;
 
 public class StringUtils {

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

@@ -1,145 +0,0 @@
-package cc.winboll.studio.powerbell.utils;
-
-/**
- * @Author ZhanGSKen<zhangsken@qq.com>
- * @Date 2024/06/28 04:23:04
- * @Describe UriUtil
- */
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.MediaStore;
-import androidx.core.content.FileProvider;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class UriUtil {
-
-    public static final String TAG = "UriUtil";
-
-    /**
-     * 获取真实路径
-     *
-     * @param context
-     */
-    public static String getFilePathFromUri(Context context, Uri uri) {
-        if (uri == null) {
-            return null;
-        }
-        switch (uri.getScheme()) {
-            case ContentResolver.SCHEME_CONTENT:
-                //Android7.0之后的uri content:// URI
-                return getFilePathFromContentUri(context, uri);
-            case ContentResolver.SCHEME_FILE:
-            default:
-                //Android7.0之前的uri file://
-                return new File(uri.getPath()).getAbsolutePath();
-        }
-    }
-
-    /**
-     * 从uri获取path
-     *
-     * @param uri content://media/external/file/109009
-     *            <p>
-     *            FileProvider适配
-     *            content://com.tencent.mobileqq.fileprovider/external_files/storage/emulated/0/Tencent/QQfile_recv/
-     *            content://com.tencent.mm.external.fileprovider/external/tencent/MicroMsg/Download/
-     */
-    private static String getFilePathFromContentUri(Context context, Uri uri) {
-        if (null == uri) return null;
-        String data = null;
-
-        String[] filePathColumn = {MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.DISPLAY_NAME};
-        Cursor cursor = context.getContentResolver().query(uri, filePathColumn, null, null, null);
-        if (null != cursor) {
-            if (cursor.moveToFirst()) {
-                int index = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
-                if (index > -1) {
-                    data = cursor.getString(index);
-                } else {
-                    int nameIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
-                    String fileName = cursor.getString(nameIndex);
-                    data = getPathFromInputStreamUri(context, uri, fileName);
-                }
-            }
-            cursor.close();
-        }
-        return data;
-    }
-
-    /**
-     * 用流拷贝文件一份到自己APP私有目录下
-     *
-     * @param context
-     * @param uri
-     * @param fileName
-     */
-    private static String getPathFromInputStreamUri(Context context, Uri uri, String fileName) {
-        InputStream inputStream = null;
-        String filePath = null;
-
-        if (uri.getAuthority() != null) {
-            try {
-                inputStream = context.getContentResolver().openInputStream(uri);
-                File file = createTemporalFileFrom(context, inputStream, fileName);
-                filePath = file.getPath();
-
-            } catch (Exception e) {
-            } finally {
-                try {
-                    if (inputStream != null) {
-                        inputStream.close();
-                    }
-                } catch (Exception e) {
-                }
-            }
-        }
-
-        return filePath;
-    }
-
-    public static Uri getUriForFile(Context context, File file) {
-        //Uri uri = FileProvider.getUriForFile(context, context.getPackageName() + ".fileprovider", file);
-        if (Build.VERSION.SDK_INT >= 24) {//android 7.0以上
-            return FileProvider.getUriForFile(context, context.getPackageName() + ".fileprovider", file);
-        }
-        return Uri.fromFile(file);
-    }
-
-    private static File createTemporalFileFrom(Context context, InputStream inputStream, String fileName)
-    throws IOException {
-        File targetFile = null;
-
-        if (inputStream != null) {
-            int read;
-            byte[] buffer = new byte[8 * 1024];
-            //自己定义拷贝文件路径
-            targetFile = new File(context.getExternalCacheDir(), fileName);
-            if (targetFile.exists()) {
-                targetFile.delete();
-            }
-            OutputStream outputStream = new FileOutputStream(targetFile);
-
-            while ((read = inputStream.read(buffer)) != -1) {
-                outputStream.write(buffer, 0, read);
-            }
-            outputStream.flush();
-
-            try {
-                outputStream.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return targetFile;
-    }
-
-
-}

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

@@ -0,0 +1,481 @@
+package cc.winboll.studio.powerbell.utils;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.MediaStore;
+import androidx.core.content.FileProvider;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Uri 工具类（Java7兼容，适配API29-30+小米机型，FileProvider安全适配）
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2024/06/28
+ */
+public class UriUtils {
+    // ====================== 常量定义（顶部统一管理）======================
+    public static final String TAG = "UriUtils";
+    // FileProvider 授权后缀（与Manifest配置保持一致）
+    private static final String FILE_PROVIDER_SUFFIX = ".fileprovider";
+    // 应用公共图片目录（API29+ 适配，替代废弃API）
+    private static final String APP_PUBLIC_PIC_DIR = "PowerBell/";
+    // MIME类型与文件后缀映射表（覆盖常见格式，小米机型精准匹配）
+    private static final Map<String, String> MIME_SUFFIX_MAP = new HashMap<String, String>() {{
+			// 图片格式（重点，含透明格式）
+			put("image/png", "png");
+			put("image/jpeg", "jpg");
+			put("image/jpg", "jpg");
+			put("image/gif", "gif");
+			put("image/bmp", "bmp");
+			put("image/webp", "webp");
+			// 音视频格式
+			put("video/mp4", "mp4");
+			put("video/avi", "avi");
+			put("video/mkv", "mkv");
+			put("audio/mp3", "mp3");
+			put("audio/wav", "wav");
+			// 文档格式
+			put("application/pdf", "pdf");
+			put("application/msword", "doc");
+			put("application/vnd.openxmlformats-officedocument.wordprocessingml.document", "docx");
+			put("application/vnd.ms-excel", "xls");
+			put("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "xlsx");
+		}};
+
+    // ====================== 新增核心方法：Uri 转文件后缀 ======================
+    /**
+     * 【静态公共方法】根据 Uri 获取文件真实后缀（优先MIME类型匹配，适配所有Uri场景+小米机型）
+     * @param context 上下文（非空，用于获取ContentResolver）
+     * @param uri 待解析 Uri（支持 content:// / file:// 双Scheme）
+     * @return 小写文件后缀（如 png/jpg/mp4，无匹配返回空字符串）
+     */
+    public static String getSuffixFromUri(Context context, Uri uri) {
+        LogUtils.d(TAG, "=== getSuffixFromUri 调用 start，Uri：" + (uri != null ? uri.toString() : "null") + " ===");
+        // 1. 基础参数校验
+        if (context == null) {
+            LogUtils.e(TAG, "getSuffixFromUri：Context 为空，获取失败");
+            return "";
+        }
+        if (uri == null) {
+            LogUtils.e(TAG, "getSuffixFromUri：Uri 为空，获取失败");
+            return "";
+        }
+
+        String suffix = "";
+        String scheme = uri.getScheme();
+        // 2. 按 Uri Scheme 分类处理（优先精准匹配，再降级截取）
+        if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
+            // 场景1：content:// Uri（优先通过MIME类型获取，最精准）
+            suffix = getSuffixFromContentUri(context, uri);
+            LogUtils.d(TAG, "getSuffixFromUri：content:// Uri，MIME匹配后缀：" + suffix);
+        } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
+            // 场景2：file:// Uri（直接解析文件名截取后缀）
+            String filePath = new File(uri.getPath()).getAbsolutePath();
+            suffix = getSuffixFromFilePath(filePath);
+            LogUtils.d(TAG, "getSuffixFromUri：file:// Uri，路径截取后缀：" + suffix);
+        } else {
+            // 场景3：未知Scheme（尝试解析Uri路径截取，兜底）
+            String uriPath = uri.getPath();
+            suffix = uriPath != null ? getSuffixFromFilePath(uriPath) : "";
+            LogUtils.w(TAG, "getSuffixFromUri：未知Scheme=" + scheme + "，兜底截取后缀：" + suffix);
+        }
+
+        // 3. 最终结果处理（统一小写，去空）
+        suffix = suffix != null ? suffix.trim().toLowerCase() : "";
+        LogUtils.d(TAG, "=== getSuffixFromUri 调用 end，最终后缀：" + suffix + " ===");
+        return suffix;
+    }
+
+    // ====================== 公有核心方法（对外提供能力，按功能排序）======================
+    /**
+     * Uri 转真实文件路径（核心方法，适配 content:// / file:// 双 Scheme）
+     * @param context 上下文（非空）
+     * @param uri 待转换 Uri（非空）
+     * @return 真实文件绝对路径（转换失败返回 null）
+     */
+    public static String getFilePathFromUri(Context context, Uri uri) {
+        LogUtils.d(TAG, "=== getFilePathFromUri 调用 start ===");
+        if (context == null) {
+            LogUtils.e(TAG, "getFilePathFromUri：Context 为空，转换失败");
+            return null;
+        }
+        if (uri == null) {
+            LogUtils.e(TAG, "getFilePathFromUri：Uri 为空，转换失败");
+            return null;
+        }
+
+        String scheme = uri.getScheme();
+        String filePath = null;
+        // 按 Uri Scheme 分类处理
+        if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
+            LogUtils.d(TAG, "getFilePathFromUri：Scheme=content，执行ContentUri转换");
+            filePath = getFilePathFromContentUri(context, uri);
+        } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
+            LogUtils.d(TAG, "getFilePathFromUri：Scheme=file，直接转换路径");
+            filePath = new File(uri.getPath()).getAbsolutePath();
+        } else {
+            LogUtils.w(TAG, "getFilePathFromUri：未知Scheme=" + scheme + "，转换失败");
+        }
+
+        LogUtils.d(TAG, "=== getFilePathFromUri 调用 end，结果：" + filePath + " ===");
+        return filePath;
+    }
+
+    /**
+     * 文件路径转 Uri（核心方法，适配 Android7.0+ FileProvider，API29-30兼容）
+     * @param context 上下文（非空）
+     * @param filePath 真实文件路径（非空）
+     * @return 安全 Uri（转换失败返回 null）
+     */
+    public static Uri getUriForFile(Context context, String filePath) {
+        LogUtils.d(TAG, "=== getUriForFile（路径版）调用 start ===");
+        // 1. 基础参数校验
+        if (context == null) {
+            LogUtils.e(TAG, "getUriForFile：Context 为空，转换失败");
+            return null;
+        }
+        if (filePath == null || filePath.isEmpty()) {
+            LogUtils.e(TAG, "getUriForFile：文件路径为空，转换失败");
+            return null;
+        }
+
+        // 2. File 对象初始化与校验
+        File file = new File(filePath);
+        LogUtils.d(TAG, "getUriForFile：文件路径=" + file.getAbsolutePath() + "，是否存在=" + file.exists());
+        if (!file.exists() || file.isDirectory()) {
+            LogUtils.e(TAG, "getUriForFile：文件不存在或为目录，转换失败");
+            return null;
+        }
+
+        // 3. 合法路径校验（适配小米机型，避免FileProvider配置外路径）
+        if (!isPathInValidDir(context, file)) {
+            LogUtils.w(TAG, "getUriForFile：路径不在安全配置目录内，小米机型可能出现权限异常");
+        }
+
+        // 4. 调用重载方法生成 Uri
+        Uri uri = getUriForFile(context, file);
+        LogUtils.d(TAG, "=== getUriForFile（路径版）调用 end，结果：" + (uri != null ? uri.toString() : "null") + " ===");
+        return uri;
+    }
+
+    /**
+     * File 对象转 Uri（重载方法，直接接收File，内部安全适配）
+     * @param context 上下文（非空）
+     * @param file 待转换 File 对象（非空）
+     * @return 安全 Uri（转换失败返回 null）
+     */
+    public static Uri getUriForFile(Context context, File file) {
+        LogUtils.d(TAG, "=== getUriForFile（File版）调用 start ===");
+        // 1. 基础参数校验
+        if (context == null) {
+            LogUtils.e(TAG, "getUriForFile：Context 为空，转换失败");
+            return null;
+        }
+        if (file == null) {
+            LogUtils.e(TAG, "getUriForFile：File 对象为空，转换失败");
+            return null;
+        }
+        LogUtils.d(TAG, "getUriForFile：文件路径=" + file.getAbsolutePath() + "，是否存在=" + file.exists());
+        if (!file.exists() || file.isDirectory()) {
+            LogUtils.e(TAG, "getUriForFile：文件不存在或为目录，转换失败");
+            return null;
+        }
+
+        // 2. 按系统版本生成 Uri（API24+ 强制 FileProvider，适配小米机型）
+        Uri uri = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            LogUtils.d(TAG, "getUriForFile：Android7.0+，使用FileProvider生成Uri");
+            String authority = context.getPackageName() + FILE_PROVIDER_SUFFIX;
+            LogUtils.d(TAG, "getUriForFile：FileProvider Authority=" + authority);
+            try {
+                uri = FileProvider.getUriForFile(context, authority, file);
+                LogUtils.d(TAG, "getUriForFile：Content Uri生成成功=" + uri.toString());
+            } catch (IllegalArgumentException e) {
+                LogUtils.e(TAG, "getUriForFile：FileProvider生成失败（小米机型常见原因：路径未配置/Authority不匹配）", e);
+            }
+        } else {
+            LogUtils.d(TAG, "getUriForFile：Android7.0以下，使用Uri.fromFile生成");
+            uri = Uri.fromFile(file);
+            LogUtils.d(TAG, "getUriForFile：File Uri生成成功=" + uri.toString());
+        }
+
+        LogUtils.d(TAG, "=== getUriForFile（File版）调用 end ===");
+        return uri;
+    }
+
+    // ====================== 私有辅助方法（内部逻辑封装，不对外暴露）======================
+    /**
+     * ContentUri 转真实路径（适配 content:// 格式，处理小米机型特殊Uri）
+     * @param context 上下文
+     * @param uri ContentUri（如：content://media/external/file/xxx）
+     * @return 真实文件路径（失败返回 null）
+     */
+    private static String getFilePathFromContentUri(Context context, Uri uri) {
+        LogUtils.d(TAG, "getFilePathFromContentUri：Uri=" + uri.toString());
+        String filePath = null;
+        Cursor cursor = null;
+        // Java7 语法：try-catch-finally 手动关闭Cursor，避免内存泄漏
+        try {
+            // 查询字段：优先 DATA 字段，失败则通过文件名+流拷贝获取
+            String[] queryColumns = {MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.DISPLAY_NAME};
+            cursor = context.getContentResolver().query(uri, queryColumns, null, null, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                // 优先读取 DATA 字段（直接获取路径）
+                int dataIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
+                if (dataIndex != -1) {
+                    filePath = cursor.getString(dataIndex);
+                    LogUtils.d(TAG, "getFilePathFromContentUri：从DATA字段获取路径=" + filePath);
+                } else {
+                    // DATA 字段为空，通过流拷贝到私有目录获取路径（小米机型特殊场景适配）
+                    int nameIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
+                    String fileName = cursor.getString(nameIndex);
+                    LogUtils.d(TAG, "getFilePathFromContentUri：DATA字段为空，通过流拷贝获取，文件名=" + fileName);
+                    filePath = getPathFromInputStreamUri(context, uri, fileName);
+                }
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "getFilePathFromContentUri：查询失败", e);
+        } finally {
+            // 强制关闭Cursor，避免资源泄漏（Java7 必须手动处理）
+            if (cursor != null) {
+                try {
+                    cursor.close();
+                } catch (Exception e) {
+                    LogUtils.e(TAG, "getFilePathFromContentUri：关闭Cursor失败", e);
+                }
+            }
+        }
+        return filePath;
+    }
+
+    /**
+     * 流拷贝获取路径（适配无 DATA 字段的 ContentUri，小米机型特殊Uri兼容）
+     * 将目标文件拷贝到应用私有缓存目录，返回拷贝后的路径
+     * @param context 上下文
+     * @param uri ContentUri
+     * @param fileName 文件名
+     * @return 拷贝后的文件路径（失败返回 null）
+     */
+    private static String getPathFromInputStreamUri(Context context, Uri uri, String fileName) {
+        LogUtils.d(TAG, "getPathFromInputStreamUri：开始流拷贝，文件名=" + fileName);
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        File targetFile = null;
+        try {
+            // 1. 打开输入流（读取Uri对应文件）
+            inputStream = context.getContentResolver().openInputStream(uri);
+            if (inputStream == null) {
+                LogUtils.e(TAG, "getPathFromInputStreamUri：输入流打开失败");
+                return null;
+            }
+
+            // 2. 创建目标文件（应用私有缓存目录，无权限限制）
+            targetFile = new File(context.getExternalCacheDir(), fileName);
+            // 若文件已存在，先删除（避免覆盖导致格式异常）
+            if (targetFile.exists()) {
+                boolean deleteSuccess = targetFile.delete();
+                LogUtils.d(TAG, "getPathFromInputStreamUri：删除已存在文件，结果=" + deleteSuccess);
+            }
+
+            // 3. 流拷贝（Java7 手动处理流，避免 try-with-resources）
+            outputStream = new FileOutputStream(targetFile);
+            byte[] buffer = new byte[8 * 1024]; // 8KB 缓冲区，平衡效率与内存
+            int readLength;
+            while ((readLength = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, readLength);
+            }
+            outputStream.flush();
+            LogUtils.d(TAG, "getPathFromInputStreamUri：流拷贝成功，路径=" + targetFile.getAbsolutePath());
+        } catch (Exception e) {
+            LogUtils.e(TAG, "getPathFromInputStreamUri：流拷贝失败", e);
+            // 拷贝失败，删除临时文件
+            if (targetFile != null && targetFile.exists()) {
+                targetFile.delete();
+            }
+            targetFile = null;
+        } finally {
+            // 强制关闭流，避免资源泄漏（Java7 必须手动关闭）
+            try {
+                if (outputStream != null) {
+                    outputStream.close();
+                }
+            } catch (IOException e) {
+                LogUtils.e(TAG, "getPathFromInputStreamUri：关闭输出流失败", e);
+            }
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                LogUtils.e(TAG, "getPathFromInputStreamUri：关闭输入流失败", e);
+            }
+        }
+        return targetFile != null ? targetFile.getAbsolutePath() : null;
+    }
+
+    /**
+     * 校验路径是否在安全目录内（适配API29-30+小米机型，避免FileProvider权限异常）
+     * 仅允许：应用私有目录、缓存目录、应用专属公共目录
+     * @param context 上下文
+     * @param file 待校验文件
+     * @return true=安全路径，false=非安全路径
+     */
+    private static boolean isPathInValidDir(Context context, File file) {
+        String absolutePath = file.getAbsolutePath();
+        // 1. 应用外部私有目录（API29+ 推荐，无权限限制）
+        String externalPrivateDir = context.getExternalFilesDir(null) != null 
+			? context.getExternalFilesDir(null).getAbsolutePath() 
+			: "";
+        // 2. 应用内部私有目录（无权限限制）
+        String internalPrivateDir = context.getFilesDir().getAbsolutePath();
+        // 3. 应用缓存目录（无权限限制）
+        String cacheDir = context.getCacheDir().getAbsolutePath();
+        // 4. 应用专属公共目录（API29+ 适配，替代废弃的 getExternalStoragePublicDirectory）
+        String appPublicDir = Environment.getExternalStorageDirectory().getAbsolutePath() 
+			+ File.separator + Environment.DIRECTORY_PICTURES 
+			+ File.separator + APP_PUBLIC_PIC_DIR;
+
+        // 校验路径是否在安全目录内（小米机型必须严格校验，否则FileProvider会抛异常）
+        boolean isInValidDir = absolutePath.startsWith(externalPrivateDir)
+			|| absolutePath.startsWith(internalPrivateDir)
+			|| absolutePath.startsWith(cacheDir)
+			|| absolutePath.startsWith(appPublicDir);
+
+        LogUtils.d(TAG, "isPathInValidDir：外部私有目录=" + externalPrivateDir 
+				   + "，公共目录=" + appPublicDir 
+				   + "，校验结果=" + isInValidDir);
+        return isInValidDir;
+    }
+
+    /**
+     * 流拷贝创建临时文件（内部辅助，封装拷贝逻辑）
+     * @param context 上下文
+     * @param inputStream 输入流
+     * @param fileName 文件名
+     * @return 临时文件（失败返回 null）
+     * @throws IOException 流操作异常
+     */
+    private static File createTemporalFileFrom(Context context, InputStream inputStream, String fileName) throws IOException {
+        File targetFile = null;
+        if (inputStream != null) {
+            byte[] buffer = new byte[8 * 1024];
+            int readLength;
+            targetFile = new File(context.getExternalCacheDir(), fileName);
+            if (targetFile.exists()) {
+                targetFile.delete();
+            }
+            OutputStream outputStream = new FileOutputStream(targetFile);
+            while ((readLength = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, readLength);
+            }
+            outputStream.flush();
+            outputStream.close();
+        }
+        return targetFile;
+    }
+
+    /**
+     * 辅助：ContentUri 通过 MIME 类型获取后缀（精准匹配，不受文件名伪造影响）
+     * @param context 上下文
+     * @param uri ContentUri
+     * @return 匹配的后缀（无匹配返回空字符串）
+     */
+    private static String getSuffixFromContentUri(Context context, Uri uri) {
+        String mime = null;
+        try {
+            // 通过 ContentResolver 获取 Uri 对应的 MIME 类型（系统级匹配，最精准）
+            mime = context.getContentResolver().getType(uri);
+            LogUtils.d(TAG, "getSuffixFromContentUri：获取MIME类型=" + mime);
+            if (mime == null || mime.isEmpty()) {
+                // MIME 为空，尝试解析文件名兜底
+                String fileName = getFileNameFromContentUri(context, uri);
+                return getSuffixFromFilePath(fileName);
+            }
+            // MIME 类型匹配后缀（优先完全匹配，再模糊匹配）
+            if (MIME_SUFFIX_MAP.containsKey(mime)) {
+                return MIME_SUFFIX_MAP.get(mime);
+            }
+            // 模糊匹配（如 image/* 匹配通用图片后缀，默认png）
+            if (mime.startsWith("image/")) {
+                return "png";
+            } else if (mime.startsWith("video/")) {
+                return "mp4";
+            } else if (mime.startsWith("audio/")) {
+                return "mp3";
+            } else if (mime.startsWith("application/")) {
+                return "pdf";
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "getSuffixFromContentUri：MIME解析失败，mime=" + mime, e);
+        }
+        // 所有方式失败，解析Uri路径兜底
+        return getSuffixFromFilePath(uri.getPath());
+    }
+
+    /**
+     * 辅助：从 ContentUri 获取文件名（MIME 解析失败时兜底）
+     * @param context 上下文
+     * @param uri ContentUri
+     * @return 文件名（失败返回空字符串）
+     */
+    private static String getFileNameFromContentUri(Context context, Uri uri) {
+        Cursor cursor = null;
+        try {
+            String[] queryColumns = {MediaStore.MediaColumns.DISPLAY_NAME};
+            cursor = context.getContentResolver().query(uri, queryColumns, null, null, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                int nameIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
+                return cursor.getString(nameIndex);
+            }
+        } catch (Exception e) {
+            LogUtils.e(TAG, "getFileNameFromContentUri：查询失败", e);
+        } finally {
+            if (cursor != null) {
+                try {
+                    cursor.close();
+                } catch (Exception e) {
+                    LogUtils.e(TAG, "getFileNameFromContentUri：关闭Cursor失败", e);
+                }
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 辅助：从文件路径/文件名截取后缀（兜底方案，处理各种路径格式）
+     * @param path 文件路径/文件名
+     * @return 截取的后缀（无后缀返回空字符串）
+     */
+    private static String getSuffixFromFilePath(String path) {
+        if (path == null || path.isEmpty()) {
+            return "";
+        }
+        // 处理路径中的分隔符（兼容 Windows/Android 路径格式）
+        path = path.replace("\\", "/");
+        // 取最后一个 "/" 后的文件名（避免路径包含 "." 导致误判）
+        int lastSepIndex = path.lastIndexOf("/");
+        if (lastSepIndex != -1 && lastSepIndex < path.length() - 1) {
+            path = path.substring(lastSepIndex + 1);
+        }
+        // 截取最后一个 "." 后的后缀（过滤无后缀/点开头/点结尾场景）
+        int lastDotIndex = path.lastIndexOf(".");
+        if (lastDotIndex == -1 || lastDotIndex == 0 || lastDotIndex == path.length() - 1) {
+            return "";
+        }
+        // 过滤后缀中的非法字符（仅保留字母/数字，避免特殊字符干扰）
+        String suffix = path.substring(lastDotIndex + 1).replaceAll("[^a-zA-Z0-9]", "");
+        // 限制后缀长度（1-5位，避免超长伪造后缀）
+        return suffix.length() >= 1 && suffix.length() <= 5 ? suffix : "";
+    }
+}
+

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

@@ -4,327 +4,228 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/11/19 18:01
- * @Describe 背景图片视图控件（支持预览临时图片 + 外部刷新）
+ * 基于Java7的BackgroundView（LinearLayout+ImageView，保持原图比例居中平铺）
+ * 核心：ImageView保持原图比例，在LinearLayout中居中平铺，无拉伸、无裁剪
  */
 public class BackgroundView extends RelativeLayout {
 
     public static final String TAG = "BackgroundView";
+    // 新增：记录当前已缓存的图片路径
+    private String mCurrentCachedPath = "";
 
-    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; // 默认 1:1
-    // 标记当前是否处于预览状态
-    private boolean isPreviewMode = false;
+    private Context mContext;
+    private LinearLayout mLlContainer; // 主容器LinearLayout
+    private ImageView mIvBackground;   // 图片显示控件
+    private float mImageAspectRatio = 1.0f; // 原图宽高比（宽/高）
 
+    // ====================================== 构造器（Java7兼容） ======================================
     public BackgroundView(Context context) {
         super(context);
+        LogUtils.d(TAG, "=== BackgroundView 构造器1 启动 ===");
         this.mContext = context;
         initView();
     }
 
     public BackgroundView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        LogUtils.d(TAG, "=== BackgroundView 构造器2 启动 ===");
         this.mContext = context;
         initView();
     }
 
     public BackgroundView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        LogUtils.d(TAG, "=== BackgroundView 构造器3 启动 ===");
         this.mContext = context;
         initView();
     }
 
-    public BackgroundView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        this.mContext = context;
-        initView();
+    // ====================================== 初始化 ======================================
+    private void initView() {
+        LogUtils.d(TAG, "=== initView 启动 ===");
+        // 1. 配置当前控件：全屏+透明
+        setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+        // 2. 初始化主容器LinearLayout
+        initLinearLayout();
+
+        // 3. 初始化ImageView
+        initImageView();
+
+        // 初始设置透明背景
+        setDefaultTransparentBackground();
+
+        LogUtils.d(TAG, "=== initView 完成 ===");
     }
 
-    void initView() {
-        initBackgroundImageView();
-        initBackgroundImagePath();
-        loadAndSetImageViewBackground();
+    private void initLinearLayout() {
+        LogUtils.d(TAG, "=== initLinearLayout 启动 ===");
+        mLlContainer = new LinearLayout(mContext);
+        // 配置LinearLayout：全屏+垂直方向+居中
+        LinearLayout.LayoutParams llParams = new LinearLayout.LayoutParams(
+			LinearLayout.LayoutParams.MATCH_PARENT,
+			LinearLayout.LayoutParams.MATCH_PARENT
+        );
+        mLlContainer.setLayoutParams(llParams);
+        mLlContainer.setOrientation(LinearLayout.VERTICAL);
+        mLlContainer.setGravity(android.view.Gravity.CENTER); // 子View居中
+        mLlContainer.setBackgroundColor(0x00000000);
+        this.addView(mLlContainer);
+        LogUtils.d(TAG, "=== initLinearLayout 完成 ===");
     }
 
-    private void initBackgroundImageView() {
-        ivBackground = new ImageView(mContext);
-        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
-			LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
-        ivBackground.setLayoutParams(layoutParams);
-        ivBackground.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        this.addView(ivBackground);
+    private void initImageView() {
+        LogUtils.d(TAG, "=== initImageView 启动 ===");
+        mIvBackground = new ImageView(mContext);
+        // 配置ImageView：wrap_content+居中+透明背景
+        LinearLayout.LayoutParams ivParams = new LinearLayout.LayoutParams(
+			LinearLayout.LayoutParams.WRAP_CONTENT,
+			LinearLayout.LayoutParams.WRAP_CONTENT
+        );
+        mIvBackground.setLayoutParams(ivParams);
+        mIvBackground.setScaleType(ScaleType.FIT_CENTER); // 保持比例+居中平铺
+        mIvBackground.setBackgroundColor(0x00000000);
+        mLlContainer.addView(mIvBackground);
+        LogUtils.d(TAG, "=== initImageView 完成 ===");
     }
 
-    private void initBackgroundImagePath() {
-        File externalFilesDir = mContext.getExternalFilesDir(null);
-        if (externalFilesDir == null) {
-            LogUtils.e(TAG, "外置存储不可用，无法初始化背景图片路径");
+    public void loadBackgroundBean(BackgroundBean bean) {
+        loadBackgroundBean(bean, false);
+    }
+
+	public void loadBackgroundBean(BackgroundBean bean, boolean isRefresh) {
+        if (!bean.isUseBackgroundFile()) {
+            setDefaultTransparentBackground();
             return;
         }
+        String targetPath = bean.isUseBackgroundScaledCompressFile()
+			? bean.getBackgroundScaledCompressFilePath()
+			: bean.getBackgroundFilePath();
 
-        File backgroundDir = new File(externalFilesDir, BACKGROUND_IMAGE_FOLDER);
-        if (!backgroundDir.exists()) {
-            backgroundDir.mkdirs();
-        }
-        backgroundSourceFilePath = new File(backgroundDir, BACKGROUND_IMAGE_FILENAME).getAbsolutePath();
+		if (!(new File(targetPath).exists())) {
+			LogUtils.d(TAG, String.format("视图控件图片不存在：%s", targetPath));
+			return;
+		}
+
+		// 调用带路径判断的loadImage方法
+		if (isRefresh) {
+			App._mBitmapCacheUtils.removeCachedBitmap(targetPath);
+			App._mBitmapCacheUtils.cacheBitmap(targetPath);
+		}
+		loadImage(targetPath);
     }
 
+    // ====================================== 对外方法 ======================================
     /**
-     * 拷贝图片文件到背景资源目录（正式背景）
+     * 改造后：添加路径判断，路径更新时同步更新缓存；缓存Bitmap为null时提示并加载透明背景
+     * @param imagePath 图片绝对路径
      */
-    public void saveToBackgroundSources(String srcBackgroundPath) {
-        initBackgroundImagePath();
-        if (backgroundSourceFilePath == null) {
-            LogUtils.e(TAG, "目标路径初始化失败，无法保存背景图片");
+    public void loadImage(String imagePath) {
+        LogUtils.d(TAG, "=== loadImage 启动，路径：" + imagePath + " ===");
+        if (TextUtils.isEmpty(imagePath)) {
+            setDefaultTransparentBackground();
             return;
         }
 
-        File srcFile = new File(srcBackgroundPath);
-        if (!srcFile.exists() || !srcFile.isFile()) {
-            LogUtils.e(TAG, String.format("源文件不存在或不是文件：%s", srcBackgroundPath));
+        File imageFile = new File(imagePath);
+        if (!imageFile.exists() || !imageFile.isFile()) {
+            LogUtils.e(TAG, "图片文件无效");
+            setDefaultTransparentBackground();
             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());
+        mIvBackground.setVisibility(View.GONE);
+
+        // ======================== 新增：路径判断逻辑 ========================
+        // 1. 路径未变化：直接使用缓存
+        if (imagePath.equals(mCurrentCachedPath)) {
+			Bitmap cachedBitmap = App._mBitmapCacheUtils.getCachedBitmap(imagePath);
+			// 核心修改：判断缓存Bitmap是否为null
+			if (cachedBitmap != null && !cachedBitmap.isRecycled()) {
+				LogUtils.d(TAG, "loadImage: 路径未变，使用缓存 Bitmap");
+				mImageAspectRatio = (float) cachedBitmap.getWidth() / cachedBitmap.getHeight();
+				mIvBackground.setImageBitmap(cachedBitmap);
+				adjustImageViewSize();
+				mIvBackground.setVisibility(View.VISIBLE);
+				return;
+			} else {
+                // 缓存Bitmap为空或已回收，提示并加载透明背景
+                LogUtils.e(TAG, "loadImage: 全局位图缓存为空或已回收 - " + imagePath);
+                ToastUtils.show("全局位图缓存为空，无法加载图片");
+                setDefaultTransparentBackground();
                 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());
-                }
-            }
+        // 2. 路径已更新：移除旧缓存，加载新图片并更新缓存
+        if (!TextUtils.isEmpty(mCurrentCachedPath)) {
+            App._mBitmapCacheUtils.removeCachedBitmap(mCurrentCachedPath);
+            LogUtils.d(TAG, "loadImage: 路径已更新，移除旧缓存 - " + mCurrentCachedPath);
         }
-    }
+        // ======================== 路径判断逻辑结束 ========================
 
-    /**
-     * 【新增公共函数】预览临时图片（不修改正式背景文件）
-     * @param previewImagePath 临时预览图片的路径
-     */
-    public void previewBackgroundImage(String previewImagePath) {
-        if (previewImagePath == null || previewImagePath.isEmpty()) {
-            LogUtils.e(TAG, "预览图片路径为空");
+        // 无缓存/路径更新：走原有逻辑加载图片
+        if (!calculateImageAspectRatio(imageFile)) {
+            setDefaultTransparentBackground();
             return;
         }
 
-        File previewFile = new File(previewImagePath);
-        if (!previewFile.exists() || !previewFile.isFile()) {
-            LogUtils.e(TAG, "预览图片不存在或不是文件：" + previewImagePath);
-            return;
-        }
-
-        // 计算预览图片宽高比
-        if (!calculateImageAspectRatio(previewFile)) {
-            LogUtils.e(TAG, "预览图片尺寸无效，无法预览");
-            return;
-        }
-
-        // 压缩加载预览图片
-        Bitmap previewBitmap = decodeBitmapWithCompress(previewFile, 1080, 1920);
-        if (previewBitmap == null) {
-            LogUtils.e(TAG, "预览图片加载失败");
-            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);
-    }
-
-    /**
-     * 【新增公共函数】退出预览模式，恢复显示正式背景图片
-     */
-    public void exitPreviewMode() {
-        if (isPreviewMode) {
-            loadAndSetImageViewBackground();
-            isPreviewMode = false;
-            LogUtils.d(TAG, "退出预览模式，恢复正式背景");
-        }
-    }
-
-    /**
-     * 公共函数：供外部类调用，重新加载正式背景图片（刷新显示）
-     */
-    public void reloadBackgroundImage() {
-        LogUtils.d(TAG, "外部调用重新加载背景图片");
-        initBackgroundImagePath();
-        loadAndSetImageViewBackground();
-        // 若处于预览模式，退出预览
-        if (isPreviewMode) {
-            isPreviewMode = false;
-        }
-    }
-
-    /**
-     * 加载正式背景图片并设置到 ImageView
-     */
-    private void loadAndSetImageViewBackground() {
-        if (backgroundSourceFilePath == null) {
-            setDefaultImageViewBackground();
-            return;
-        }
-
-        File backgroundFile = new File(backgroundSourceFilePath);
-        if (!backgroundFile.exists() || !backgroundFile.isFile()) {
-            LogUtils.e(TAG, "背景图片不存在：" + backgroundSourceFilePath);
-            setDefaultImageViewBackground();
-            return;
-        }
-
-        if (!calculateImageAspectRatio(backgroundFile)) {
-            setDefaultImageViewBackground();
-            return;
-        }
-
-        Bitmap bitmap = decodeBitmapWithCompress(backgroundFile, 1080, 1920);
+        Bitmap bitmap = decodeBitmapWithCompress(imageFile, 1080, 1920);
         if (bitmap == null) {
-            LogUtils.e(TAG, "图片加载失败，无法解析为 Bitmap");
-            setDefaultImageViewBackground();
+            LogUtils.e(TAG, "loadImage: 图片解码失败");
+            ToastUtils.show("图片解码失败，无法加载");
+            setDefaultTransparentBackground();
             return;
         }
 
-        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);
-        }
+        // 缓存新图片，并更新当前缓存路径记录
+        App._mBitmapCacheUtils.cacheBitmap(imagePath);
+        mCurrentCachedPath = imagePath;
+        LogUtils.d(TAG, "loadImage: 加载新图片并更新缓存 - " + imagePath);
 
+        mIvBackground.setImageDrawable(new BitmapDrawable(mContext.getResources(), bitmap));
         adjustImageViewSize();
-        LogUtils.d(TAG, "ImageView 背景加载成功，宽高比：" + imageAspectRatio);
+        mIvBackground.setVisibility(View.VISIBLE);
+        LogUtils.d(TAG, "=== loadImage 完成 ===");
     }
 
-    /**
-     * 计算图片宽高比（宽/高）
-     */
+    // ====================================== 内部工具方法 ======================================
     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);
+            int width = options.outWidth;
+            int height = options.outHeight;
+            if (width <= 0 || height <= 0) {
+                LogUtils.e(TAG, "图片尺寸无效");
                 return false;
             }
 
-            imageAspectRatio = (float) imageWidth / imageHeight;
+            mImageAspectRatio = (float) width / height;
+            LogUtils.d(TAG, "原图比例：" + mImageAspectRatio);
             return true;
         } catch (Exception e) {
-            LogUtils.e(TAG, "计算图片宽高比失败：" + e.getMessage());
+            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);
-    }
-
-    /**
-     * 带压缩的 Bitmap 解码（避免 OOM）
-     */
     private Bitmap decodeBitmapWithCompress(File file, int maxWidth, int maxHeight) {
         try {
             BitmapFactory.Options options = new BitmapFactory.Options();
@@ -334,41 +235,59 @@ public class BackgroundView extends RelativeLayout {
             int scaleX = options.outWidth / maxWidth;
             int scaleY = options.outHeight / maxHeight;
             int inSampleSize = Math.max(scaleX, scaleY);
-            if (inSampleSize <= 0) {
-                inSampleSize = 1;
-            }
+            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());
+            LogUtils.e(TAG, "压缩解码失败：" + e.getMessage());
             return null;
         }
     }
 
-    /**
-     * 设置默认背景（图片加载失败时兜底）
-     */
-    private void setDefaultImageViewBackground() {
-        ivBackground.setBackgroundResource(R.drawable.default_background);
-        imageAspectRatio = 1.0f;
-        adjustImageViewSize();
-        LogUtils.d(TAG, "已设置 ImageView 默认背景");
+    private void adjustImageViewSize() {
+        if (mLlContainer == null || mIvBackground == null) {
+            return;
+        }
+
+        int llWidth = mLlContainer.getWidth();
+        int llHeight = mLlContainer.getHeight();
+
+        if (llWidth != 0 && llHeight != 0) {
+            int ivWidth, ivHeight;
+            if (mImageAspectRatio >= 1.0f) {
+                ivWidth = Math.min((int) (llHeight * mImageAspectRatio), llWidth);
+                ivHeight = (int) (ivWidth / mImageAspectRatio);
+            } else {
+                ivHeight = Math.min((int) (llWidth / mImageAspectRatio), llHeight);
+                ivWidth = (int) (ivHeight * mImageAspectRatio);
+            }
+
+            LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mIvBackground.getLayoutParams();
+            params.width = ivWidth;
+            params.height = ivHeight;
+            mIvBackground.setLayoutParams(params);
+            mIvBackground.setScaleType(ScaleType.FIT_CENTER);
+            mIvBackground.setVisibility(View.VISIBLE);
+        }
     }
 
+    private void setDefaultTransparentBackground() {
+        mIvBackground.setImageBitmap(null);
+        mIvBackground.setBackgroundColor(0x00000000);
+        mImageAspectRatio = 1.0f;
+        // 清空缓存路径记录
+        mCurrentCachedPath = "";
+        mIvBackground.setVisibility(View.GONE);
+    }
+
+    // ====================================== 重写方法 ======================================
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
-        adjustImageViewSize();
-    }
-
-    /**
-     * 对外提供：判断当前是否处于预览模式
-     */
-    public boolean isPreviewMode() {
-        return isPreviewMode;
+        adjustImageViewSize(); // 尺寸变化时重新调整
     }
 }
 

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/darker_gray" />
+    <corners android:radius="6dp" />
+</shape>
+

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/holo_blue_light" />
+    <corners android:radius="6dp" />
+</shape>
+

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 按压状态：浅灰色背景 -->
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#E0E0E0" /> <!-- 按压深色 -->
+            <corners android:radius="8dp" /> <!-- 圆角适配小米UI风格 -->
+            <stroke android:width="1dp" android:color="#CCCCCC" /> <!-- 边框 -->
+        </shape>
+    </item>
+    <!-- 正常状态：白色背景 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFF" /> <!-- 正常白色 -->
+            <corners android:radius="8dp" />
+            <stroke android:width="1dp" android:color="#CCCCCC" />
+        </shape>
+    </item>
+</selector>
+

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 按压状态：深灰色背景 -->
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#D0D0D0" />
+            <corners android:radius="8dp" /> <!-- 与亮度按钮圆角一致，统一风格 -->
+        </shape>
+    </item>
+    <!-- 正常状态：浅灰色背景 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#F0F0F0" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</selector>
+

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 按压状态：深灰色 -->
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#CCCCCC" /> <!-- 按压时颜色 -->
+            <corners android:radius="8dp" /> <!-- 圆角（可按需调整） -->
+            <stroke android:width="1dp" android:color="#EEEEEE" /> <!-- 边框（可选，不加可删除） -->
+        </shape>
+    </item>
+    <!-- 正常状态：浅灰色 -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#F5F5F5" /> <!-- 正常时颜色 -->
+            <corners android:radius="8dp" /> <!-- 圆角（和按压状态一致） -->
+            <stroke android:width="1dp" android:color="#EEEEEE" /> <!-- 边框（可选） -->
+        </shape>
+    </item>
+</selector>
+

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 按压状态：加深深色背景 -->
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#2D7CFF" /> <!-- 按压深蓝 -->
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <!-- 正常状态：主色背景（可改为项目主题色） -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#4096FF" /> <!-- 正常浅蓝，适配小米系统UI -->
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</selector>
+

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 背景色：白色 -->
+    <solid android:color="@android:color/white" />
+    <!-- 圆角：12dp（适配小米机型圆角无锯齿） -->
+    <corners android:radius="12dp" />
+    <!-- 边框：浅灰色细边框（避免弹窗边缘模糊） -->
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/darker_gray" />
+    <!-- 内边距：轻微留白，避免内容贴边 -->
+    <padding
+        android:bottom="5dp"
+        android:top="5dp" />
+</shape>
+

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/darker_gray" />
+</shape>
+

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 进度条未完成部分：浅灰色 -->
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/darker_gray" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <!-- 进度条已完成部分：系统蓝色（无需额外定义颜色） -->
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape android:shape="rectangle">
+                <solid android:color="@android:color/holo_blue_light" />
+                <corners android:radius="10dp" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
+

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!-- 滑块颜色：系统蓝色 -->
+    <solid android:color="@android:color/holo_blue_light" />
+    <!-- 滑块大小：20dp（适配小米机型触摸区域） -->
+    <size
+        android:width="20dp"
+        android:height="20dp" />
+    <!-- 白色边框：区分滑块与进度条 -->
+    <stroke
+        android:width="2dp"
+        android:color="@android:color/white" />
+</shape>
+

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

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

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

@@ -6,39 +6,34 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<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"
+		android:gravity="center_vertical"
 		style="@style/DefaultAToolbar"/>
 
 	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content">
-
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/activitybackgroundpictureRelativeLayout1"/>
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0">
 
 		<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:background="#FF7381FF"
-			android:id="@+id/activitybackgroundpictureBackgroundView1">
+			android:id="@+id/background_view">
 
 		</cc.winboll.studio.powerbell.views.BackgroundView>
 
 		<LinearLayout
 			android:orientation="vertical"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/toolbar">
+			android:layout_height="400dp">
 
 			<RelativeLayout
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
 
 				<cc.winboll.studio.libaes.views.AButton
@@ -122,6 +117,15 @@
 					android:layout_margin="5dp"
 					android:id="@+id/activitybackgroundpictureAButton7"/>
 
+				<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/activitybackgroundsettingsAButton1"
+					android:onClick="onColorPaletteDialog"/>
+
 				<cc.winboll.studio.libaes.views.AButton
 					android:layout_width="50dp"
 					android:layout_height="36dp"

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

@@ -5,6 +5,13 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@android:color/white">
+	
+	<cc.winboll.studio.libaes.views.ASupportToolbar
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"
+		style="@style/DefaultAToolbar"/>
 
     <!-- 搜索框：提示文本改为“搜索应用名称或包名” -->
     <EditText

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

@@ -6,10 +6,11 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<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"
+		android:gravity="center_vertical"
 		style="@style/DefaultAToolbar"/>
 
 	<LinearLayout

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

@@ -1,40 +1,259 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-	<cc.winboll.studio.libaes.views.ASupportToolbar
-		android:layout_width="match_parent"
-		android:layout_height="@dimen/toolbar_height"
-		android:id="@+id/toolbar"
-		android:gravity="center_vertical"
-		style="@style/DefaultAToolbar"/>
+    <!-- 顶部Toolbar（首屏核心，同步加载，保留原有ASupportToolbar） -->
+    <cc.winboll.studio.libaes.views.ASupportToolbar
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height"
+        android:id="@+id/toolbar"
+        android:gravity="center_vertical"
+        style="@style/DefaultAToolbar"/>
 
-	<RelativeLayout
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
+    <!-- 主内容区（优化层级，减少冗余RelativeLayout） -->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1.0">
 
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/activitymainRelativeLayout1"
-			android:background="#FFB7B7B7"/>
+        <!-- 首屏核心容器（合并原冗余RelativeLayout，减少层级） -->
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/activitymainRelativeLayout1">
 
-		<FrameLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/activitymainFrameLayout1"/>
+            <!-- 1. 背景视图（首屏核心，同步加载，保留原有） -->
+            <cc.winboll.studio.powerbell.views.BackgroundView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/fragmentmainviewBackgroundView1"/>
 
-	</RelativeLayout>
+            <!-- 2. 功能控件容器（首屏核心，同步加载，保留原有结构） -->
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
-	<cc.winboll.studio.libaes.views.ADsBannerView
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/adsbanner"/>
+                <!-- 服务总开关布局 -->
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/fragmentmainviewLinearLayout3"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginTop="10dp">
+
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:background="@drawable/bg_frame">
+
+                        <Switch
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/fragmentandroidviewSwitch1"
+                            android:padding="10dp"
+                            android:layout_weight="1.0"
+                            android:textSize="@dimen/text_title_size"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- 电量控制核心布局（SeekBar+图标） -->
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp">
+
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1.0">
+
+                        <!-- 耗电提醒布局 -->
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="50dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="20dp"
+                            android:layout_marginBottom="20dp"
+                            android:id="@+id/fragmentmainviewLinearLayout1">
+
+                            <ImageView
+                                android:layout_width="36dp"
+                                android:layout_height="36dp"
+                                android:background="@drawable/usege"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="10dp"/>
+
+                            <CheckBox
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="10dp"
+                                android:id="@+id/fragmentmainviewCheckBox2"/>
+
+                            <cc.winboll.studio.powerbell.views.VerticalSeekBar
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:id="@+id/fragmentandroidviewVerticalSeekBar2"
+                                android:progressTint="@color/colorUsege"
+                                android:progressBackgroundTint="@color/colorUsege"
+                                android:layout_weight="1.0"
+                                android:layout_margin="10dp"/>
+
+                        </LinearLayout>
+
+                        <!-- 耗电提醒数值+图标 -->
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="80dp"
+                            android:layout_height="match_parent">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="100%"
+                                android:textSize="@dimen/text_title_size"
+                                android:layout_gravity="center_horizontal"
+                                android:id="@+id/fragmentandroidviewTextView3"
+                                android:gravity="center_horizontal"/>
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:id="@+id/fragmentandroidviewImageView2"
+                                android:layout_weight="1.0"/>
+
+                        </LinearLayout>
+
+                        <!-- 当前电量数值+图标 -->
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1.0">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="100%"
+                                android:textSize="@dimen/text_title_size"
+                                android:layout_gravity="center_horizontal"
+                                android:gravity="center_horizontal"
+                                android:id="@+id/fragmentandroidviewTextView4"/>
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:id="@+id/fragmentandroidviewImageView1"
+                                android:layout_weight="1.0"/>
+
+                        </LinearLayout>
+
+                        <!-- 充电提醒数值+图标 -->
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="80dp"
+                            android:layout_height="match_parent">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="100%"
+                                android:textSize="@dimen/text_title_size"
+                                android:layout_gravity="center_horizontal"
+                                android:id="@+id/fragmentandroidviewTextView2"
+                                android:gravity="center_horizontal"/>
+
+                            <ImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:id="@+id/fragmentandroidviewImageView3"
+                                android:layout_weight="1.0"/>
+
+                        </LinearLayout>
+
+                        <!-- 充电提醒布局 -->
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_width="50dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginBottom="20dp"
+                            android:layout_marginTop="20dp"
+                            android:id="@+id/fragmentmainviewLinearLayout2">
+
+                            <ImageView
+                                android:layout_width="36dp"
+                                android:layout_height="36dp"
+                                android:background="@drawable/charge"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="10dp"/>
+
+                            <CheckBox
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginTop="10dp"
+                                android:id="@+id/fragmentmainviewCheckBox1"/>
+
+                            <cc.winboll.studio.powerbell.views.VerticalSeekBar
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:id="@+id/fragmentandroidviewVerticalSeekBar1"
+                                android:progressTint="@color/colorCharge"
+                                android:progressBackgroundTint="@color/colorCharge"
+                                android:layout_weight="1.0"
+                                android:layout_margin="10dp"/>
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Tips文本 -->
+                <LinearLayout
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Tips"
+                        android:textSize="@dimen/text_content_size"
+                        android:id="@+id/fragmentandroidviewTextView1"
+                        android:background="@drawable/bg_frame"
+                        android:padding="10dp"/>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- 3. 广告视图：关键优化→用ViewStub延迟加载（替代原直接加载的ADsBannerView） -->
+            <!-- 首次启动仅占位（1px），不inflate真实广告视图，减少首次耗时 -->
+            <ViewStub
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/stub_ads_banner"
+                android:layout_alignParentBottom="true"
+                android:layout="@layout/view_ads_banner"/> <!-- 广告视图独立布局文件 -->
+
+        </RelativeLayout>
+
+    </RelativeLayout>
 
 </LinearLayout>
 

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

@@ -5,11 +5,47 @@
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
-
-	<FrameLayout
+	
+	<RelativeLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:id="@+id/activitymainunittestFrameLayout1"/>
+		android:background="#FF0C6BBF">
+
+		<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/backgroundview"/>
+
+		<HorizontalScrollView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="#AF4FDA4E">
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Main"
+					android:id="@+id/btn_main_activity"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="TestCropImage"
+					android:id="@+id/btn_test_cropimage"/>
+
+			</LinearLayout>
+
+		</HorizontalScrollView>
+
+	</RelativeLayout>
 
 </LinearLayout>
 

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<cc.winboll.studio.libaes.views.ASupportToolbar
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/toolbar_height"
+		android:id="@+id/toolbar"
+		android:gravity="center_vertical"
+		style="@style/DefaultAToolbar"/>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="right">
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="CheckPermission"
+			android:padding="10dp"
+			android:onClick="onCheckPermission"/>
+
+	</LinearLayout>
+
+	<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_backgroundpicturepreview.xml

@@ -25,11 +25,11 @@
 		android:layout_height="wrap_content"
 		android:gravity="center_vertical|center_horizontal">
 
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:scaleType="centerCrop"
-			android:id="@+id/dialogbackgroundpicturepreviewImageView1"/>
+		<cc.winboll.studio.powerbell.views.BackgroundView
+			android:orientation="vertical"
+			android:layout_width="200dp"
+			android:layout_height="200dp"
+			android:id="@+id/backgroundview"/>
 
 	</LinearLayout>
 

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

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="20dp"
+	android:background="#FFFFFFFF">
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_horizontal">
+
+		<ImageView
+			android:id="@+id/iv_color_picker"
+			android:layout_width="100dp"
+			android:layout_height="100dp"
+			android:background="#FF0000"
+			android:clickable="true"
+			android:focusable="true"/>
+
+		<ImageView
+			android:id="@+id/iv_color_scaler"
+			android:layout_width="100dp"
+			android:layout_height="100dp"
+			android:clickable="true"
+			android:focusable="true"
+			android:src="@drawable/color_scale_logo"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="center_vertical"
+		android:layout_marginBottom="15dp">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="RGB："
+			android:textSize="16sp"/>
+
+		<EditText
+			android:id="@+id/et_r"
+			android:layout_width="60dp"
+			android:layout_height="40dp"
+			android:layout_marginLeft="10dp"
+			android:hint="R"
+			android:inputType="number"
+			android:gravity="center"
+			android:maxLength="3"/>
+
+		<EditText
+			android:id="@+id/et_g"
+			android:layout_width="60dp"
+			android:layout_height="40dp"
+			android:layout_marginLeft="10dp"
+			android:hint="G"
+			android:inputType="number"
+			android:gravity="center"
+			android:maxLength="3"/>
+
+		<EditText
+			android:id="@+id/et_b"
+			android:layout_width="60dp"
+			android:layout_height="40dp"
+			android:layout_marginLeft="10dp"
+			android:hint="B"
+			android:inputType="number"
+			android:gravity="center"
+			android:maxLength="3"/>
+
+	</LinearLayout>
+
+	<EditText
+		android:id="@+id/et_color_value"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:hint="#AARRGGBB"
+		android:inputType="text"
+		android:gravity="center"
+		android:maxLength="9"
+		android:layout_marginBottom="15dp"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:layout_marginBottom="15dp">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:gravity="center_vertical"
+			android:layout_marginBottom="5dp">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="透明度："
+				android:textSize="16sp"/>
+
+			<TextView
+				android:id="@+id/tv_alpha_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="100%"
+				android:textSize="16sp"
+				android:layout_marginLeft="10dp"/>
+
+		</LinearLayout>
+
+		<SeekBar
+			android:id="@+id/sb_alpha"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:max="100"
+			android:progress="100"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="center_horizontal"
+		android:layout_marginBottom="20dp">
+
+		<TextView
+			android:id="@+id/tv_brightness_minus"
+			android:layout_width="40dp"
+			android:layout_height="40dp"
+			android:text="-"
+			android:textSize="20sp"
+			android:gravity="center"
+			android:background="@drawable/btn_common"
+			android:clickable="true"
+			android:focusable="true"/>
+
+		<TextView
+			android:id="@+id/tv_brightness_value"
+			android:layout_width="80dp"
+			android:layout_height="40dp"
+			android:text="100%"
+			android:textSize="16sp"
+			android:gravity="center"/>
+
+		<TextView
+			android:id="@+id/tv_brightness_plus"
+			android:layout_width="40dp"
+			android:layout_height="40dp"
+			android:text="+"
+			android:textSize="20sp"
+			android:gravity="center"
+			android:background="@drawable/btn_common"
+			android:clickable="true"
+			android:focusable="true"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:gravity="center_horizontal">
+
+		<TextView
+			android:id="@+id/tv_cancel"
+			android:layout_width="100dp"
+			android:layout_height="45dp"
+			android:text="取消"
+			android:textSize="16sp"
+			android:gravity="center"
+			android:background="@drawable/btn_common"
+			android:clickable="true"
+			android:focusable="true"
+			android:layout_marginRight="20dp"/>
+
+		<TextView
+			android:id="@+id/tv_confirm"
+			android:layout_width="100dp"
+			android:layout_height="45dp"
+			android:text="确认"
+			android:textSize="16sp"
+			android:gravity="center"
+			android:background="@drawable/btn_common"
+			android:clickable="true"
+			android:focusable="true"/>
+
+	</LinearLayout>
+
+</LinearLayout>
+

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

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<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:background="#FF7381FF"
-		android:id="@+id/fragmentmainviewBackgroundView1"/>
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent">
-
-		<LinearLayout
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:id="@+id/fragmentmainviewLinearLayout3"
-			android:layout_marginLeft="10dp"
-			android:layout_marginRight="10dp"
-			android:layout_marginTop="10dp">
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center_vertical"
-				android:background="@drawable/bg_frame">
-
-				<Switch
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:id="@+id/fragmentandroidviewSwitch1"
-					android:padding="10dp"
-					android:layout_weight="1.0"
-					android:textSize="@dimen/text_title_size"/>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1.0"
-			android:layout_marginLeft="10dp"
-			android:layout_marginRight="10dp">
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:layout_weight="1.0">
-
-				<LinearLayout
-					android:orientation="vertical"
-					android:layout_width="50dp"
-					android:layout_height="match_parent"
-					android:layout_marginTop="20dp"
-					android:layout_marginBottom="20dp"
-					android:id="@+id/fragmentmainviewLinearLayout1">
-
-					<ImageView
-						android:layout_width="36dp"
-						android:layout_height="36dp"
-						android:background="@drawable/usege"
-						android:layout_gravity="center_horizontal"
-						android:layout_marginTop="10dp"/>
-
-					<CheckBox
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_gravity="center_horizontal"
-						android:layout_marginTop="10dp"
-						android:id="@+id/fragmentmainviewCheckBox2"/>
-
-					<cc.winboll.studio.powerbell.views.VerticalSeekBar
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:id="@+id/fragmentandroidviewVerticalSeekBar2"
-						android:progressTint="@color/colorUsege"
-						android:progressBackgroundTint="@color/colorUsege"
-						android:layout_weight="1.0"
-						android:layout_margin="10dp"/>
-
-				</LinearLayout>
-
-				<LinearLayout
-					android:orientation="vertical"
-					android:layout_width="80dp"
-					android:layout_height="match_parent">
-
-					<TextView
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:text="100%"
-						android:textSize="@dimen/text_title_size"
-						android:layout_gravity="center_horizontal"
-						android:id="@+id/fragmentandroidviewTextView3"
-						android:gravity="center_horizontal"/>
-
-					<ImageView
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:id="@+id/fragmentandroidviewImageView2"
-						android:layout_weight="1.0"/>
-
-				</LinearLayout>
-
-				<LinearLayout
-					android:orientation="vertical"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:layout_weight="1.0">
-
-					<TextView
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:text="100%"
-						android:textSize="@dimen/text_title_size"
-						android:layout_gravity="center_horizontal"
-						android:gravity="center_horizontal"
-						android:id="@+id/fragmentandroidviewTextView4"/>
-
-					<ImageView
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:id="@+id/fragmentandroidviewImageView1"
-						android:layout_weight="1.0"/>
-
-				</LinearLayout>
-
-				<LinearLayout
-					android:orientation="vertical"
-					android:layout_width="80dp"
-					android:layout_height="match_parent">
-
-					<TextView
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:text="100%"
-						android:textSize="@dimen/text_title_size"
-						android:layout_gravity="center_horizontal"
-						android:id="@+id/fragmentandroidviewTextView2"
-						android:gravity="center_horizontal"/>
-
-					<ImageView
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:id="@+id/fragmentandroidviewImageView3"
-						android:layout_weight="1.0"/>
-
-				</LinearLayout>
-
-				<LinearLayout
-					android:orientation="vertical"
-					android:layout_width="50dp"
-					android:layout_height="match_parent"
-					android:layout_marginBottom="20dp"
-					android:layout_marginTop="20dp"
-					android:id="@+id/fragmentmainviewLinearLayout2">
-
-					<ImageView
-						android:layout_width="36dp"
-						android:layout_height="36dp"
-						android:background="@drawable/charge"
-						android:layout_gravity="center_horizontal"
-						android:layout_marginTop="10dp"/>
-
-					<CheckBox
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_gravity="center_horizontal"
-						android:layout_marginTop="10dp"
-						android:id="@+id/fragmentmainviewCheckBox1"/>
-
-					<cc.winboll.studio.powerbell.views.VerticalSeekBar
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:id="@+id/fragmentandroidviewVerticalSeekBar1"
-						android:progressTint="@color/colorCharge"
-						android:progressBackgroundTint="@color/colorCharge"
-						android:layout_weight="1.0"
-						android:layout_margin="10dp"/>
-
-				</LinearLayout>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:layout_height="wrap_content"
-			android:layout_width="match_parent">
-
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="Tips"
-				android:textSize="@dimen/text_content_size"
-				android:id="@+id/fragmentandroidviewTextView1"
-				android:background="@drawable/bg_frame"
-				android:padding="10dp"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</RelativeLayout>
-

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

@@ -1,23 +0,0 @@
-<?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/layout/layout_color_grid.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:padding="10dp">
+</LinearLayout>
+

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 广告视图独立布局（供ViewStub延迟加载） -->
+<cc.winboll.studio.libaes.views.ADsBannerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/adsbanner"/>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:id="@+id/bg_main">
+
+	<ImageView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/bg_imageview"/>
+
+</RelativeLayout>
+

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

@@ -9,7 +9,10 @@
     <item
         android:id="@+id/action_changepicture"
         android:title="@string/item_changepicture"/>
+    <item
+        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

@@ -2,9 +2,6 @@
 <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"/>

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

@@ -4,13 +4,16 @@
     <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

@@ -58,9 +58,73 @@
     <color name="colorUsege">@color/colorRed</color>
     <color name="colorCurrent">@color/colorBlue</color>
     <color name="colorCharge">@color/colorYellow</color>
-    
+
     <!--CustomSlideToUnlockView控件配置-->
     <color name="colorCustomSlideToUnlockViewWhite">#FFFFFFFF</color>
-    
-    <!---->
+
+	<!-- ============== 基础黑白（必含，适配文字/背景） ============== -->
+	<color name="white">#FFFFFF</color>          <!-- 纯白色（文字/背景） -->
+	<color name="black">#000000</color>          <!-- 近黑色（重要文字） -->
+
+	<!-- ============== 基础色系（按钮/强调色常用） ============== -->
+	<!-- 蓝色系（常用：确认/链接/主题色） -->
+	<color name="blue_light">#4A90E2</color>     <!-- 浅蓝（次要按钮） -->
+	<color name="blue_normal">#2196F3</color>    <!-- 标准蓝（主题/确认按钮） -->
+	<color name="blue_dark">#1976D2</color>      <!-- 深蓝（按压态/重要强调） -->
+	<!-- 绿色系（常用：成功/完成/安全提示） -->
+	<color name="green_light">#66BB6A</color>    <!-- 浅绿（次要成功态） -->
+	<color name="green_normal">#4CAF50</color>   <!-- 标准绿（成功按钮/提示） -->
+	<color name="green_dark">#388E3C</color>     <!-- 深绿（按压态/重要成功） -->
+	<!-- 红色系（常用：错误/警告/删除按钮） -->
+	<color name="red_light">#EF5350</color>      <!-- 浅红（次要错误提示） -->
+	<color name="red_normal">#F44336</color>     <!-- 标准红（删除/错误按钮） -->
+	<color name="red_dark">#D32F2F</color>       <!-- 深红（按压态/重要错误） -->
+	<!-- 黄色系（常用：警告/提醒/高亮） -->
+	<color name="yellow_light">#FFF59D</color>   <!-- 浅黄（次要提醒） -->
+	<color name="yellow_normal">#FFC107</color>  <!-- 标准黄（警告提示/高亮） -->
+	<color name="yellow_dark">#FFA000</color>    <!-- 深黄（重要警告） -->
+	<!-- 橙色系（常用：提醒/进度/活力色） -->
+	<color name="orange_normal">#FF9800</color>  <!-- 标准橙（提醒按钮/进度） -->
+	<!-- 紫色系（常用：特殊强调/个性按钮） -->
+	<color name="purple_normal">#9C27B0</color>  <!-- 标准紫（特殊功能按钮） -->
+
+	<!-- ============== 透明色（遮罩/背景叠加） ============== -->
+	<color name="transparent">#00000000</color>  <!-- 全透明 -->
+	<color name="black_transparent_50">#80000000</color> <!-- 50%透明黑（遮罩） -->
+
+
+
+	<!-- 1. 不透明灰色（常用深浅梯度，直接用） -->
+	<color name="gray_100">#F5F5F5</color> <!-- 极浅灰（接近白色，背景用） -->
+	<color name="gray_200">#EEEEEE</color> <!-- 浅灰（卡片/分割线背景） -->
+	<color name="gray_300">#E0E0E0</color> <!-- 中浅灰（边框/次要背景） -->
+	<color name="gray_400">#BDBDBD</color> <!-- 中灰（次要文字/图标） -->
+	<color name="gray_500">#9E9E9E</color> <!-- 标准中灰（常用辅助文字） -->
+	<color name="gray_600">#757575</color> <!-- 中深灰（常规辅助文字） -->
+	<color name="gray_700">#616161</color> <!-- 深灰（重要辅助文字） -->
+	<color name="gray_800">#424242</color> <!-- 极深灰（接近黑色，标题副文本） -->
+	<color name="gray_900">#212121</color> <!-- 近黑色（特殊场景用） -->
+
+	<!-- 2. 半透明灰色（带透明度，遮罩/蒙层用） -->
+	<color name="gray_transparent_30">#4D9E9E9E</color> <!-- 30%透明中灰（A=4D） -->
+	<color name="gray_transparent_50">#809E9E9E</color> <!-- 50%透明中灰（A=80） -->
+	<color name="gray_transparent_70">#B39E9E9E</color> <!-- 70%透明中灰（A=B3） -->
+
+	<color name="gray_light">#EEE</color>  <!-- 等价 #EEEEEE（浅灰） -->
+	<color name="gray_mid">#999</color>    <!-- 等价 #999999（中灰） -->
+	<color name="gray_dark">#666</color>   <!-- 等价 #666666（深灰） -->
+	<color name="gray_black">#333</color>  <!-- 等价 #333333（极深灰） -->
+
+	<!-- 50% 透明中灰（弹窗遮罩常用） -->
+	<color name="mask_gray">#809E9E9E</color>
+	<!-- 30% 透明深灰（背景叠加） -->
+	<color name="bg_overlay_gray">#4D424242</color>
+
+	<!-- 1. 常规灰色（按钮默认态，常用中灰） -->
+	<color name="btn_gray_normal">#9E9E9E</color>
+	<!-- 2. 按压深色（按钮点击态，加深一级，提升交互感） -->
+	<color name="btn_gray_pressed">#757575</color>
+	<!-- 3. 禁用灰色（按钮不可点击态，浅灰） -->
+	<color name="btn_gray_disabled">#E0E0E0</color>
+
 </resources>

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

@@ -9,11 +9,12 @@
     <string name="switchto_en1">PowerBell</string>
     <string name="switchto_cn1">能源钟</string>
     <string name="switchto_cn2">泡额呗额</string>
-    <string name="en1_switch_disabled">PowerBell</string>
-    <string name="cn1_switch_disabled">能源钟</string>
-    <string name="cn2_switch_disabled">泡额呗额</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_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>
@@ -30,4 +31,15 @@
     <string name="subtitle_activity_pixelpicker">Pixel Picker</string>
     <string name="subtitle_activity_about">About The APP</string>
     <string name="msg_AOHPCTCSeekBar_ClearRecord">&gt;&gt;&gt;Seek 100% Right Is Clean Record.&gt;&gt;&gt;</string>
+	
+	<!-- 权限申请相关字符串（统一管理，避免硬编码） -->
+	<string name="permission_title">权限申请</string>
+	<string name="permission_denied_title">权限被拒绝</string>
+	<string name="permission_grant_success">权限获取成功，请重新操作</string>
+	<string name="permission_storage_rationale">需要存储权限才能选择/拍照/裁剪图片，请授予权限</string>
+	<string name="permission_storage_setting_guide">存储权限已被拒绝且勾选“不再询问”，请前往设置页开启权限</string>
+	<string name="confirm">确定</string>
+	<string name="cancel">取消</string>
+	<string name="go_to_setting">去设置</string>
+	
 </resources>

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

@@ -26,4 +26,18 @@
         <item name="android:textSize">@dimen/text_subtitle_size</item>
     </style>
    
+	<!-- 自定义调色板对话框样式 -->
+	<style name="CustomDialogStyle" parent="@android:style/Theme.Dialog">
+		<!-- 去除标题栏 -->
+		<item name="android:windowNoTitle">true</item>
+		<!-- 背景透明（避免小米机型弹窗周围黑边） -->
+		<item name="android:windowBackground">@android:color/transparent</item>
+		<!-- 禁止弹窗全屏 -->
+		<item name="android:windowFullscreen">false</item>
+		<!-- 小米机型适配：弹窗大小自适应 -->
+		<item name="android:windowContentOverlay">@null</item>
+		<!-- 禁止触摸外部关闭（可选，避免误触） -->
+		<item name="android:windowCloseOnTouchOutside">false</item>
+	</style>
+
 </resources>

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

@@ -1,28 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <external-path
-        name="external_storage_root"
-        path="." />
-    <files-path
-        name="files_path"
-        path="." />
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- ====================================== 兼容适配：其他必要目录（可选）====================================== -->
+    <!-- 应用内部缓存目录（适配少数依赖缓存的场景，如图片缓存）
+	路径：/data/user/0/${applicationId}/cache/
+	关联代码：getCacheDir() -->
     <cache-path
         name="cache_path"
         path="." />
-    <!--/storage/emulated/0/Android/data/...-->
+	
+    <!-- ====================================== 核心适配：应用私有外部目录（必选）====================================== -->
+    <!-- 1. 裁剪临时文件目录（对应BackgroundSettingsActivity中onCreate的CropTemp目录）
+	路径：/storage/emulated/0/Android/data/${applicationId}/files/Pictures/CropTemp/
+	关联代码：_mSourceCropTempFile = new File(cropTempDir, _mSourceCropTempFileName) -->
+    <external-files-path
+        name="app_private_pictures"
+        path="Pictures/" /> <!-- 仅保留1次，覆盖Pictures下所有子目录（含CropTemp） -->
+
+    <!-- 2. 背景图片目录（对应BackgroundSourceUtils的背景存储目录）
+	路径：/storage/emulated/0/Android/data/${applicationId}/files/BackgroundPictureUtils/BackgroundSource/
+	关联代码：mfBackgroundDir = new File(mBackgroundSourceUtils.getBackgroundSourceDirPath()) -->
+    <external-files-path
+        name="background_source"
+        path="BackgroundPictureUtils/BackgroundSource/" />
+
+    <!-- 应用私有外部存储目录（适配BackgroundSourceUtils的目录） -->
     <external-files-path
         name="external_file_path"
-        path="." />
-	<external-files-path
-		name="files_root"
-		path="mimoDownload" />
-    <!--代表app 外部存储区域根目录下的文件 Context.getExternalCacheDir目录下的目录-->
+        path="BackgroundSourceUtils/" /> <!-- 对应fUtilsDir（BackgroundSourceUtils根目录） -->
+
+    <!-- 应用外部缓存目录（适配Android11+ 外部缓存场景，如第三方SDK依赖）
+	路径：/storage/emulated/0/Android/data/${applicationId}/cache/
+	关联代码：getExternalCacheDir() -->
     <external-cache-path
         name="external_cache_path"
         path="." />
-    <!--配置root-path。这样子可以读取到sd卡和一些应用分身的目录，否则微信分身保存的图片，就会导致 java.lang.IllegalArgumentException: Failed to find configured root that contains /storage/emulated/999/tencent/MicroMsg/WeiXin/export1544062754693.jpg，在小米6的手机上微信分身有这个crash，华为没有
-    -->
-    <root-path
-        name="root_path"
-        path="" />
+
+    <!-- 3. 应用临时目录（对应App.getTempDirPath()，适配拍照临时文件）
+	路径：/storage/emulated/0/Android/data/${applicationId}/files/temp/
+	关联代码：mfPictureDir = new File(App.getTempDirPath())、mfTakePhoto = new File(mfPictureDir, "TakePhoto.jpg") -->
+    <external-files-path
+        name="app_temp"
+        path="temp/" />
+
+	<!-- 通用应用外部文件目录（适配分享/下载等通用场景，覆盖files下所有目录）
+	路径：/storage/emulated/0/Android/data/${applicationId}/files/
+	关联代码：getExternalFilesDir(null) -->
+    <external-files-path
+        name="external_file_path"
+        path="." />
+
+	<!-- 【核心添加】4. 应用内目录（getFilesDir()，对应别名 app_internal_files） -->
+	<!-- 用于映射 /data/user/0/包名/files/ 路径，解决裁剪临时文件路径匹配问题 -->
+	<files-path
+		name="app_internal_files"
+		path="." /> <!-- path="." 表示映射整个应用内目录 -->
+	<!-- 关键新增：系统公共图片目录 /Pictures/PowerBell（图片存储/裁剪目录） -->
+	<external-path
+		name="public_pictures_powerbell"
+		path="Pictures/PowerBell/" /> <!-- 路径：/storage/emulated/0/Pictures/PowerBell/ -->
+	<!-- 兜底：应用内部缓存目录 -->
+	<cache-path
+		name="cache_path"
+		path="BackgroundSourceUtils/" />
 </paths>

winboll/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Dec 07 03:22:51 HKT 2025
-stageCount=7
+#Sun Dec 07 03:42:32 HKT 2025
+stageCount=8
 libraryProject=
 baseVersion=15.11
-publishVersion=15.11.6
+publishVersion=15.11.7
 buildCount=0
-baseBetaVersion=15.11.7
+baseBetaVersion=15.11.8

winboll/src/main/AndroidManifest.xml

@@ -14,8 +14,8 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher_stage"
-        android:roundIcon="@drawable/ic_launcher_stage"
+        android:icon="@drawable/ic_launcher"
+        android:roundIcon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/MyAppTheme"
         android:resizeableActivity="true"
@@ -37,7 +37,7 @@
             android:targetActivity=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:icon="@drawable/ic_launcher_stage"
+            android:icon="@drawable/ic_launcher"
             android:enabled="true">
 
             <intent-filter>
@@ -280,4 +280,4 @@
 
     </application>
 
-</manifest>
+</manifest>

winboll/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>

winboll/src/main/res/drawable/ic_dev_connected.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,12V14H5V12H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3,15V17H5V15H3M14,15H20V19H14V15M3,18V20H5V18H3M6,18V20H8V18H6M9,18V20H11V18H9Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_dev_disconnected.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3.88,13.46L2.46,14.88L4.59,17L2.46,19.12L3.88,20.54L6,18.41L8.12,20.54L9.54,19.12L7.41,17L9.54,14.88L8.12,13.46L6,15.59L3.88,13.46M14,15H20V19H14V15Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_email.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M22,6C22,4.9 21.1,4 20,4H4C2.9,4 2,4.9 2,6V18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V6M20,6L12,11L4,6H20M20,18H4V8L12,13L20,8V18Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_email_alert.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#ff000000"
-        android:pathData="M24,7H22V13H24V7M24,15H22V17H24V15M20,6C20,4.9 19.1,4 18,4H2C0.9,4 0,4.9 0,6V18C0,19.1 0.9,20 2,20H18C19.1,20 20,19.1 20,18V6M18,6L10,11L2,6H18M18,18H2V8L10,13L18,8V18Z"/>
-
-</vector>

winboll/src/main/res/drawable/ic_iw.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="1565dp"
-    android:height="1565dp"
-    android:viewportWidth="1565"
-    android:viewportHeight="1565">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M793.8 222.7C782.5 239.2 736.3 298.6 685.6 361.9 647 410.2 633.3 428.9 633.6 432.7 633.7 433.4 633.8 434.6 633.9 435.3 634.1 437.8 647.9 440.7 663.8 441.5 706.7 443.8 717 445.3 724.9 450.6 733.7 456.4 735.9 467.4 736 504.2 736 504.2 736 521.9 736 521.9 736 521.9 730.8 522.4 730.8 522.4 727.9 522.8 691.8 525.3 650.5 528 609.3 530.8 571.9 533.3 567.5 533.6 531.8 536 503.4 540.5 487.4 546 475 550.3 442.2 566.5 428.2 575.2 392.1 597.6 360.1 629.2 338 664.3 317 697.7 304.6 729.6 292.5 781 287.8 801 283.9 805.6 267.2 811 255.1 814.9 248.7 818.3 243.4 823.5 239.7 827.2 239.2 828.4 237.7 836.5 236.7 841.5 235.5 850 235 855.5 234.3 863.9 232.6 911.1 232.6 924.5 232.6 934.6 234.2 959.8 235 963 237.4 972 242.3 975.8 258.7 981.7 271.7 986.3 277.4 989.5 280.4 993.9 283.1 997.9 286.5 1008.7 287.4 1016.5 289.3 1031.7 293.3 1050.2 297.7 1064 306.4 1091.9 317.6 1107.7 330 1109.5 332.4 1109.9 334.7 1110.3 335 1110.5 335.3 1110.6 339.1 1111.1 343.5 1111.4 347.9 1111.8 353.8 1112.3 356.5 1112.5 370 1113.7 407.8 1115.8 430 1116.5 439.6 1116.8 453.4 1117.3 460.5 1117.5 467.7 1117.8 482.3 1118.2 493 1118.5 503.7 1118.8 520.8 1119.2 531 1119.5 587.8 1121.1 683 1122 794.5 1122 918.8 1122 996.1 1121 1075 1118.5 1083.5 1118.2 1098.6 1117.8 1108.5 1117.4 1118.4 1117.1 1129.4 1116.7 1133 1116.5 1136.6 1116.3 1144.7 1115.8 1151 1115.5 1183.3 1114 1207.5 1110.9 1221.5 1106.3 1235.3 1101.9 1244.8 1094.1 1249.9 1083.2 1253.5 1075.4 1253.7 1074.4 1259 1044 1266.4 1001.7 1269.1 993.5 1276.9 989.2 1278.9 988.1 1284.7 986.1 1289.9 984.6 1305.8 980.1 1313.3 975.5 1314.4 969.7 1316.2 959.5 1317.1 881.4 1315.7 859.5 1314 834.8 1313.1 831.4 1307 824.7 1301.2 818.3 1295 814.8 1283 811 1278 809.5 1272.4 807 1270.5 805.6 1264 800.6 1259.5 790.1 1252.5 763 1243.5 728.4 1235.9 706.8 1224.6 683.5 1202.3 637.7 1167.5 602.5 1111.8 569.1 1087.6 554.7 1054.4 542.7 1028.1 539 1024.1 538.4 1020.5 537.8 1020.1 537.6 1019.8 537.4 1016.4 536.9 1012.7 536.5 1009 536.2 1005.1 535.7 1004.2 535.5 999.7 534.7 988.4 533.6 973.5 532.5 969.7 532.2 964.5 531.8 962 531.5 959.5 531.2 940.4 530.1 919.5 529 851.7 525.4 836.1 523.7 829.5 519.4 821.2 514 825.2 495.6 837.6 481.8 843.8 474.9 844.2 474.3 856.8 448 862.6 436 868.9 425.2 879.9 408.7 888.2 396.2 895 385.5 895 385.1 895 384.6 889.7 383.3 883.3 382 851.1 375.9 812.7 367.8 806.9 365.9 792.4 361.2 790.7 358.7 790.2 342.5 789.7 326.8 792.4 303.4 800 258.5 802.1 246.1 803.3 220.9 801.9 219.6 801.7 219.4 800.5 218.9 799.3 218.6 797.4 218 796.5 218.7 793.8 222.7Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M570.4 704.1C553.5 706.1 539.7 713 532.9 722.7 523.5 736.3 519.9 764.2 519.6 826 519.5 859.4 519.7 860.6 530.1 872.9 543.4 888.6 560.4 900 574.1 902.1 586.7 904 601.5 898.9 615.7 887.5 632.5 874.1 633.5 868.9 632.7 793.6 632.2 742.5 631.6 736 627 725.2 620.5 710 596.2 700.9 570.4 704.1Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M949.2 705.5C935.1 708.7 927 716.8 922.6 732.4 918.4 746.7 917.8 757.3 917.3 816.5 917.1 847.8 917.3 874 917.7 874.6 919.2 876.7 945.3 892.3 955.5 897.1 973.4 905.5 983.5 905.4 978.9 896.8 977.1 893.4 979.1 892.6 985.9 893.9 993.6 895.4 997.8 894.3 1005.2 889.1 1010.9 885 1020.2 873.6 1023.8 866.5 1029.6 854.9 1031.1 841.6 1031.1 800.5 1031.1 750.1 1028.6 737.6 1014.9 720.4 1009.4 713.5 1004.6 709.8 996.9 706.8 992.2 704.9 989.1 704.6 973.5 704.4 960.6 704.1 953.7 704.5 949.2 705.5Z"/>
-    <path
-        android:fillColor="#FF62686C"
-        android:strokeColor="#FF62686C"
-        android:strokeWidth="4.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M717 988.7C671.1 990.4 640.9 994.2 635.6 998.8 631.5 1002.5 636.3 1017.5 643.6 1024 650.9 1030.3 661.7 1032.5 694 1034 721.9 1035.3 829.3 1035.3 857 1034 891.4 1032.4 901.4 1029.9 908.9 1021.3 914.5 1015 917.9 1003.4 915.2 999.4 910.4 992.1 856 987.9 772 988.2 745.9 988.3 721.1 988.5 717 988.7Z"/>
-</vector>

winboll/src/main/res/drawable/ic_launcher_beta.xml

@@ -9,5 +9,5 @@
         android:top="0dp" 
         android:right="0dp" 
         android:bottom="0dp"
-        android:drawable="@drawable/ic_iw"/>
+        android:drawable="@drawable/ic_launcher"/>
 </layer-list>

winboll/src/main/res/drawable/ic_launcher_disable.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true"
-    android:layout_width="24dp"
-	android:layout_height="24dp">
-    <item android:drawable="@drawable/ic_launcher_background"/> 
-    <item 
-        android:left="0dp" 
-        android:top="0dp" 
-        android:right="0dp" 
-        android:bottom="0dp"
-        android:drawable="@drawable/ic_launcher_foreground_disable"/>
-</layer-list>

winboll/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
-</vector>

winboll/src/main/res/drawable/ic_launcher_foreground_disable.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FF808080"
-        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
-</vector>

winboll/src/main/res/layout/view_toolbar.xml

@@ -9,7 +9,7 @@
         android:id="@+id/toolbar_icon"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:src="@drawable/ic_iw"
+        android:src="@drawable/ic_launcher"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="6dp"

winboll/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

winboll/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>