<powerbell>APK 15.12.15 release Publish.

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Dec 10 20:11:13 HKT 2025
-stageCount=12
+#Thu Dec 11 20:54:28 HKT 2025
+stageCount=16
 libraryProject=
 baseVersion=15.12
-publishVersion=15.12.11
+publishVersion=15.12.15
 buildCount=0
-baseBetaVersion=15.12.12
+baseBetaVersion=15.12.16

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

@@ -2,28 +2,37 @@ package cc.winboll.studio.powerbell;
 
 import android.content.Context;
 import android.os.Environment;
+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.model.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 cc.winboll.studio.powerbell.utils.PermissionUtils;
 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 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,25 +43,16 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-		setIsDebugging(BuildConfig.DEBUG);
-		//setIsDebugging(false);
+        setIsDebugging(BuildConfig.DEBUG);
 
-		// 初始化活动窗口管理
-		WinBoLLActivityManager.init(this);
+        // 初始化活动窗口管理
+        WinBoLLActivityManager.init(this);
         // 初始化 Toast 框架
         ToastUtils.init(this);
-		
-        // 临时文件夹方案1
-        // 获取Pictures文件夹路径（Android 10及以上推荐使用MediaStore，此处为传统方式）
+
+        // 临时文件夹初始化（保持原有逻辑）
         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();
         }
@@ -61,11 +61,54 @@ public class App extends GlobalApplication {
         // 设置数据配置存储工具
         _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);
@@ -84,12 +127,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/MainActivity.java

@@ -2,7 +2,6 @@ package cc.winboll.studio.powerbell;
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
@@ -25,7 +24,6 @@ import android.widget.SeekBar;
 import android.widget.Switch;
 import android.widget.TextView;
 import androidx.appcompat.widget.Toolbar;
-
 import cc.winboll.studio.libaes.activitys.AboutActivity;
 import cc.winboll.studio.libaes.models.APPInfo;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
@@ -51,33 +49,22 @@ import cc.winboll.studio.powerbell.views.BatteryDrawable;
 import cc.winboll.studio.powerbell.views.VerticalSeekBar;
 
 /**
- * 主活动类（Java 7 兼容 | 首屏加速+窗体缓存）
+ * 主活动类（Java 7 兼容 | 移除窗体缓存）
  * 核心优化点：
- * 1. ViewHolder 缓存控件 + ViewStub 延迟加载（原有）
- * 2. savedInstanceState 窗体缓存（新增）：缓存视图状态/数据，快速重建窗体
- * 3. 资源异步加载 + 非关键任务异步化（原有）
+ * 1. ViewHolder 缓存控件 + ViewStub 延迟加载
+ * 2. 资源异步加载 + 非关键任务异步化
  */
 public class MainActivity extends WinBoLLActivity {
 
-    // ======================== 静态常量（新增：savedInstanceState 缓存键）========================
+    // ======================== 静态常量（移除缓存相关键）========================
     public static final String TAG = "MainActivity";
-    private static final int REQUEST_WRITE_STORAGE_PERMISSION = 1001;
+    private static final int REQUEST_READ_MEDIA_IMAGES = 1001;
     public static final int MSG_RELOAD_APPCONFIG = 0;
     public static final int MSG_CURRENTVALUEBATTERY = 1;
     public static final int MSG_LOAD_BACKGROUND = 2;
     private static final int DELAY_LOAD_NON_CRITICAL = 500;
 
-    // 缓存键（统一管理，避免键名重复）
-    private static final String KEY_VIEW_STATE = "key_view_state"; // 视图状态缓存键
-    private static final String KEY_CHARGE_REMINDER = "key_charge_reminder"; // 充电提醒值
-    private static final String KEY_USEGE_REMINDER = "key_usege_reminder"; // 耗电提醒值
-    private static final String KEY_CURRENT_VALUE = "key_current_value"; // 当前电量值
-    private static final String KEY_IS_SERVICE_ENABLE = "key_is_service_enable"; // 服务开关状态
-    private static final String KEY_IS_CHARGE_ENABLE = "key_is_charge_enable"; // 充电提醒开关
-    private static final String KEY_IS_USEGE_ENABLE = "key_is_usege_enable"; // 耗电提醒开关
-    private static final String KEY_BACKGROUND_BEAN = "key_background_bean"; // 背景配置Bean
-
-    // ======================== 成员属性（保持原有，新增缓存标识）========================
+    // ======================== 成员属性（移除缓存标识）========================
     public static MainActivity _mMainActivity;
     static MainViewFragment _mMainViewFragment;
     static Handler _mHandler;
@@ -99,10 +86,6 @@ public class MainActivity extends WinBoLLActivity {
     private BatteryDrawable mChargeReminderValueBatteryDrawable;
     private BatteryDrawable mUsegeReminderValueBatteryDrawable;
 
-    // 新增：缓存标识（判断是否从savedInstanceState恢复，避免重复初始化）
-    private boolean isRestoredFromCache = false;
-
-
     // ======================== 视图缓存容器（ViewHolder 不变）========================
     private static class ViewHolder {
         BackgroundView backgroundView;
@@ -115,8 +98,7 @@ public class MainActivity extends WinBoLLActivity {
         ImageView ivCurrentBattery, ivChargeReminderBattery, ivUsegeReminderBattery;
     }
 
-
-    // ======================== 重写生命周期（核心：savedInstanceState 缓存/恢复）========================
+    // ======================== 重写生命周期（移除缓存恢复/保存逻辑）========================
     @Override
     public Activity getActivity() {
         return this;
@@ -129,80 +111,27 @@ public class MainActivity extends WinBoLLActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        LogUtils.d(TAG, "onCreate(...) - 窗体缓存优化：savedInstanceState = " + (savedInstanceState != null));
+        LogUtils.d(TAG, "onCreate(...) - 移除窗体缓存");
         super.onCreate(savedInstanceState);
         initGlobalHandler();
 
-        // 第一步：优先从savedInstanceState恢复窗体（核心优化）
-        if (savedInstanceState != null) {
-            restoreFromCache(savedInstanceState); // 从缓存恢复视图/数据
-            isRestoredFromCache = true; // 标记为缓存恢复，跳过重复初始化
-        }
+        // 恢复原始初始化流程：直接加载布局+初始化
+        setContentView(R.layout.activity_main);
+        initCoreUtilsAsync();
+        initViewHolder();
+        initCriticalView();
+        loadNonCriticalViewDelayed();
 
-        // 第二步：无缓存时，正常初始化（保持原有逻辑，新增判断）
-        if (!isRestoredFromCache) {
-            setContentView(R.layout.activity_main); // 加载布局（仅首次/无缓存时执行）
-            initCoreUtilsAsync(); // 异步初始化工具类
-            initViewHolder(); // 绑定控件（仅首次/无缓存时执行）
-            initCriticalView(); // 初始化核心视图
-            loadNonCriticalViewDelayed(); // 延迟加载非核心视图
-        }
+        // 权限申请
+		PermissionUtils.getInstance().checkAndRequestMediaImagesPermission(this, REQUEST_READ_MEDIA_IMAGES);
+	}
 
-        // 第三步：权限申请（无论是否缓存，都需确保权限有效）
-        PermissionUtils.getInstance().checkAndRequestStoragePermission(this);
-    }
-
-    /**
-     * 重写 onSaveInstanceState：保存视图状态/数据到 savedInstanceState（关键）
-     * 当Activity销毁前（如旋转屏幕、后台回收），自动调用此方法缓存数据
-     */
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        LogUtils.d(TAG, "onSaveInstanceState - 缓存窗体状态/数据");
-
-        // 1. 缓存控件数据（避免重建后重复读取配置）
-        if (mViewHolder != null && mAppConfigUtils != null) {
-            outState.putInt(KEY_CHARGE_REMINDER, mAppConfigUtils.getChargeReminderValue());
-            outState.putInt(KEY_USEGE_REMINDER, mAppConfigUtils.getUsegeReminderValue());
-            outState.putInt(KEY_CURRENT_VALUE, mAppConfigUtils.getCurrentValue());
-            outState.putBoolean(KEY_IS_SERVICE_ENABLE, mAppConfigUtils.getIsEnableService());
-            outState.putBoolean(KEY_IS_CHARGE_ENABLE, mViewHolder.cbIsEnableChargeReminder.isChecked());
-            outState.putBoolean(KEY_IS_USEGE_ENABLE, mViewHolder.cbIsEnableUsegeReminder.isChecked());
-        }
-
-        // 2. 缓存背景配置（避免重建后重复加载背景图）
-        if (mBgSourceUtils != null) {
-            BackgroundBean backgroundBean = mBgSourceUtils.getCurrentBackgroundBean();
-            if (backgroundBean != null) {
-                outState.putSerializable(KEY_BACKGROUND_BEAN, backgroundBean); // 需BackgroundBean实现Serializable
-            }
-        }
-
-        // 3. 缓存视图状态（可选：如SeekBar进度、控件可见性等）
-        if (mViewHolder != null) {
-            outState.putInt(KEY_VIEW_STATE + "_charge_seek", mViewHolder.chargeReminderSeekBar.getProgress());
-            outState.putInt(KEY_VIEW_STATE + "_usege_seek", mViewHolder.usegeReminderSeekBar.getProgress());
-        }
-    }
-
-    /**
-     * 重写 onRestoreInstanceState：从 savedInstanceState 恢复数据（可选，onCreate中已处理）
-     * 确保在onStart后、onResume前恢复，避免视图状态覆盖
-     */
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        if (savedInstanceState != null && !isRestoredFromCache) {
-            restoreFromCache(savedInstanceState);
-            isRestoredFromCache = true;
-        }
-    }
+    // 移除 onSaveInstanceState 方法
+    // 移除 onRestoreInstanceState 方法
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        // 释放资源（保持原有）
         if (mADsBannerView != null) {
             mADsBannerView.releaseAdResources();
         }
@@ -211,23 +140,15 @@ public class MainActivity extends WinBoLLActivity {
         if (_mHandler != null) {
             _mHandler.removeCallbacksAndMessages(null);
         }
-        // 重置缓存标识
-        isRestoredFromCache = false;
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        // 缓存恢复后，无需重复发送加载消息（仅首次/无缓存时执行）
-        if (!isRestoredFromCache) {
-            if (_mHandler != null) {
-                _mHandler.sendEmptyMessage(MSG_LOAD_BACKGROUND);
-            }
-        } else {
-            // 缓存恢复后，快速刷新视图（避免状态不一致）
-            refreshViewFromCache();
+        // 移除缓存恢复后的刷新逻辑，直接发送加载背景消息
+        if (_mHandler != null) {
+            _mHandler.sendEmptyMessage(MSG_LOAD_BACKGROUND);
         }
-        // 恢复广告（保持原有）
         if (mADsBannerView != null) {
             mADsBannerView.resumeADs(MainActivity.this);
         }
@@ -240,6 +161,7 @@ public class MainActivity extends WinBoLLActivity {
         AESThemeUtil.inflateMenu(this, menu);
         if (App.isDebugging()) {
             DevelopUtils.inflateMenu(this, menu);
+			getMenuInflater().inflate(R.menu.toolbar_unittest, mMenu);
         }
         getMenuInflater().inflate(R.menu.toolbar_main, mMenu);
         return true;
@@ -294,6 +216,14 @@ public class MainActivity extends WinBoLLActivity {
         }
     }
 
+	@Override
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+		if (requestCode == REQUEST_READ_MEDIA_IMAGES) {
+			PermissionUtils.getInstance().handleStoragePermissionResult(this, requestCode, permissions, grantResults);
+		}
+	}
+
     @Override
     public void onBackPressed() {
         moveTaskToBack(true);
@@ -312,94 +242,10 @@ public class MainActivity extends WinBoLLActivity {
         }
     }
 
-
-    // ======================== 新增：窗体缓存核心方法（恢复+刷新）========================
-    /**
-     * 从 savedInstanceState 恢复视图和数据（核心）
-     * 避免重复加载布局、绑定控件、读取配置，加快窗体重建速度
-     */
-    private void restoreFromCache(Bundle savedInstanceState) {
-        LogUtils.d(TAG, "restoreFromCache - 从缓存恢复窗体");
-
-        // 1. 恢复工具类（无需重新初始化，直接获取实例）
-        mApplication = (App) getApplication();
-        mAppConfigUtils = App.getAppConfigUtils(getActivity());
-        mBgSourceUtils = BackgroundSourceUtils.getInstance(getActivity());
-
-        // 2. 恢复ViewHolder（仅绑定控件，不重新inflate布局）
-        if (mViewHolder == null) {
-            mViewHolder = new ViewHolder();
-            initViewHolder(); // 复用原有绑定逻辑，避免重复代码
-        }
-
-        // 3. 恢复背景配置（直接设置缓存的BackgroundBean，避免重复读取）
-        BackgroundBean cachedBean = (BackgroundBean) savedInstanceState.getSerializable(KEY_BACKGROUND_BEAN);
-        if (cachedBean != null && mViewHolder.backgroundView != null) {
-            mViewHolder.backgroundView.loadBackgroundBean(cachedBean);
-            //mBgSourceUtils.setCurrentBackgroundBean(cachedBean); // 同步更新工具类缓存
-        }
-
-        // 4. 恢复控件数据（从缓存读取，避免重复调用AppConfigUtils）
-        int chargeReminder = savedInstanceState.getInt(KEY_CHARGE_REMINDER, 80); // 默认值80
-        int usegeReminder = savedInstanceState.getInt(KEY_USEGE_REMINDER, 20); // 默认值20
-        int currentValue = savedInstanceState.getInt(KEY_CURRENT_VALUE, 50); // 默认值50
-        boolean isServiceEnable = savedInstanceState.getBoolean(KEY_IS_SERVICE_ENABLE, false);
-        boolean isChargeEnable = savedInstanceState.getBoolean(KEY_IS_CHARGE_ENABLE, false);
-        boolean isUsegeEnable = savedInstanceState.getBoolean(KEY_IS_USEGE_ENABLE, false);
-
-        // 5. 恢复电量图标（复用缓存实例，避免重新创建）
-        initBatteryDrawables();
-        mCurrentValueBatteryDrawable.setValue(currentValue);
-        mChargeReminderValueBatteryDrawable.setValue(chargeReminder);
-        mUsegeReminderValueBatteryDrawable.setValue(usegeReminder);
-
-        // 6. 恢复控件状态（直接设置，避免重复绑定数据）
-        if (mViewHolder != null) {
-            mViewHolder.cbIsEnableChargeReminder.setChecked(isChargeEnable);
-            mViewHolder.cbIsEnableUsegeReminder.setChecked(isUsegeEnable);
-            mViewHolder.swIsEnableService.setChecked(isServiceEnable);
-            mViewHolder.chargeReminderSeekBar.setProgress(savedInstanceState.getInt(KEY_VIEW_STATE + "_charge_seek", chargeReminder));
-            mViewHolder.usegeReminderSeekBar.setProgress(savedInstanceState.getInt(KEY_VIEW_STATE + "_usege_seek", usegeReminder));
-            mViewHolder.tvChargeReminderValue.setText(String.valueOf(chargeReminder) + "%");
-            mViewHolder.tvUsegeReminderValue.setText(String.valueOf(usegeReminder) + "%");
-            mViewHolder.tvCurrentValue.setText(String.valueOf(currentValue) + "%");
-        }
-
-        // 7. 恢复非核心视图（广告）
-        loadAdsView();
-    }
+    // ======================== 移除缓存相关核心方法（restoreFromCache/refreshViewFromCache）========================
 
     /**
-     * 缓存恢复后，快速刷新视图（确保状态一致）
-     */
-    private void refreshViewFromCache() {
-        if (mViewHolder == null) return;
-
-        // 快速设置背景色（从缓存Bean获取）
-        if (mBgSourceUtils != null && mViewHolder.mainLayout != null) {
-            BackgroundBean cachedBean = mBgSourceUtils.getCurrentBackgroundBean();
-            if (cachedBean != null) {
-                mViewHolder.mainLayout.setBackgroundColor(cachedBean.getPixelColor());
-            }
-        }
-
-        // 快速设置电量图标（避免图标不显示）
-        if (mViewHolder.ivCurrentBattery != null) {
-            mViewHolder.ivCurrentBattery.setImageDrawable(mCurrentValueBatteryDrawable);
-        }
-        if (mViewHolder.ivChargeReminderBattery != null) {
-            mViewHolder.ivChargeReminderBattery.setImageDrawable(mChargeReminderValueBatteryDrawable);
-        }
-        if (mViewHolder.ivUsegeReminderBattery != null) {
-            mViewHolder.ivUsegeReminderBattery.setImageDrawable(mUsegeReminderValueBatteryDrawable);
-        }
-
-        // 重新绑定监听（确保交互正常，避免监听失效）
-        setViewListener();
-    }
-
-    /**
-     * 初始化电量图标（复用逻辑，避免重复代码）
+     * 初始化电量图标（复用逻辑）
      */
     private void initBatteryDrawables() {
         if (mCurrentValueBatteryDrawable == null) {
@@ -413,13 +259,11 @@ public class MainActivity extends WinBoLLActivity {
         }
     }
 
-
-    // ======================== 原有核心方法（微调：新增缓存判断，避免重复执行）========================
+    // ======================== 原有核心方法（移除缓存判断逻辑）========================
     /**
-     * 刷新背景（新增缓存判断，缓存恢复后无需重复执行）
+     * 刷新背景（移除缓存判断）
      */
     public void reloadBackground() {
-        if (isRestoredFromCache) return; // 缓存恢复后，跳过重复加载
         if (mViewHolder == null || mBgSourceUtils == null || mViewHolder.backgroundView == null) {
             LogUtils.e(TAG, "reloadBackground: 背景加载失败（控件/工具类未初始化）");
             return;
@@ -434,10 +278,9 @@ public class MainActivity extends WinBoLLActivity {
     }
 
     /**
-     * 设置主页面背景颜色（新增缓存判断）
+     * 设置主页面背景颜色（移除缓存判断）
      */
     void setBackgroundColor() {
-        if (isRestoredFromCache) return;
         if (isFinishing() || isDestroyed() || mViewHolder == null || mBgSourceUtils == null || mViewHolder.mainLayout == null) {
             return;
         }
@@ -449,10 +292,9 @@ public class MainActivity extends WinBoLLActivity {
     }
 
     /**
-     * 设置视图数据（新增缓存判断，缓存恢复后无需重复执行）
+     * 设置视图数据（移除缓存判断）
      */
     void setViewData() {
-        if (isRestoredFromCache) return;
         if (mViewHolder == null || mAppConfigUtils == null) return;
 
         int nChargeReminderValue = mAppConfigUtils.getChargeReminderValue();
@@ -464,7 +306,7 @@ public class MainActivity extends WinBoLLActivity {
             mViewHolder.llRightSeekBar.setBackground(mDrawableFrame);
         }
 
-        initBatteryDrawables(); // 复用初始化逻辑
+        initBatteryDrawables();
         if (mViewHolder.ivCurrentBattery != null) {
             mCurrentValueBatteryDrawable.setValue(nCurrentValue);
             mViewHolder.ivCurrentBattery.setImageDrawable(mCurrentValueBatteryDrawable);
@@ -478,7 +320,6 @@ public class MainActivity extends WinBoLLActivity {
             mViewHolder.ivUsegeReminderBattery.setImageDrawable(mUsegeReminderValueBatteryDrawable);
         }
 
-        // 控件数据绑定（保持原有）
         if (mViewHolder.tvChargeReminderValue != null) {
             mViewHolder.tvChargeReminderValue.setTextColor(getActivity().getColor(R.color.colorCharge));
             mViewHolder.tvChargeReminderValue.setText(String.valueOf(nChargeReminderValue) + "%");
@@ -515,7 +356,6 @@ public class MainActivity extends WinBoLLActivity {
         }
     }
 
-    // 其他原有方法（setViewListener、setCurrentValueBattery、initCoreUtilsAsync等保持不变）
     /**
      * 设置视图监听（保持原有）
      */

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

@@ -18,6 +18,7 @@ import cc.winboll.studio.powerbell.utils.PermissionUtils;
 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;
 
@@ -52,8 +53,15 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit
 
 	public void onCheckPermission(View view) {
 		//ToastUtils.show("onCheckPermission");
-		if (PermissionUtils.getInstance().checkAndRequestStoragePermission(this)) {
-			ToastUtils.show("【权限检查】存储权限已全部获取");
+		PermissionUtils.getInstance().checkAndRequestMediaImagesPermission(this, REQUEST_READ_MEDIA_IMAGES);
+	}
+
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+		if (requestCode == REQUEST_READ_MEDIA_IMAGES) {
+			PermissionUtils.getInstance().handleStoragePermissionResult(this, requestCode, permissions, grantResults);
 		}
 	}
 }

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

@@ -35,7 +35,7 @@ public class MainUnitTestActivity extends AppCompatActivity {
     BackgroundView mBackgroundView;
     // 测试图片路径（用Environment获取，适配低版本，避免硬编码）
     String szTestSource = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)
-            + "/PowerBell/unittest/2ae9dc9e-7a73-49d4-840a-7ff1712d868c1764798674763.jpeg";
+	+ "/PowerBell/unittest/1764946782079.jpeg";
 	
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -90,7 +90,7 @@ public class MainUnitTestActivity extends AppCompatActivity {
             LogUtils.d(TAG, "【裁剪测试】创建输出目录：" + outputDir.getAbsolutePath());
         }
         String dstOutputPath = outputDir.getAbsolutePath() 
-                + "/SelectCompress_2ae9dc9e-7a73-49d4-840a-7ff1712d868c1764798674763.jpeg";
+			+ "/1764946782079-crop.jpeg";
 
         // 修复3：自由裁剪时比例传0（避免100:100过大导致机型崩溃）
         ImageCropUtils.startImageCrop(
@@ -161,7 +161,7 @@ public class MainUnitTestActivity extends AppCompatActivity {
         // 裁剪完成后回收权限
         if (requestCode == REQUEST_CROP_IMAGE) {
             String dstOutputPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)
-                    + "/PowerBell/unittest/SelectCompress_2ae9dc9e-7a73-49d4-840a-7ff1712d868c1764798674763.jpeg";
+                    + "/PowerBell/unittest/1764946782079-crop.jpeg";
             //Uri outputUri = ImageCropUtils.getFileProviderUriPublic(this, new File(dstOutputPath));
             //ImageCropUtils.releaseCropPermission(this, outputUri);
 			mBackgroundView.loadImage(dstOutputPath);

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/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/PermissionUtils.java

@@ -1,214 +1,134 @@
 package cc.winboll.studio.powerbell.utils;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
-import android.provider.Settings;
-import android.text.TextUtils;
+
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.ToastUtils;
-import cc.winboll.studio.powerbell.R;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/12/01 16:05
- * @Describe 权限申请工具类（单例）
- * 核心特性：
- * 1. 适配全Android版本（6.0+ 动态权限 / 13+ 兼容）
- * 2. 支持多包名场景（无硬编码包名）
- * 3. 统一权限校验、申请、回调处理
- * 4. 自带用户引导（拒绝权限+不再询问场景）
+ * 权限申请工具类
+ * 适配 Android 13+ 媒体权限 & 低版本存储权限
+ * 兼容 SDK 版本低于 33 的编译环境
  */
 public class PermissionUtils {
-	public static final String TAG = "PermissionUtils";
-	// 存储权限请求码（与Activity保持一致，避免冲突）
-	public static final int STORAGE_PERMISSION_REQUEST2 = 100;
-	public static final int REQUEST_MANAGE_EXTERNAL_STORAGE = 101;
+    private static final String TAG = "PermissionUtils";
+    // 存储权限请求码
+    public static final int REQUEST_STORAGE = 1000;
+    // 媒体图片权限请求码（Android 13+）
+    public static final int REQUEST_READ_MEDIA_IMAGES = 1001;
 
-	// 单例实例（双重校验锁，线程安全）
-	private static volatile PermissionUtils sInstance;
+    // 手动定义 Android 13+ 媒体图片权限常量（解决 SDK 低于 33 无法识别问题）
+    private static final String READ_MEDIA_IMAGES = "android.permission.READ_MEDIA_IMAGES";
+    // Android 13 对应的 SDK 版本号（替代 Build.VERSION_CODES.TIRAMISU）
+    private static final int SDK_VERSION_TIRAMISU = 33;
 
-	// 私有构造（禁止外部实例化）
-	private PermissionUtils() {}
+    // 单例模式
+    private static volatile PermissionUtils sInstance;
 
-	/**
-	 * 获取单例实例（适配多包名，无硬编码）
-	 */
-	public static PermissionUtils getInstance() {
-		if (sInstance == null) {
-			synchronized (PermissionUtils.class) {
-				if (sInstance == null) {
-					sInstance = new PermissionUtils();
-				}
-			}
-		}
-		return sInstance;
-	}
+    private PermissionUtils() {}
 
-	// ======================================== 存储权限核心方法 ========================================
-	/**
-	 * 检查并申请存储权限（统一入口，适配全Android版本）
-	 * @param activity 上下文（用于权限申请和弹窗）
-	 * @return true：权限已全部获取；false：需要申请权限
-	 */
-	public boolean checkAndRequestStoragePermission(Activity activity) {
-		if (activity == null || activity.isFinishing()) {
-			LogUtils.e(TAG, "【权限检查】Activity为空或已销毁，权限检查失败");
-			return false;
-		}
-		LogUtils.d(TAG, "【权限检查】开始检查存储权限，Android版本：" + Build.VERSION.SDK_INT);
+    public static PermissionUtils getInstance() {
+        if (sInstance == null) {
+            synchronized (PermissionUtils.class) {
+                if (sInstance == null) {
+                    sInstance = new PermissionUtils();
+                }
+            }
+        }
+        return sInstance;
+    }
 
-		// 统一使用 WRITE_EXTERNAL_STORAGE + READ_EXTERNAL_STORAGE（适配所有版本，避免READ_MEDIA_IMAGES找不到符号）
-		String[] requiredPermissions = {
-			android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
-			android.Manifest.permission.READ_EXTERNAL_STORAGE
-		};
+    /**
+     * 检查并请求 存储权限（Android 12及以下）
+     */
+    public boolean checkAndRequestStoragePermission(Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            // Android 11+ 无需申请 READ_EXTERNAL_STORAGE，直接返回true
+            return true;
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            String[] permissions = {
+				android.Manifest.permission.READ_EXTERNAL_STORAGE,
+				android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+            };
+            if (ContextCompat.checkSelfPermission(activity, permissions[0]) != PackageManager.PERMISSION_GRANTED
+				|| ContextCompat.checkSelfPermission(activity, permissions[1]) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(activity, permissions, REQUEST_STORAGE);
+                return false;
+            }
+        }
+        return true;
+    }
 
-		// 筛选未授予的权限
-		List<String> needPermissions = new ArrayList<>();
-		for (String permission : requiredPermissions) {
-			if (ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED) {
-				needPermissions.add(permission);
-			}
-		}
+    /**
+     * 检查并请求 媒体图片权限（Android 13+）
+     * 兼容 SDK 编译版本低于 33 的情况
+     */
+    public boolean checkAndRequestMediaImagesPermission(Activity activity, int requestCode) {
+        // 用数值 33 替代 Build.VERSION_CODES.TIRAMISU
+        if (Build.VERSION.SDK_INT >= SDK_VERSION_TIRAMISU) {
+            // 用手动定义的权限常量替代 android.Manifest.permission.READ_MEDIA_IMAGES
+            if (ContextCompat.checkSelfPermission(activity, READ_MEDIA_IMAGES) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(activity, new String[]{READ_MEDIA_IMAGES}, requestCode);
+                return false;
+            }
+        }
+        // 低版本已通过存储权限覆盖，直接返回true
+        return true;
+    }
 
-		// 无权限需要申请：触发动态申请
-		if (!needPermissions.isEmpty()) {
-			String[] permissionsArr = needPermissions.toArray(new String[0]);
-			ActivityCompat.requestPermissions(activity, permissionsArr, STORAGE_PERMISSION_REQUEST2);
-			LogUtils.d(TAG, "【权限申请】已触发存储权限申请：" + TextUtils.join(",", permissionsArr));
-			return false;
-		}
+    /**
+     * 权限请求结果处理
+     */
+    public void handleStoragePermissionResult(Activity activity, int requestCode, String[] permissions, int[] grantResults) {
+        switch (requestCode) {
+            case REQUEST_STORAGE:
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    LogUtils.d(TAG, "存储权限申请成功");
+                } else {
+                    LogUtils.e(TAG, "存储权限申请失败");
+                }
+                break;
+            case REQUEST_READ_MEDIA_IMAGES:
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    LogUtils.d(TAG, "媒体图片权限申请成功");
+                } else {
+                    LogUtils.e(TAG, "媒体图片权限申请失败");
+                }
+                break;
+            default:
+                LogUtils.d(TAG, "未知权限请求码：" + requestCode);
+        }
+    }
 
-		// 所有权限已授予
-		LogUtils.d(TAG, "【权限检查】存储权限已全部获取");
-		return true;
-	}
+    /**
+     * 检查是否有管理所有文件权限（Android 11+）
+     */
+    public boolean checkManageExternalStoragePermission(Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return android.os.Environment.isExternalStorageManager();
+        }
+        return true;
+    }
 
-	/**
-	 * 处理存储权限申请回调（统一逻辑，无需在Activity中重复编写）
-	 * @param activity 上下文
-	 * @param requestCode 请求码（匹配STORAGE_PERMISSION_REQUEST）
-	 * @param permissions 申请的权限数组
-	 * @param grantResults 权限授予结果数组
-	 * @return true：回调已处理；false：非当前工具类的权限回调
-	 */
-	public boolean handleStoragePermissionResult(Activity activity, int requestCode, String[] permissions, int[] grantResults) {
-		// 过滤非存储权限回调
-		if (requestCode != STORAGE_PERMISSION_REQUEST2) {
-			return false;
-		}
-		LogUtils.d(TAG, "【权限回调】处理存储权限回调，requestCode：" + requestCode);
-
-		if (activity == null || activity.isFinishing()) {
-			LogUtils.e(TAG, "【权限回调】Activity为空或已销毁，回调处理终止");
-			return true;
-		}
-
-		// 校验所有权限是否授予
-		boolean allGranted = true;
-		for (int grantResult : grantResults) {
-			if (grantResult != PackageManager.PERMISSION_GRANTED) {
-				allGranted = false;
-				break;
-			}
-		}
-
-		if (allGranted) {
-			// 全部授予：提示用户重新操作
-			ToastUtils.show(activity.getString(R.string.permission_grant_success));
-			LogUtils.d(TAG, "【权限回调】所有存储权限已授予");
-		} else {
-			// 部分/全部拒绝：判断是否勾选“不再询问”
-			boolean shouldShowRationale = false;
-			for (String permission : permissions) {
-				if (ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)) {
-					shouldShowRationale = true;
-					break;
-				}
-			}
-
-			if (shouldShowRationale) {
-				// 未勾选“不再询问”：弹窗引导重新申请
-				showPermissionRationaleDialog(activity);
-			} else {
-				// 已勾选“不再询问”：引导用户去设置页开启
-				showPermissionSettingDialog(activity);
-			}
-			LogUtils.d(TAG, "【权限回调】部分/全部存储权限被拒绝，是否需要引导：" + shouldShowRationale);
-		}
-		return true;
-	}
-
-	// ======================================== 辅助方法（私有，封装细节） ========================================
-	/**
-	 * 弹窗：未勾选“不再询问”时，提示用户授予权限
-	 */
-	private void showPermissionRationaleDialog(final Activity activity) {
-		new AlertDialog.Builder(activity)
-			.setTitle(activity.getString(R.string.permission_title))
-			.setMessage(activity.getString(R.string.permission_storage_rationale))
-			.setPositiveButton(activity.getString(R.string.confirm), new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					// 重新申请权限
-					checkAndRequestStoragePermission(activity);
-				}
-			})
-			.setNegativeButton(activity.getString(R.string.cancel), null)
-			.show();
-	}
-
-	/**
-	 * 弹窗：已勾选“不再询问”时，引导用户去应用设置页开启权限
-	 */
-	private void showPermissionSettingDialog(final Activity activity) {
-		new AlertDialog.Builder(activity)
-			.setTitle(activity.getString(R.string.permission_denied_title))
-			.setMessage(activity.getString(R.string.permission_storage_setting_guide))
-			.setPositiveButton(activity.getString(R.string.go_to_setting), new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					// 跳转应用设置页（适配多包名，动态获取当前包名）
-					Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-					Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
-					intent.setData(uri);
-					activity.startActivity(intent);
-				}
-			})
-			.setNegativeButton(activity.getString(R.string.cancel), null)
-			.show();
-	}
-
-	// ======================================== 扩展：其他权限方法（可选） ========================================
-	/**
-	 * 检查单个权限是否已授予（通用方法，可复用）
-	 */
-	public boolean isPermissionGranted(Activity activity, String permission) {
-		if (activity == null || TextUtils.isEmpty(permission)) {
-			return false;
-		}
-		return ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_GRANTED;
-	}
-
-	/**
-	 * 申请单个权限（通用方法，可复用）
-	 */
-	public void requestSinglePermission(Activity activity, String permission, int requestCode) {
-		if (activity == null || TextUtils.isEmpty(permission)) {
-			return;
-		}
-		if (!isPermissionGranted(activity, permission)) {
-			ActivityCompat.requestPermissions(activity, new String[]{permission}, requestCode);
-		}
-	}
+    /**
+     * 请求管理所有文件权限（Android 11+）
+     */
+    public void requestManageExternalStoragePermission(Activity activity, int requestCode) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            try {
+                android.content.Intent intent = new android.content.Intent(
+					android.provider.Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
+                );
+                intent.setData(android.net.Uri.parse("package:" + activity.getPackageName()));
+                activity.startActivityForResult(intent, requestCode);
+            } catch (Exception e) {
+                LogUtils.e(TAG, "请求管理文件权限异常：" + e.getMessage());
+            }
+        }
+    }
 }
 

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

@@ -10,8 +10,10 @@ 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;
@@ -105,18 +107,83 @@ public class UriUtil {
     }
 	
 	public static Uri getUriForFile(Context context, String filePath) {
+		// 1. 打印传入的文件路径
+		LogUtils.d(TAG, "getUriForFile -> 传入路径：" + filePath);
+		if (filePath == null || filePath.isEmpty()) {
+			LogUtils.e(TAG, "getUriForFile -> 传入路径为空");
+			return null;
+		}
+
 		File file = new File(filePath);
-        return getUriForFile(context, file);
-    }
+		// 2. 打印File对象的绝对路径和存在性
+		LogUtils.d(TAG, "getUriForFile -> 文件绝对路径：" + file.getAbsolutePath());
+		LogUtils.d(TAG, "getUriForFile -> 文件是否存在：" + file.exists());
+		LogUtils.d(TAG, "getUriForFile -> 是否为目录：" + file.isDirectory());
 
-    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);
-    }
+		// 3. 合法性校验
+		if (!file.exists() || file.isDirectory()) {
+			LogUtils.e(TAG, "getUriForFile -> 非法路径：文件不存在或为目录");
+			return null;
+		}
 
+		// 4. 校验路径是否在配置的合法目录内
+		String appFilesDir = context.getExternalFilesDir(null) != null ? context.getExternalFilesDir(null).getAbsolutePath() : "null";
+		String publicPicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() + "/PowerBell/";
+		String internalFilesDir = context.getFilesDir().getAbsolutePath();
+		String cacheDir = context.getCacheDir().getAbsolutePath();
+
+		String absolutePath = file.getAbsolutePath();
+		boolean isInConfigDir = absolutePath.startsWith(appFilesDir)
+            || absolutePath.startsWith(publicPicDir)
+            || absolutePath.startsWith(internalFilesDir)
+            || absolutePath.startsWith(cacheDir);
+		LogUtils.d(TAG, "getUriForFile -> 路径是否在配置目录内：" + isInConfigDir);
+		if (!isInConfigDir) {
+			LogUtils.w(TAG, "getUriForFile -> 路径不在FileProvider配置范围内，可能导致异常");
+			// 非强制拦截，保留原有逻辑，仅警告
+		}
+
+		return getUriForFile(context, file);
+	}
+
+	public static Uri getUriForFile(Context context, File file) {
+		if (context == null) {
+			LogUtils.e(TAG, "getUriForFile -> Context为空");
+			return null;
+		}
+		if (file == null) {
+			LogUtils.e(TAG, "getUriForFile -> File对象为空");
+			return null;
+		}
+
+		// 1. 二次校验文件状态
+		LogUtils.d(TAG, "getUriForFile(File) -> 文件路径：" + file.getAbsolutePath());
+		if (!file.exists() || file.isDirectory()) {
+			LogUtils.e(TAG, "getUriForFile(File) -> 文件不存在或为目录");
+			return null;
+		}
+
+		// 2. 版本判断与Uri生成
+		if (Build.VERSION.SDK_INT >= 24) {
+			LogUtils.d(TAG, "getUriForFile -> Android 7.0+，使用FileProvider生成Uri");
+			try {
+				String authority = context.getPackageName() + ".fileprovider";
+				LogUtils.d(TAG, "getUriForFile -> FileProvider authority：" + authority);
+				Uri uri = FileProvider.getUriForFile(context, authority, file);
+				LogUtils.d(TAG, "getUriForFile -> 生成Content Uri成功：" + uri.toString());
+				return uri;
+			} catch (IllegalArgumentException e) {
+				LogUtils.e(TAG, "getUriForFile -> FileProvider生成Uri失败：路径未配置或权限不足", e);
+				return null;
+			}
+		} else {
+			LogUtils.d(TAG, "getUriForFile -> Android 7.0以下，使用Uri.fromFile生成Uri");
+			Uri uri = Uri.fromFile(file);
+			LogUtils.d(TAG, "getUriForFile -> 生成File Uri成功：" + uri.toString());
+			return uri;
+		}
+	}
+	
     private static File createTemporalFileFrom(Context context, InputStream inputStream, String fileName)
     throws IOException {
         File targetFile = null;

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

@@ -12,6 +12,8 @@ import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.model.BackgroundBean;
 import java.io.File;
 
@@ -22,6 +24,8 @@ import java.io.File;
 public class BackgroundView extends RelativeLayout {
 
     public static final String TAG = "BackgroundView";
+    // 新增：记录当前已缓存的图片路径
+    private String mCurrentCachedPath = "";
 
     private Context mContext;
     private LinearLayout mLlContainer; // 主容器LinearLayout
@@ -55,8 +59,6 @@ public class BackgroundView extends RelativeLayout {
         LogUtils.d(TAG, "=== initView 启动 ===");
         // 1. 配置当前控件：全屏+透明
         setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-        //setBackgroundColor(0x00000000);
-        //setBackground(new ColorDrawable(0x00000000));
 
         // 2. 初始化主容器LinearLayout
         initLinearLayout();
@@ -64,7 +66,7 @@ public class BackgroundView extends RelativeLayout {
         // 3. 初始化ImageView
         initImageView();
 
-		// 初始设置透明背景
+        // 初始设置透明背景
         setDefaultTransparentBackground();
 
         LogUtils.d(TAG, "=== initView 完成 ===");
@@ -101,22 +103,35 @@ public class BackgroundView extends RelativeLayout {
         LogUtils.d(TAG, "=== initImageView 完成 ===");
     }
 
-	public void loadBackgroundBean(BackgroundBean bean) {
-		if (!bean.isUseBackgroundFile()) {
-			setDefaultTransparentBackground();
+    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();
+
+		if (!(new File(targetPath).exists())) {
+			LogUtils.d(TAG, String.format("视图控件图片不存在：%s", targetPath));
 			return;
 		}
-		if (bean.isUseBackgroundScaledCompressFile()) {
-			loadImage(bean.getBackgroundScaledCompressFilePath());
-		} else {
 
-			loadImage(bean.getBackgroundFilePath());
+		// 调用带路径判断的loadImage方法
+		if (isRefresh) {
+			App._mBitmapCacheUtils.removeCachedBitmap(targetPath);
+			App._mBitmapCacheUtils.cacheBitmap(targetPath);
 		}
-	}
+		loadImage(targetPath);
+    }
 
     // ====================================== 对外方法 ======================================
     /**
-     * 加载图片（保持原图比例，在LinearLayout中居中平铺）
+     * 改造后：添加路径判断，路径更新时同步更新缓存；缓存Bitmap为null时提示并加载透明背景
      * @param imagePath 图片绝对路径
      */
     public void loadImage(String imagePath) {
@@ -132,25 +147,59 @@ public class BackgroundView extends RelativeLayout {
             setDefaultTransparentBackground();
             return;
         }
-		
-		mIvBackground.setVisibility(View.GONE);
 
-        // 计算原图比例
+        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;
+            }
+        }
+
+        // 2. 路径已更新：移除旧缓存，加载新图片并更新缓存
+        if (!TextUtils.isEmpty(mCurrentCachedPath)) {
+            App._mBitmapCacheUtils.removeCachedBitmap(mCurrentCachedPath);
+            LogUtils.d(TAG, "loadImage: 路径已更新，移除旧缓存 - " + mCurrentCachedPath);
+        }
+        // ======================== 路径判断逻辑结束 ========================
+
+        // 无缓存/路径更新：走原有逻辑加载图片
         if (!calculateImageAspectRatio(imageFile)) {
             setDefaultTransparentBackground();
             return;
         }
 
-        // 压缩加载Bitmap
         Bitmap bitmap = decodeBitmapWithCompress(imageFile, 1080, 1920);
         if (bitmap == null) {
+            LogUtils.e(TAG, "loadImage: 图片解码失败");
+            ToastUtils.show("图片解码失败，无法加载");
             setDefaultTransparentBackground();
             return;
         }
 
-        // 设置图片
+        // 缓存新图片，并更新当前缓存路径记录
+        App._mBitmapCacheUtils.cacheBitmap(imagePath);
+        mCurrentCachedPath = imagePath;
+        LogUtils.d(TAG, "loadImage: 加载新图片并更新缓存 - " + imagePath);
+
         mIvBackground.setImageDrawable(new BitmapDrawable(mContext.getResources(), bitmap));
-        adjustImageViewSize(); // 调整尺寸
+        adjustImageViewSize();
+        mIvBackground.setVisibility(View.VISIBLE);
         LogUtils.d(TAG, "=== loadImage 完成 ===");
     }
 
@@ -198,56 +247,40 @@ public class BackgroundView extends RelativeLayout {
         }
     }
 
-    /**
-     * 调整ImageView尺寸（保持原图比例，在LinearLayout中居中平铺）
-     */
     private void adjustImageViewSize() {
-        //LogUtils.d(TAG, "=== adjustImageViewSize 启动 ===");
         if (mLlContainer == null || mIvBackground == null) {
-            //LogUtils.e(TAG, "控件为空");
             return;
         }
 
-        // 获取LinearLayout尺寸
         int llWidth = mLlContainer.getWidth();
         int llHeight = mLlContainer.getHeight();
-        if (llWidth == 0 || llHeight == 0) {
-            postDelayed(new Runnable() {
-					@Override
-					public void run() {
-						adjustImageViewSize();
-					}
-				}, 100);
-            return;
+
+        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);
         }
-
-        // 计算ImageView尺寸（保持比例，不超出LinearLayout）
-        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);
-		
-
-        //LogUtils.d(TAG, "ImageView尺寸：" + ivWidth + "x" + ivHeight);
-        //LogUtils.d(TAG, "=== adjustImageViewSize 完成 ===");
     }
 
     private void setDefaultTransparentBackground() {
         mIvBackground.setImageBitmap(null);
         mIvBackground.setBackgroundColor(0x00000000);
         mImageAspectRatio = 1.0f;
+        // 清空缓存路径记录
+        mCurrentCachedPath = "";
+        mIvBackground.setVisibility(View.GONE);
     }
 
     // ====================================== 重写方法 ======================================
@@ -257,3 +290,4 @@ public class BackgroundView extends RelativeLayout {
         adjustImageViewSize(); // 尺寸变化时重新调整
     }
 }
+

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