数据模型有调整，设定次级版本号。同次级版本应用可以自由切换。

通知类调试完成
通知类重构
2025-12-13 21:11:03 +08:00 · 2025-12-13 21:04:35 +08:00 · 2025-12-13 20:47:00 +08:00 · 2025-12-13 20:23:48 +08:00 · 2025-12-12 00:27:07 +08:00 · 2025-12-11 20:54:28 +08:00
37 changed files with 1965 additions and 1851 deletions
--- a/powerbell/build.gradle
+++ b/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.12" 
+        versionName "15.14" 
        if(true) {
            versionName = genVersionName("${versionName}")
        }
--- a/powerbell/build.properties
+++ b/powerbell/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Dec 11 03:22:10 HKT 2025
-stageCount=15
+#Sat Dec 13 13:05:44 GMT 2025
+stageCount=0
 libraryProject=
-baseVersion=15.12
-publishVersion=15.12.14
-buildCount=0
-baseBetaVersion=15.12.15
+baseVersion=15.14
+publishVersion=15.14.0
+buildCount=1
+baseBetaVersion=15.14.1
--- a/powerbell/src/main/AndroidManifest.xml
+++ b/powerbell/src/main/AndroidManifest.xml
@@ -4,12 +4,6 @@
    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"/>

@@ -143,14 +137,14 @@
        </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>

        <activity
-            android:name="cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity"
+            android:name=".activities.BackgroundSettingsActivity"
            android:parentActivityName="cc.winboll.studio.powerbell.MainActivity"
            android:exported="true"
            android:launchMode="singleTask">
@@ -190,14 +184,14 @@
        </receiver>

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

        <service
-            android:name="cc.winboll.studio.powerbell.services.AssistantService"
+            android:name=".services.AssistantService"
            android:enabled="true"
            android:exported="false"
            android:process=".assistantservice"/>
@@ -206,13 +200,13 @@
            android:name="android.max_aspect"
            android:value="4.0"/>

-        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReporterActivity"/>
+        <activity android:name=".activities.BatteryReporterActivity"/>

-        <activity android:name="cc.winboll.studio.powerbell.activities.PixelPickerActivity"/>
+        <activity android:name=".activities.PixelPickerActivity"/>

-        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReportActivity"/>
+        <activity android:name=".activities.BatteryReportActivity"/>

-        <activity android:name="cc.winboll.studio.powerbell.unittest.MainUnitTestActivity"/>
+        <activity android:name=".unittest.MainUnitTestActivity"/>

        <provider
            android:name="androidx.core.content.FileProvider"
@@ -226,16 +220,16 @@

        </provider>

-        <activity android:name="cc.winboll.studio.powerbell.activities.ShortcutActionActivity"/>
+        <activity android:name=".activities.ShortcutActionActivity"/>

-        <activity android:name="cc.winboll.studio.powerbell.activities.SettingsActivity"/>
+        <activity android:name=".activities.SettingsActivity"/>

-		<!-- 1. 注册 UCropActivity（关键：解决崩溃） -->
-		<activity
-			android:name="com.yalantis.ucrop.UCropActivity"
-			android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-			android:exported="true"> <!-- 必须添加：Android 12+ 要求显式声明 exported -->
-		</activity>
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:exported="true">
+
+        </activity>

    </application>

--- a/powerbell/src/main/assets/images/blank10x10.png
+++ b/powerbell/src/main/assets/images/blank10x10.png
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java
@@ -8,12 +8,13 @@ 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.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 cc.winboll.studio.powerbell.utils.PermissionUtils;
 import java.io.File;

 public class App extends GlobalApplication {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java
+++ b/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;
@@ -39,7 +37,7 @@ import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
 import cc.winboll.studio.powerbell.activities.SettingsActivity;
 import cc.winboll.studio.powerbell.activities.WinBoLLActivity;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
-import cc.winboll.studio.powerbell.model.BackgroundBean;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.unittest.MainUnitTestActivity;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
@@ -60,7 +58,7 @@ public class MainActivity extends WinBoLLActivity {

    // ======================== 静态常量（移除缓存相关键）========================
    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;
@@ -125,8 +123,8 @@ public class MainActivity extends WinBoLLActivity {
        loadNonCriticalViewDelayed();

        // 权限申请
-        PermissionUtils.getInstance().checkAndRequestStoragePermission(this);
-    }
+		PermissionUtils.getInstance().checkAndRequestMediaImagesPermission(this, REQUEST_READ_MEDIA_IMAGES);
+	}

    // 移除 onSaveInstanceState 方法
    // 移除 onRestoreInstanceState 方法
@@ -163,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;
@@ -217,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);
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java
@@ -12,7 +12,7 @@ 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.model.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;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java
@@ -26,7 +26,7 @@ import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity;
 import cc.winboll.studio.powerbell.activities.PixelPickerActivity;
-import cc.winboll.studio.powerbell.model.BackgroundBean;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
 import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
 import java.io.File;
 import java.io.FileInputStream;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java
+++ b/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);
 		}
 	}
 }
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java
+++ b/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.model.BatteryData;
+import cc.winboll.studio.powerbell.models.BatteryData;
 import java.util.ArrayList;
 import java.util.List;

--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java
+++ b/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.BackgroundSettingsActivity;
 import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils;
-import cc.winboll.studio.powerbell.utils.FileUtils;
-import cc.winboll.studio.powerbell.utils.UriUtil;
+import cc.winboll.studio.powerbell.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;
-    BackgroundSourceUtils 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 = BackgroundSourceUtils.getInstance(mContext);
+        //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());
+    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(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());
-        }
+		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);
    }

 }
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java
@@ -20,7 +20,7 @@ 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.model.BackgroundBean;
+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;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/AppConfigBean.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/AppConfigBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.model;
+package cc.winboll.studio.powerbell.models;

 /**
 * @Author ZhanGSKen<zhangsken@qq.com>
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BackgroundBean.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BackgroundBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.model;
+package cc.winboll.studio.powerbell.models;

 import android.util.JsonReader;
 import android.util.JsonWriter;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryData.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryData.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.model;
+package cc.winboll.studio.powerbell.models;

 /**
 * @Author ZhanGSKen<zhangsken@qq.com>
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryInfoBean.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryInfoBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.model;
+package cc.winboll.studio.powerbell.models;

 import android.util.JsonReader;
 import android.util.JsonWriter;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ControlCenterServiceBean.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ControlCenterServiceBean.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.model;
+package cc.winboll.studio.powerbell.models;

 /**
 * @Author ZhanGSKen<zhangsken@qq.com>
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/NotificationMessage.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/NotificationMessage.java
@@ -1,4 +1,4 @@
-package cc.winboll.studio.powerbell.model;
+package cc.winboll.studio.powerbell.models;

 // 应用消息结构
 //
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java
+++ b/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.model.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;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java
+++ b/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.model.AppConfigBean;
-import cc.winboll.studio.powerbell.model.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(intent, getString(R.string.app_name), msg);



--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/unittest/MainUnitTestActivity.java
+++ b/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);
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppCacheUtils.java
+++ b/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.model.BatteryInfoBean;
+import cc.winboll.studio.powerbell.models.BatteryInfoBean;
 import java.util.ArrayList;

 public class AppCacheUtils {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java
@@ -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.model.AppConfigBean;
-import cc.winboll.studio.powerbell.model.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;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AssetsCopyUtils.java
+++ b/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());
+            }
+        }
+    }
+}
+
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BackgroundSourceUtils.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BackgroundSourceUtils.java
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BitmapCacheUtils.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BitmapCacheUtils.java
@@ -18,7 +18,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 * 特点：1. 单例模式  2. 压缩加载避免OOM  3. 路径- Bitmap 映射  4. 线程安全
 */
 public class BitmapCacheUtils {
-    private static final String TAG = "BitmapCacheUtils";
+    public static final String TAG = "BitmapCacheUtils";
    // 最大图片尺寸（适配1080P屏幕，可根据需求调整）
    private static final int MAX_WIDTH = 1080;
    private static final int MAX_HEIGHT = 1920;
@@ -50,7 +50,7 @@ public class BitmapCacheUtils {
    /**
     * 核心接口：根据图片路径缓存 Bitmap 到内存
     * @param imagePath 图片绝对路径
-     * @return 缓存成功的 Bitmap / null（路径无效/文件不存在）
+     * @return 缓存成功的 Bitmap / null（路径无效/文件不存在/解码失败）
     */
    public Bitmap cacheBitmap(String imagePath) {
        if (TextUtils.isEmpty(imagePath)) {
@@ -59,15 +59,23 @@ public class BitmapCacheUtils {
        }

        File imageFile = new File(imagePath);
-        if (!imageFile.exists() || !imageFile.isFile()) {
-            LogUtils.e(TAG, "cacheBitmap: 图片文件不存在 - " + imagePath);
+        if (!imageFile.exists() || !imageFile.isFile() || imageFile.length() <= 0) {
+            LogUtils.e(TAG, "cacheBitmap: 图片文件无效（不存在/非文件/空文件） - " + imagePath);
            return null;
        }

        // 已缓存则直接返回，避免重复加载
        if (mBitmapCacheMap.containsKey(imagePath)) {
-            LogUtils.d(TAG, "cacheBitmap: 图片已缓存，直接返回 - " + imagePath);
-            return mBitmapCacheMap.get(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）
@@ -85,25 +93,33 @@ public class BitmapCacheUtils {
    /**
     * 核心接口：根据路径获取缓存的 Bitmap
     * @param imagePath 图片绝对路径
-     * @return 缓存的 Bitmap / null
+     * @return 缓存的有效 Bitmap / null（未缓存/已回收）
     */
    public Bitmap getCachedBitmap(String imagePath) {
        if (TextUtils.isEmpty(imagePath)) {
            return null;
        }
-        return mBitmapCacheMap.get(imagePath);
+        Bitmap bitmap = mBitmapCacheMap.get(imagePath);
+        // 校验Bitmap是否有效
+        if (bitmap != null && bitmap.isRecycled()) {
+            mBitmapCacheMap.remove(imagePath);
+            return null;
+        }
+        return bitmap;
    }

    /**
     * 清空所有 Bitmap 缓存（释放内存）
     */
    public void clearAllCache() {
-        for (Bitmap bitmap : mBitmapCacheMap.values()) {
-            if (bitmap != null && !bitmap.isRecycled()) {
-                bitmap.recycle(); // 主动回收 Bitmap
+        synchronized (mBitmapCacheMap) {
+            for (Bitmap bitmap : mBitmapCacheMap.values()) {
+                if (bitmap != null && !bitmap.isRecycled()) {
+                    bitmap.recycle(); // 主动回收 Bitmap
+                }
            }
+            mBitmapCacheMap.clear();
        }
-        mBitmapCacheMap.clear();
        LogUtils.d(TAG, "clearAllCache: 所有 Bitmap 缓存已清空");
    }

@@ -115,22 +131,39 @@ public class BitmapCacheUtils {
        if (TextUtils.isEmpty(imagePath)) {
            return;
        }
-        Bitmap bitmap = mBitmapCacheMap.remove(imagePath);
-        if (bitmap != null && !bitmap.isRecycled()) {
-            bitmap.recycle();
-            LogUtils.d(TAG, "removeCachedBitmap: 移除并回收缓存 - " + imagePath);
+        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);

@@ -141,7 +174,15 @@ public class BitmapCacheUtils {
        options.inPurgeable = true;
        options.inInputShareable = true;

-        return BitmapFactory.decodeFile(imagePath, options);
+        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;
+        }
    }

    /**
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageCropUtils.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageCropUtils.java
@@ -6,7 +6,7 @@ import android.net.Uri;
 import android.os.Build;
 import androidx.core.content.FileProvider;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.powerbell.model.BackgroundBean;
+import cc.winboll.studio.powerbell.models.BackgroundBean;
 import com.yalantis.ucrop.UCrop;
 import com.yalantis.ucrop.UCropActivity;
 import java.io.File;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationHelper.java
+++ b/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
-        );
-    }
-}
-
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationManagerUtils.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationManagerUtils.java
@@ -0,0 +1,422 @@
+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）
+ */
+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_ALARM), 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.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（适配API29-30安全规范，支持自定义跳转目标）
+	 * @param targetIntent 自定义跳转意图（传null则默认跳MainActivity）
+	 * @return 安全的PendingIntent，避免跳转失败/泄露
+	 */
+	private PendingIntent buildPendingIntent(Intent targetIntent) {
+		Intent intent = targetIntent;
+		// 传null则默认跳MainActivity（兼容旧逻辑）
+		if (intent == null) {
+			intent = new Intent(mContext, MainActivity.class);
+			LogUtils.d(TAG, "【Intent构建】未传自定义Intent，默认跳转：MainActivity");
+		}
+		// API29+ 强制要求：明确包名，避免跳转目标模糊
+		intent.setPackage(DEFAULT_JUMP_PACKAGE);
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 确保跳转生效
+		LogUtils.d(TAG, "【Intent构建】跳转包名：" + DEFAULT_JUMP_PACKAGE + "，目标：" + intent.getComponent().getClassName());
+
+		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
+		PendingIntent pendingIntent = buildPendingIntent(null); // 默认跳MainActivity
+		// 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
+		PendingIntent pendingIntent = buildPendingIntent(null);
+		// 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：通用临时通知（简单文本，自动取消，无需自定义布局）======================
+	/**
+	 * 显示通用临时通知（普通告警，仅震动，自动取消，支持自定义跳转目标）
+	 * @param targetIntent 自定义跳转Intent（传null默认跳MainActivity）
+	 * @param title 通知标题
+	 * @param content 通知内容
+	 */
+	public void showTempAlertNotify(Intent targetIntent, String title, String content) {
+		LogUtils.d(TAG, "【通用临时通知】开始构建，标题：" + title + "，内容：" + content);
+		if (title == null || content == null) {
+			LogUtils.e(TAG, "【通用临时通知】构建失败：标题/内容为空");
+			return;
+		}
+		// 1. 构建跳转Intent
+		PendingIntent pendingIntent = buildPendingIntent(targetIntent);
+		// 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：自定义布局通知（灵活扩展，支持复杂样式）======================
+	/**
+	 * 显示自定义布局通知（支持普通布局+大布局，通用所有场景，可自定义跳转）
+	 * @param targetIntent 自定义跳转Intent
+	 * @param contentView 普通自定义布局（必填）
+	 * @param bigContentView 下拉大布局（可选）
+	 */
+	public void showCustomLayoutNotify(Intent targetIntent, RemoteViews contentView, RemoteViews bigContentView) {
+		LogUtils.d(TAG, "【自定义布局通知】开始构建，布局ID：" + (contentView != null ? contentView.getLayoutId() : null));
+		if (contentView == null) {
+			LogUtils.e(TAG, "【自定义布局通知】构建失败：普通布局contentView为空");
+			return;
+		}
+		// 1. 构建跳转Intent
+		PendingIntent pendingIntent = buildPendingIntent(targetIntent);
+		// 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, "【通知管理】所有通知取消完成");
+	}
+}
+
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils2.java
+++ b/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.model.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);
-    }
-}
-
-
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/PermissionUtils.java
+++ b/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());
+            }
+        }
+    }
 }

--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java
+++ b/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.model.BatteryInfoBean;
+import cc.winboll.studio.powerbell.models.BatteryInfoBean;
 import java.util.ArrayList;

 public class StringUtils {
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtils.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtils.java
@@ -10,15 +10,17 @@ 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;

-public class UriUtil {
+public class UriUtils {

    public static final String TAG = "UriUtil";

@@ -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;
--- a/powerbell/src/main/java/cc/winboll/studio/powerbell/views/BackgroundView.java
+++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/views/BackgroundView.java
@@ -14,7 +14,7 @@ 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 cc.winboll.studio.powerbell.models.BackgroundBean;
 import java.io.File;

 /**
@@ -104,6 +104,10 @@ public class BackgroundView extends RelativeLayout {
    }

    public void loadBackgroundBean(BackgroundBean bean) {
+        loadBackgroundBean(bean, false);
+    }
+
+	public void loadBackgroundBean(BackgroundBean bean, boolean isRefresh) {
        if (!bean.isUseBackgroundFile()) {
            setDefaultTransparentBackground();
            return;
@@ -111,13 +115,23 @@ public class BackgroundView extends RelativeLayout {
        String targetPath = bean.isUseBackgroundScaledCompressFile()
 			? bean.getBackgroundScaledCompressFilePath()
 			: bean.getBackgroundFilePath();
-        // 调用带路径判断的loadImage方法
-        loadImage(targetPath);
+
+		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 loadImage(String imagePath) {
@@ -139,8 +153,8 @@ public class BackgroundView extends RelativeLayout {
        // ======================== 新增：路径判断逻辑 ========================
        // 1. 路径未变化：直接使用缓存
        if (imagePath.equals(mCurrentCachedPath)) {
-			//ToastUtils.show("isReload == false");
 			Bitmap cachedBitmap = App._mBitmapCacheUtils.getCachedBitmap(imagePath);
+			// 核心修改：判断缓存Bitmap是否为null
 			if (cachedBitmap != null && !cachedBitmap.isRecycled()) {
 				LogUtils.d(TAG, "loadImage: 路径未变，使用缓存 Bitmap");
 				mImageAspectRatio = (float) cachedBitmap.getWidth() / cachedBitmap.getHeight();
@@ -148,7 +162,13 @@ public class BackgroundView extends RelativeLayout {
 				adjustImageViewSize();
 				mIvBackground.setVisibility(View.VISIBLE);
 				return;
-			}
+			} else {
+                // 缓存Bitmap为空或已回收，提示并加载透明背景
+                LogUtils.e(TAG, "loadImage: 全局位图缓存为空或已回收 - " + imagePath);
+                ToastUtils.show("全局位图缓存为空，无法加载图片");
+                setDefaultTransparentBackground();
+                return;
+            }
        }

        // 2. 路径已更新：移除旧缓存，加载新图片并更新缓存
@@ -166,6 +186,8 @@ public class BackgroundView extends RelativeLayout {

        Bitmap bitmap = decodeBitmapWithCompress(imageFile, 1080, 1920);
        if (bitmap == null) {
+            LogUtils.e(TAG, "loadImage: 图片解码失败");
+            ToastUtils.show("图片解码失败，无法加载");
            setDefaultTransparentBackground();
            return;
        }
@@ -258,6 +280,7 @@ public class BackgroundView extends RelativeLayout {
        mImageAspectRatio = 1.0f;
        // 清空缓存路径记录
        mCurrentCachedPath = "";
+        mIvBackground.setVisibility(View.GONE);
    }

    // ====================================== 重写方法 ======================================
--- a/powerbell/src/main/res/layout/dialog_backgroundpicturepreview.xml
+++ b/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>

--- a/powerbell/src/main/res/menu/toolbar_unittest.xml
+++ b/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"/>
Author	SHA1	Message	Date
ZhanGSKen	e51d46186a	数据模型有调整，设定次级版本号。同次级版本应用可以自由切换。	2025-12-13 21:11:03 +08:00
ZhanGSKen	8fc6855066	通知类调试完成	2025-12-13 21:04:35 +08:00
ZhanGSKen	4ceaf1e46a	通知类重构	2025-12-13 20:47:00 +08:00
ZhanGSKen	e669bbb04b	命名空间重构	2025-12-13 20:23:48 +08:00
ZhanGSKen	6bf3ebe2fd	20251212_002702_716	2025-12-12 00:27:07 +08:00
ZhanGSKen	a44f7fe6d4	<powerbell>APK 15.12.15 release Publish.	2025-12-11 20:54:28 +08:00
ZhanGSKen	35a34b5b53	<powerbell>Start New Stage Version.	2025-12-11 20:51:08 +08:00
ZhanGSKen	d35d0d0291	图片选择到剪裁选定流程调试完成。	2025-12-11 20:49:58 +08:00
ZhanGSKen	03212c0554	一次不必要的数据清空操作	2025-12-11 19:58:39 +08:00
ZhanGSKen	0c963213df	调试信息准备	2025-12-11 19:40:30 +08:00
ZhanGSKen	10ddca4f73	调试信息准备	2025-12-11 19:34:47 +08:00
ZhanGSKen	f240d9c057	视图控件与全局位图缓存类优先调整。	2025-12-11 19:18:02 +08:00
ZhanGSKen	2c77bf775b	背景图片控件测试通过，现在的问题就剩下，应用全局位图缓存问题与图片路径传递问题。	2025-12-11 18:48:42 +08:00
ZhanGSKen	1db7c9bf80	20251211_130730_716	2025-12-11 13:07:35 +08:00
ZhanGSKen	fd556fd06f	20251211_130438_907	2025-12-11 13:04:44 +08:00
ZhanGSKen	220aa9dbfb	应用权限框架更新，重新调试剪裁文件流程。	2025-12-11 09:02:41 +08:00
ZhanGSKen	ecafd2026f	相册权限申请模块改进中。。。	2025-12-11 06:53:22 +08:00