<apputils>APK 15.10.2 release Publish.

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Sep 27 21:03:20 HKT 2025
-stageCount=10
+#Mon Sep 22 06:01:08 HKT 2025
+stageCount=8
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.9
+publishVersion=15.10.7
 buildCount=0
-baseBetaVersion=15.10.10
+baseBetaVersion=15.10.8

apputils/README.md

@@ -0,0 +1,35 @@
+# APPUtils
+
+#### 介绍
+应用开发工具套件类
+
+#### 软件架构
+适配安卓应用 [AIDE Pro] 的 Gradle 编译结构。
+也适配安卓应用 [AndroidIDE] 的 Gradle 编译结构。
+
+
+#### Gradle 编译说明
+调试版编译命令 ：gradle assembleBetaDebug
+阶段版编译命令 ：git pull && bash .winboll/bashPublishAPKAddTag.sh apputils
+阶段版类库发布命令 ：git pull &&bash .winboll/bashPublishLIBAddTag.sh libapputils
+
+#### 使用说明
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码 : ZhanGSKen(ZhanGSKen<zhangsken@188.com>)
+4.  新建 Pull Request
+
+
+#### 特技
+
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
+5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+
+#### 参考文档

apputils/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.8" 
+        versionName "15.10" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 01 07:56:33 HKT 2025
-stageCount=7
+#Mon Sep 29 01:15:55 HKT 2025
+stageCount=3
 libraryProject=libapputils
-baseVersion=15.8
-publishVersion=15.8.6
+baseVersion=15.10
+publishVersion=15.10.2
 buildCount=0
-baseBetaVersion=15.8.7
+baseBetaVersion=15.10.3

apputils/src/main/AndroidManifest.xml

@@ -2,14 +2,20 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.apputils">
-
+	
+	<!-- 读取外部存储权限（Android 10 以下） -->
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+		
     <application
         android:name=".App"
         android:allowBackup="true"
         android:icon="@drawable/ic_winboll"
         android:label="@string/app_name"
         android:theme="@style/MyUtilsTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:resizeableActivity="true"
+		android:screenOrientation="unspecified"
+		android:requestLegacyExternalStorage="true">
 
         <activity
             android:name=".MainActivity"
@@ -35,6 +41,8 @@
 
         <activity android:name=".QRCodeDecodeActivity"/>
 
+        <activity android:name=".QRGeneratorActivity"/>
+
     </application>
 
-</manifest>
+</manifest>

apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java

@@ -15,12 +15,11 @@ import android.view.MenuItem;
 import android.widget.Toolbar;
 import cc.winboll.studio.apputils.R;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import cc.winboll.studio.libapputils.views.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActivity {
+public class AssetsHtmlActivity extends Activity {
 
     public static final String TAG = "AssetsHtmlActivity";
 
@@ -32,16 +31,6 @@ public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActiv
 
     // Assets 文件夹里的 Html 文件的名称
     String mszHtmlFileName;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
     
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {

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

@@ -15,9 +15,10 @@ import android.widget.Toolbar;
 import cc.winboll.studio.apputils.R;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.libappbase.ToastUtils;
 import java.util.List;
 import java.util.Set;
+import cc.winboll.studio.libappbase.LogActivity;
 
 final public class MainActivity extends Activity {
 
@@ -26,21 +27,21 @@ final public class MainActivity extends Activity {
     public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0;
 
     Toolbar mToolbar;
-    LogView mLogView;
+    //LogView mLogView;
 //
 //    @Override
 //    public Activity getActivity() {
 //        return this;
 //    }
 
-    
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
+//        mLogView = findViewById(R.id.logview);
+//        mLogView.start();
 
         // 初始化工具栏
         mToolbar = findViewById(R.id.toolbar);
@@ -145,13 +146,21 @@ final public class MainActivity extends Activity {
     }
 
     public void onTestLogActivity(View view) {
-//        Intent intent = new Intent(this, LogActivity.class);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//        startActivity(intent);
+		/* 分屏代码有效
+		// 1. 创建启动 SecondActivity 的 Intent
+		Intent splitIntent = new Intent(MainActivity.this, LogActivity.class);
 
-        //WinBoLLActivityManager.getInstance().printAvtivityListInfo();
-        //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, LogActivity.class);
+		// 2. 添加分屏启动必需的两个标志（API 30 兼容）
+		// FLAG_ACTIVITY_LAUNCH_ADJACENT：相邻分屏显示
+		// FLAG_ACTIVITY_NEW_TASK：分屏需要新任务栈
+		splitIntent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT 
+							 | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+		// 3. 启动分屏活动（若设备不支持分屏，会默认全屏启动）
+		startActivity(splitIntent);
+		*/
+
+		LogActivity.startLogActivity(this);
     }
 
     //
@@ -217,10 +226,9 @@ final public class MainActivity extends Activity {
         if (item.getItemId() == R.id.item_exit) {
             //exit();
             return true;
-//        } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
-//            Intent intent = new Intent(this, TestStringToQRCodeViewActivity.class);
-//            startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
-//            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, TestStringToQrCodeViewActivity.class);
+        } else if (item.getItemId() == R.id.item_testqrgeneratoractivity) {
+            Intent intent = new Intent(this, QRGeneratorActivity.class);
+            startActivity(intent);
         } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
             Intent intent = new Intent(this, QRCodeDecodeActivity.class);
             startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
@@ -268,7 +276,7 @@ final public class MainActivity extends Activity {
 //        }
     }
 
-    
+
     public void onTestAssetsHtmlActivity(View view) {
         Intent intent = new Intent(this, AssetsHtmlActivity.class);
         intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
@@ -281,7 +289,7 @@ final public class MainActivity extends Activity {
     @Override
     protected void onResume() {
         super.onResume();
-        mLogView.start();
+        //mLogView.start();
     }
 
     /*@Override

apputils/src/main/java/cc/winboll/studio/apputils/QRCodeDecodeActivity.java

@@ -1,89 +1,323 @@
 package cc.winboll.studio.apputils;
 
 /**
- * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
  * @Date 2025/01/18 10:32:21
- * @Describe 二维码扫码解码窗口
+ * @Describe 二维码解码窗口
  */
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
+import android.net.Uri;
 import android.os.Bundle;
+import android.provider.MediaStore;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toolbar;
 import cc.winboll.studio.apputils.R;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.RGBLuminanceSource;
+import com.google.zxing.Result;
 import com.google.zxing.ResultPoint;
+import com.google.zxing.common.HybridBinarizer;
 import com.journeyapps.barcodescanner.BarcodeCallback;
 import com.journeyapps.barcodescanner.BarcodeResult;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
+import com.journeyapps.barcodescanner.DefaultDecoderFactory;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Hashtable;
 import java.util.List;
 
 public class QRCodeDecodeActivity extends Activity {
 
     public static final String TAG = "QRCodeDecodeActivity";
-
     public static final String EXTRA_RESULT = "EXTRA_RESULT";
     private static final int REQUEST_CAMERA_PERMISSION = 1;
+    private static final int REQUEST_PICK_IMAGE = 2;
+    private static final int REQUEST_READ_STORAGE_PERMISSION = 3;
+    // 图片压缩阈值：超过1000px时压缩，避免内存溢出和解码效率低
+    private static final int MAX_BITMAP_SIZE = 1000;
 
-    TextView resultTextView;
-    DecoratedBarcodeView barcodeView;
-
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
+    private TextView resultTextView;
+    private DecoratedBarcodeView barcodeView;
+    private Button btnDecodeFromAlbum;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_qrcodedecode);
-
-        // 初始化工具栏
-//        Toolbar mToolbar = findViewById(R.id.toolbar);
-//        setActionBar(mToolbar);
-
-        //resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
-        barcodeView = findViewById(R.id.activityqrcodedecodeDecoratedBarcodeView1);
-        // 请求相机权限
-//        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
-//            != PackageManager.PERMISSION_GRANTED) {
-//            ActivityCompat.requestPermissions(this,
-//                                              new String[]{android.Manifest.permission.CAMERA},
-//                                              REQUEST_CAMERA_PERMISSION);
-//        } else {
-//            startScanning();
-//        }
-        startScanning();
+        initToolbar();
+        initViews();
+        checkCameraPermission();
+        setAlbumDecodeClickListener();
     }
 
-    private void startScanning() {
-        barcodeView.getBarcodeView().setDecoderFactory(null);
-        barcodeView.decodeContinuous(barcodeCallback);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode,
-                                           String[] permissions, int[] grantResults) {
-        if (requestCode == REQUEST_CAMERA_PERMISSION) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                startScanning();
-            } else {
-                // 权限被拒绝的处理
+    private void initToolbar() {
+        Toolbar mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        if (mToolbar != null) {
+            setActionBar(mToolbar);
+            if (getActionBar() != null) {
+                getActionBar().setDisplayHomeAsUpEnabled(true);
+                mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							finish();
+						}
+					});
             }
         }
     }
 
-    BarcodeCallback barcodeCallback = new BarcodeCallback(){
+    private void initViews() {
+        resultTextView = (TextView) findViewById(R.id.activityqrcodedecodeTextView1);
+        barcodeView = (DecoratedBarcodeView) findViewById(R.id.activityqrcodedecodeDecoratedBarcodeView1);
+        btnDecodeFromAlbum = (Button) findViewById(R.id.btn_decode_from_album);
+        // 初始化扫码解码器（支持所有常见码制，避免仅支持QR_CODE的局限）
+        List<BarcodeFormat> formats = new ArrayList<BarcodeFormat>();
+        formats.add(BarcodeFormat.QR_CODE);
+        formats.add(BarcodeFormat.CODE_128);
+        formats.add(BarcodeFormat.EAN_13);
+        barcodeView.getBarcodeView().setDecoderFactory(new DefaultDecoderFactory(formats));
+    }
+
+    private void setAlbumDecodeClickListener() {
+        btnDecodeFromAlbum.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if (checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE)
+                        != PackageManager.PERMISSION_GRANTED) {
+						requestPermissions(new String[]{android.Manifest.permission.READ_EXTERNAL_STORAGE},
+										   REQUEST_READ_STORAGE_PERMISSION);
+					} else {
+						openAlbum();
+					}
+				}
+			});
+    }
+
+    private void openAlbum() {
+        Intent pickImageIntent = new Intent(Intent.ACTION_PICK);
+        pickImageIntent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
+        startActivityForResult(pickImageIntent, REQUEST_PICK_IMAGE);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_PICK_IMAGE && resultCode == RESULT_OK && data != null) {
+            Uri selectedImageUri = data.getData();
+            if (selectedImageUri != null) {
+                try {
+                    // 1. 读取图片并压缩（关键优化：避免大图片解码失败）
+                    InputStream imageStream = getContentResolver().openInputStream(selectedImageUri);
+                    BitmapFactory.Options options = new BitmapFactory.Options();
+                    options.inJustDecodeBounds = true; // 先获取图片尺寸，不加载像素
+                    BitmapFactory.decodeStream(imageStream, null, options);
+                    imageStream.close(); // 关闭流，重新读取
+
+                    // 计算压缩比例：超过MAX_BITMAP_SIZE时按比例压缩
+                    options.inSampleSize = calculateInSampleSize(options, MAX_BITMAP_SIZE, MAX_BITMAP_SIZE);
+                    options.inJustDecodeBounds = false; // 开始加载压缩后的像素
+                    imageStream = getContentResolver().openInputStream(selectedImageUri);
+                    Bitmap originalBitmap = BitmapFactory.decodeStream(imageStream, null, options);
+                    imageStream.close();
+
+                    if (originalBitmap == null) {
+                        showToast("图片损坏，无法解析");
+                        return;
+                    }
+
+                    // 2. 图片预处理：转为灰度图+提高对比度（解决模糊/低对比度图片识别问题）
+                    Bitmap processedBitmap = processBitmap(originalBitmap);
+
+                    // 3. 解码预处理后的图片
+                    String decodeResult = decodeQrFromBitmap(processedBitmap);
+
+                    // 4. 结果处理
+                    if (decodeResult != null && !decodeResult.isEmpty()) {
+                        resultTextView.setText("图片解码结果：" + decodeResult);
+                        showDecodeResultDialog(decodeResult);
+                        returnResultToPreviousPage(decodeResult);
+                    } else {
+                        // 尝试直接解码原图（防止预处理过度导致识别失败）
+                        String originalResult = decodeQrFromBitmap(originalBitmap);
+                        if (originalResult != null && !originalResult.isEmpty()) {
+                            resultTextView.setText("图片解码结果：" + originalResult);
+                            showDecodeResultDialog(originalResult);
+                            returnResultToPreviousPage(originalResult);
+                        } else {
+                            new AlertDialog.Builder(this)
+								.setTitle("解码失败")
+								.setMessage("图片中未识别到二维码/条码，建议选择清晰、完整的图片")
+								.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+									@Override
+									public void onClick(DialogInterface dialog, int which) {
+										dialog.dismiss();
+									}
+								})
+								.show();
+                        }
+                    }
+
+                    // 回收Bitmap，避免内存泄漏
+                    if (!originalBitmap.isRecycled()) originalBitmap.recycle();
+                    if (!processedBitmap.isRecycled() && processedBitmap != originalBitmap) {
+                        processedBitmap.recycle();
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    showToast("图片处理失败：" + e.getMessage());
+                }
+            } else {
+                showToast("未选择图片");
+            }
+        }
+    }
+
+    /**
+     * 核心优化1：计算图片压缩比例
+     */
+    private int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+            // 找到最接近reqWidth/reqHeight的压缩比例（2的倍数，保证图片质量）
+            while ((halfHeight / inSampleSize) >= reqHeight
+				   && (halfWidth / inSampleSize) >= reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+        return inSampleSize;
+    }
+
+    /**
+     * 核心优化2：图片预处理（灰度化+提高对比度）
+     * 解决模糊、低亮度、低对比度图片识别率低的问题
+     */
+    private Bitmap processBitmap(Bitmap bitmap) {
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+
+        // 创建灰度图
+        Bitmap grayBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(grayBitmap);
+        Paint paint = new Paint();
+
+        // 1. 灰度化矩阵
+        ColorMatrix grayMatrix = new ColorMatrix();
+        grayMatrix.setSaturation(0); // 饱和度设为0，转为灰度
+
+        // 2. 提高对比度矩阵（alpha=1.5，亮度=0，可根据需求调整）
+        ColorMatrix contrastMatrix = new ColorMatrix();
+        contrastMatrix.set(new float[]{
+							   1.5f, 0, 0, 0, 0,  // 红通道对比度
+							   0, 1.5f, 0, 0, 0,  // 绿通道对比度
+							   0, 0, 1.5f, 0, 0,  // 蓝通道对比度
+							   0, 0, 0, 1f, 0     // alpha通道不变
+						   });
+
+        // 合并灰度+对比度矩阵
+        ColorMatrix combinedMatrix = new ColorMatrix();
+        combinedMatrix.postConcat(grayMatrix);
+        combinedMatrix.postConcat(contrastMatrix);
+
+        paint.setColorFilter(new ColorMatrixColorFilter(combinedMatrix));
+        canvas.drawBitmap(bitmap, 0, 0, paint);
+
+        return grayBitmap;
+    }
+
+    /**
+     * 核心优化3：修复解码参数，支持更多场景
+     */
+    private String decodeQrFromBitmap(Bitmap bitmap) {
+        if (bitmap == null) return null;
+
+        try {
+            int width = bitmap.getWidth();
+            int height = bitmap.getHeight();
+            int[] pixels = new int[width * height];
+            bitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+
+            // 修复1：使用RGBLuminanceSource，避免YUV格式导致的颜色偏差
+            LuminanceSource source = new RGBLuminanceSource(width, height, pixels);
+            BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+            // 修复2：完善解码参数，解决模糊、变形二维码识别问题
+            Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>();
+            // 支持所有常见码制（不仅限于QR_CODE）
+            List<BarcodeFormat> formats = new ArrayList<BarcodeFormat>();
+            formats.add(BarcodeFormat.QR_CODE);
+            formats.add(BarcodeFormat.CODE_128);
+            formats.add(BarcodeFormat.EAN_8);
+            formats.add(BarcodeFormat.EAN_13);
+            hints.put(DecodeHintType.POSSIBLE_FORMATS, formats);
+            // 字符编码：支持中文等多语言
+            hints.put(DecodeHintType.CHARACTER_SET, "UTF-8");
+            // 容错模式：允许二维码有一定损坏（关键！解决轻微变形/污染的二维码）
+            hints.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
+            // 不使用纯条码模式，兼容带logo的二维码
+            hints.put(DecodeHintType.PURE_BARCODE, Boolean.FALSE);
+
+            MultiFormatReader reader = new MultiFormatReader();
+            reader.setHints(hints);
+            Result result = reader.decode(binaryBitmap);
+            return result.getText();
+
+        } catch (NotFoundException e) {
+            // 正常未识别到，不打印异常（避免日志冗余）
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    // ==================== 原有逻辑（不变） ====================
+    private void checkCameraPermission() {
+        if (checkSelfPermission(android.Manifest.permission.CAMERA)
+			!= PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(new String[]{android.Manifest.permission.CAMERA},
+							   REQUEST_CAMERA_PERMISSION);
+        } else {
+            startScanning();
+        }
+    }
+
+    private void startScanning() {
+        barcodeView.decodeContinuous(barcodeCallback);
+    }
+
+    private BarcodeCallback barcodeCallback = new BarcodeCallback() {
         @Override
         public void barcodeResult(BarcodeResult result) {
-            if (result.getText() != null) {
-                //Toast.makeText(MainActivity.this, "Scanned: " + result.getText(), Toast.LENGTH_SHORT).show();
-                //ToastUtils.show("Scanned: " + result.getText());
+            if (result != null && result.getText() != null) {
                 barcodeView.pause();
-                Intent intent = new Intent();
-                intent.putExtra(EXTRA_RESULT, result.getText());
-                setResult(RESULT_OK, intent);
-                finish();
+                String decodeResult = result.getText();
+                resultTextView.setText("扫码结果：" + decodeResult);
+                showDecodeResultDialog(decodeResult);
+                returnResultToPreviousPage(decodeResult);
             }
         }
 
@@ -92,16 +326,111 @@ public class QRCodeDecodeActivity extends Activity {
         }
     };
 
+    private void showDecodeResultDialog(String result) {
+        ScrollView scrollView = new ScrollView(this);
+        scrollView.setPadding(dip2px(16), dip2px(16), dip2px(16), dip2px(16));
+
+        TextView dialogTv = new TextView(this);
+        dialogTv.setTextSize(16);
+        dialogTv.setTextColor(getResources().getColor(android.R.color.black));
+        dialogTv.setText(result);
+        scrollView.addView(dialogTv);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("解码结果");
+        builder.setView(scrollView);
+        builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.dismiss();
+					barcodeView.resume();
+				}
+			});
+        builder.setCancelable(false);
+        builder.show();
+    }
+
+    private void returnResultToPreviousPage(String result) {
+        Intent intent = new Intent();
+        intent.putExtra(EXTRA_RESULT, result);
+        setResult(RESULT_OK, intent);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == REQUEST_CAMERA_PERMISSION) {
+            if (grantResults != null && grantResults.length > 0) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    startScanning();
+                } else {
+                    new AlertDialog.Builder(this)
+						.setTitle("权限申请")
+						.setMessage("扫码需要相机权限，请在设置中开启")
+						.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+								dialog.dismiss();
+								finish();
+							}
+						})
+						.setCancelable(false)
+						.show();
+                }
+            }
+        } else if (requestCode == REQUEST_READ_STORAGE_PERMISSION) {
+            if (grantResults != null && grantResults.length > 0) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    openAlbum();
+                } else {
+                    new AlertDialog.Builder(this)
+						.setTitle("权限申请")
+						.setMessage("从相册解码需要存储权限，请在设置中开启")
+						.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+								dialog.dismiss();
+							}
+						})
+						.setCancelable(false)
+						.show();
+                }
+            }
+        }
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
-        barcodeView.resume();
+        if (barcodeView != null) {
+            barcodeView.resume();
+        }
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        barcodeView.pause();
+        if (barcodeView != null) {
+            barcodeView.pause();
+        }
+    }
+
+    private int dip2px(float dpValue) {
+        final float scale = getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(android.view.MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void showToast(String message) {
+        android.widget.Toast.makeText(this, message, android.widget.Toast.LENGTH_SHORT).show();
     }
 }
 

apputils/src/main/java/cc/winboll/studio/apputils/QRGeneratorActivity.java

@@ -0,0 +1,97 @@
+package cc.winboll.studio.apputils;
+
+/**
+ * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
+ * @Date 2025/09/22 07:09
+ * @Describe 二维码生成窗口
+ */
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Toast;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+import com.journeyapps.barcodescanner.BarcodeEncoder;
+
+public class QRGeneratorActivity extends Activity {
+	public static final String TAG = "QrGeneratorActivity";
+
+	// 控件引用
+	private EditText etInputText;
+	private ImageView ivQrPreview;
+	private Button btnGenerateQr;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_qrgenerator);
+
+		// 初始化控件
+		initViews();
+		// 设置按钮点击事件
+		setGenerateClickListener();
+	}
+
+	/**
+	 * 初始化布局控件
+	 */
+	private void initViews() {
+		etInputText = findViewById(R.id.et_input_text);
+		ivQrPreview = findViewById(R.id.iv_qr_preview);
+		btnGenerateQr = findViewById(R.id.btn_generate_qr);
+	}
+
+	/**
+	 * 设置生成按钮点击事件：获取输入文字 → 生成二维码 → 显示到 ImageView
+	 */
+	private void setGenerateClickListener() {
+		btnGenerateQr.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					// 1. 获取输入框文字（去除前后空格）
+					String inputText = etInputText.getText().toString().trim();
+
+					// 2. 空输入判断
+					if (inputText.isEmpty()) {
+						Toast.makeText(QRGeneratorActivity.this, "请先输入要生成二维码的文字", Toast.LENGTH_SHORT).show();
+						return;
+					}
+
+					// 3. 生成二维码 Bitmap（宽高 500px，可调整）
+					Bitmap qrBitmap = generateQrCodeBitmap(inputText, 500, 500);
+
+					// 4. 显示二维码到 ImageView
+					if (qrBitmap != null) {
+						ivQrPreview.setImageBitmap(qrBitmap);
+					} else {
+						Toast.makeText(QRGeneratorActivity.this, "二维码生成失败，请重试", Toast.LENGTH_SHORT).show();
+					}
+				}
+			});
+	}
+
+	/**
+	 * 核心方法：生成二维码 Bitmap
+	 * @param content 二维码内容（输入的文字）
+	 * @param width 二维码宽度（px）
+	 * @param height 二维码高度（px）
+	 * @return 生成的二维码 Bitmap，失败返回 null
+	 */
+	private Bitmap generateQrCodeBitmap(String content, int width, int height) {
+		try {
+			// 初始化二维码编码器（指定格式为 QR_CODE）
+			BarcodeEncoder encoder = new BarcodeEncoder();
+			// 生成二维码 Bitmap（参数：内容、格式、宽、高）
+			return encoder.encodeBitmap(content, BarcodeFormat.QR_CODE, width, height);
+		} catch (WriterException e) {
+			// 生成失败（如内容过长、宽高非法），打印异常信息
+			e.printStackTrace();
+			return null;
+		}
+	}
+}
+

apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivity.java

@@ -6,19 +6,9 @@ package cc.winboll.studio.apputils;
  * @Describe WinBoLLActivity
  */
 import android.app.Activity;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
+public class WinBoLLActivity extends Activity {
 
     public static final String TAG = "WinBoLLActivity";
 
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
 }

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

@@ -54,13 +54,6 @@
 
 		</LinearLayout>
 
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:text="Button"
-			android:id="@+id/logview"
-			android:layout_weight="1.0"/>
-
 	</LinearLayout>
 
 </LinearLayout>

apputils/src/main/res/layout/activity_qrcodedecode.xml

@@ -1,20 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout 
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="QRCodeDecodeActivity"/>
+    <!-- 工具栏（原有） -->
+    <Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 
+    <!-- 扫码控件（原有） -->
     <com.journeyapps.barcodescanner.DecoratedBarcodeView
-        android:layout_width="wrap_content"
+        android:id="@+id/activityqrcodedecodeDecoratedBarcodeView1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <!-- 新增：从相册解码按钮 -->
+    <Button
+        android:id="@+id/btn_decode_from_album"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/activityqrcodedecodeDecoratedBarcodeView1"/>
+        android:text="从相册选图解码"
+        android:textSize="16sp"
+        android:textColor="@android:color/white"
+        android:background="#2196F3"
+        android:paddingVertical="12dp"
+        android:layout_margin="16dp"/>
+
+    <!-- 结果显示TextView（原有） -->
+    <TextView
+        android:id="@+id/activityqrcodedecodeTextView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:text="等待扫码或选择图片..."
+        android:textSize="16sp"/>
 
 </LinearLayout>
 

apputils/src/main/res/layout/activity_qrgenerator.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="20dp"
+    android:gravity="top|center_horizontal">
+
+    <!-- 文字输入框 -->
+    <EditText
+        android:id="@+id/et_input_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="请输入要生成二维码的文字"
+        android:inputType="textMultiLine"
+        android:minLines="3"
+        android:maxLines="5"
+        android:padding="12dp"
+        android:background="@android:drawable/editbox_background_normal"
+        android:layout_marginBottom="16dp"/>
+
+    <!-- 生成二维码按钮 -->
+    <Button
+        android:id="@+id/btn_generate_qr"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="生成二维码"
+        android:textSize="16sp"
+        android:background="#4CAF50"
+        android:textColor="@android:color/white"
+        android:paddingVertical="12dp"
+        android:layout_marginBottom="24dp"/>
+
+    <!-- 二维码预览图片 -->
+    <ImageView
+        android:id="@+id/iv_qr_preview"
+        android:layout_width="280dp"
+        android:layout_height="280dp"
+        android:scaleType="fitCenter"
+        android:background="@android:drawable/dialog_holo_light_frame"
+        android:contentDescription="二维码预览"/>
+
+</LinearLayout>
+

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

@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/item_teststringtoqrcodeview"
-        android:title="TestStringToQRCodeViewActivity"/>
+        android:id="@+id/item_testqrgeneratoractivity"
+        android:title="TestQRGeneratorActivity"/>
     <item
         android:id="@+id/item_testqrcodedecodeactivity"
         android:title="TestQRCodeDecodeActivity"/>

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sat Sep 27 21:03:08 HKT 2025
-stageCount=10
+#Mon Sep 22 02:57:06 HKT 2025
+stageCount=8
 libraryProject=libappbase
 baseVersion=15.10
-publishVersion=15.10.9
+publishVersion=15.10.7
 buildCount=0
-baseBetaVersion=15.10.10
+baseBetaVersion=15.10.8

libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java

@@ -22,12 +22,12 @@ public class GlobalApplication extends Application {
         GlobalApplication.isDebuging = isDebuging;
     }
     
-    public static void saveDebugStatus(Context context) {
-        APPModel.saveBeanToFile(getAPPModelFilePath(context), new APPModel(GlobalApplication.isDebuging));
+    public static void saveDebugStatus(GlobalApplication application) {
+        APPModel.saveBeanToFile(application.getAPPModelFilePath(application), new APPModel(GlobalApplication.isDebuging));
     }
 	
-    static String getAPPModelFilePath(Context context) {
-        return context.getDataDir().getPath() + "/APPModel.json";
+    static String getAPPModelFilePath(GlobalApplication application) {
+        return application.getDataDir().getPath() + "/APPModel.json";
     }
 
     public static boolean isDebuging() {

libapputils/build.gradle

@@ -21,7 +21,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'cc.winboll.studio:libappbase:15.9.5'
+    api 'cc.winboll.studio:libappbase:15.10.9'
     
     // 二维码类库
     api 'com.google.zxing:core:3.4.1'
@@ -32,6 +32,8 @@ dependencies {
     
     // Html 解析
     api 'org.jsoup:jsoup:1.13.1'
+	
+	api 'com.google.code.gson:gson:2.10.1'
     
     // SSH
     //api 'com.jcraft:jsch:0.1.55'

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Sep 01 07:56:11 HKT 2025
-stageCount=7
+#Mon Sep 29 01:15:55 HKT 2025
+stageCount=3
 libraryProject=libapputils
-baseVersion=15.8
-publishVersion=15.8.6
+baseVersion=15.10
+publishVersion=15.10.2
 buildCount=0
-baseBetaVersion=15.8.7
+baseBetaVersion=15.10.3

libapputils/src/main/java/cc/winboll/studio/libapputils/utils/AppUtils.java

@@ -0,0 +1,29 @@
+package cc.winboll.studio.libapputils.utils;
+
+/**
+ * @Author ZhanGSKen<zhangsken@qq.com>
+ * @Date 2025/02/15 20:05:03
+ * @Describe AppUtils
+ */
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class AppUtils {
+    
+    public static final String TAG = "AppUtils";
+    
+    public static String getAppNameByPackageName(Context context, String packageName) {
+        PackageManager packageManager = context.getPackageManager();
+        try {
+            ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);
+            return (String) packageManager.getApplicationLabel(applicationInfo);
+        } catch (NameNotFoundException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            return "";
+        }
+    }
+}
+

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

@@ -9,10 +9,16 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.AssetManager;
 import android.net.Uri;
+import android.support.v4.content.FileProvider;
 import cc.winboll.studio.libappbase.LogUtils;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -22,7 +28,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import android.support.v4.content.FileProvider;
 
 public class FileUtils {
 
@@ -97,36 +102,6 @@ public class FileUtils {
         }
     }
 
-    //
-    // 把字符串写入文件，指定 UTF-8 编码
-    //
-    public static void writeStringToFile(String szFilePath, String szContent) throws IOException {
-        File file = new File(szFilePath);
-        if (!file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
-        }
-        FileOutputStream outputStream = new FileOutputStream(file);
-        OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);
-        writer.write(szContent);
-        writer.close();
-    }
-
-    //
-    // 读取文件到字符串，指定 UTF-8 编码
-    //
-    public static String readStringFromFile(String szFilePath) throws IOException {
-        File file = new File(szFilePath);
-        FileInputStream inputStream = new FileInputStream(file);
-        InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-        StringBuilder content = new StringBuilder();
-        int character;
-        while ((character = reader.read()) != -1) {
-            content.append((char) character);
-        }
-        reader.close();
-        return content.toString();
-    }
-
     public static boolean copyFile(File srcFile, File dstFile) {
         if (!srcFile.exists()) {
             LogUtils.d(TAG, "The original file does not exist.");
@@ -154,4 +129,113 @@ public class FileUtils {
         }
         return false;
     }
+	
+
+    /**
+     * 读取文件为字节数组（Java 7 语法）
+     */
+    public static byte[] readByteArrayFromFile(String filePath) {
+        FileInputStream fis = null;
+        ByteArrayOutputStream bos = null;
+        try {
+            fis = new FileInputStream(filePath);
+            bos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = fis.read(buffer)) != -1) {
+                bos.write(buffer, 0, bytesRead);
+            }
+            return bos.toByteArray();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            // 手动关闭流（Java 7 不支持 try-with-resources）
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (bos != null) {
+                try {
+                    bos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 写入字节数组到文件（Java 7 语法）
+     */
+    public static boolean writeByteArrayToFile(byte[] data, String filePath) {
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(filePath);
+            fos.write(data);
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static String readStringFromFile(String filePath) {
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new FileReader(filePath));
+            StringBuilder content = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                content.append(line).append(System.getProperty("line.separator"));
+            }
+            // 去除最后一个换行符（可选）
+            if (content.length() > 0) {
+                content.deleteCharAt(content.length() - 1);
+            }
+            return content.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+	
+    public static boolean writeStringToFile(String content, String filePath, boolean append) {
+        BufferedWriter writer = null;
+        try {
+            writer = new BufferedWriter(new FileWriter(filePath, append));
+            writer.write(content);
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 }

powerbell/build.gradle

@@ -41,17 +41,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-	
-	// 允许使用系统隐藏API
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-    // 针对PowerProfile的依赖配置
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
 }
 
 dependencies {

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Oct 22 18:58:26 HKT 2025
-stageCount=17
+#Wed Sep 03 20:59:53 HKT 2025
+stageCount=13
 libraryProject=
 baseVersion=15.4
-publishVersion=15.4.16
+publishVersion=15.4.12
 buildCount=0
-baseBetaVersion=15.4.17
+baseBetaVersion=15.4.13

powerbell/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
     package="cc.winboll.studio.powerbell">
 
     <!-- 拍摄照片和视频 -->
@@ -25,29 +24,10 @@
     <!-- 显示通知 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-    <!-- PACKAGE_USAGE_STATS -->
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
-
-    <!-- BATTERY_STATS -->
-    <uses-permission android:name="android.permission.BATTERY_STATS"/>
-
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-
     <uses-feature android:name="android.hardware.camera"/>
 
     <uses-feature android:name="android.hardware.camera.autofocus"/>
-		
-	<!-- 1. 基础应用信息读取权限（Android 11 及以下） -->
-	<uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
 
-	<!-- 2. Android 11+ 应用列表读取权限（必须声明，否则无法获取全部应用） -->
-	<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-		tools:ignore="QueryAllPackagesPermission" />
-
-	<!-- 3. 可选：若需读取系统应用，添加此权限（部分机型需要） -->
-	<uses-permission android:name="android.permission.ACCESS_PACKAGE_USAGE_STATS"
-		tools:ignore="ProtectedPermissions" />
-	
     <application
         android:name=".App"
         android:allowBackup="true"
@@ -143,8 +123,6 @@
 
         <activity android:name="cc.winboll.studio.powerbell.activities.PixelPickerActivity"/>
 
-        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReportActivity"/>
-
     </application>
 
-</manifest>
+</manifest>

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

@@ -17,7 +17,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.activities.AboutActivity;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
-import cc.winboll.studio.powerbell.activities.BatteryReportActivity;
+import cc.winboll.studio.powerbell.activities.BatteryReporterActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
 import cc.winboll.studio.powerbell.activities.WinBoLLActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -159,9 +159,9 @@ public class MainActivity extends WinBoLLActivity {
         if (menuItemId == R.id.action_about) {
             Intent intent = new Intent(this, AboutActivity.class);
             startActivity(intent);
-        } else if (menuItemId == R.id.action_battery_report) {
+        } else if (menuItemId == R.id.action_battery_reporter) {
             Intent intent = new Intent();
-            intent.setClass(this, BatteryReportActivity.class);
+            intent.setClass(this, BatteryReporterActivity.class);
             startActivity(intent);
         } else if (menuItemId == R.id.action_clearrecord) {
             Intent intent = new Intent();

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

@@ -1,505 +0,0 @@
-package cc.winboll.studio.powerbell.activities;
-
-/**
- * @Author ZhanGSKen&豆包大模型<zhangsken@qq.com>
- * @Date 2025/10/22 13:21
- * @Describe BatteryReportActivity
- */
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import cc.winboll.studio.powerbell.R;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class BatteryReportActivity extends Activity {
-    public static final String TAG = "BatteryReportActivity";
-
-    private RecyclerView rvBatteryReport;
-    private BatteryReportAdapter adapter;
-    // 数据列表：仅存储包名、耗电、时长（不存储名称，计算全程用包名）
-    private List<AppBatteryModel> dataList = new ArrayList<AppBatteryModel>(); 
-    private List<AppBatteryModel> filteredList = new ArrayList<AppBatteryModel>(); 
-    private BroadcastReceiver batteryReceiver;
-    private int batteryCapacity = 5400; // 电池容量（mAh）
-    private float lastBatteryPercent = 100.0f;
-    private long lastCheckTime = System.currentTimeMillis();
-    private EditText etSearch;
-    // 应用运行时长缓存（key：包名，value：时长ms）
-    private Map<String, Long> appRunTimeCache = new HashMap<String, Long>();
-    // 新增：包名-应用名称映射缓存（用于搜索匹配名称，避免重复查询）
-    private Map<String, String> packageToAppNameCache = new HashMap<String, String>();
-    // 包管理工具（全局持有，避免重复获取）
-    private PackageManager mPackageManager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_battery_report);
-        // 初始化包管理工具（仅一次，供后续查询名称使用）
-        mPackageManager = getPackageManager();
-
-        // 权限检查（Java7 传统条件判断）
-        if (!hasUsageStatsPermission(this)) {
-            Toast.makeText(this, "请进入设置-应用-权限-特殊访问权限-使用情况访问权限，开启本应用的权限", Toast.LENGTH_LONG).show();
-            startActivity(new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS));
-            return;
-        }
-
-        etSearch = (EditText) findViewById(R.id.et_search); 
-        rvBatteryReport = (RecyclerView) findViewById(R.id.rv_battery_report); 
-        rvBatteryReport.setLayoutManager(new LinearLayoutManager(this));
-
-        // 1. 加载所有应用（仅存包名，不查名称）
-        loadAllAppPackage();
-        // 2. 预缓存所有包名对应的应用名称（为搜索名称做准备）
-        preCacheAllAppNames();
-        // 4. 首次获取运行时长（key：包名）
-        appRunTimeCache = getAppRunTime();
-        // 5. 更新时长到数据模型（用包名匹配）
-        updateAppRunTimeToModel();
-        // 6. 初始化过滤列表和适配器（传入包管理工具+名称缓存）
-        filteredList.addAll(dataList);
-        adapter = new BatteryReportAdapter(this, filteredList, mPackageManager, packageToAppNameCache);
-        rvBatteryReport.setAdapter(adapter);
-
-        // 搜索监听：修改为“包名+应用名称”双匹配
-        etSearch.addTextChangedListener(new TextWatcher() {
-				@Override
-				public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-				@Override
-				public void onTextChanged(CharSequence s, int start, int before, int count) {
-					filterAppsByPackageAndName(s.toString()); // 替换为新的双维度过滤方法
-				}
-
-				@Override
-				public void afterTextChanged(Editable s) {}
-			});
-
-        // 电池广播（耗电计算全程用包名）
-        batteryReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                int level = intent.getIntExtra("level", 100);
-                int scale = intent.getIntExtra("scale", 100);
-                float currentPercent = (float) level / scale * 100;
-                LogUtils.d(TAG, "电池百分比变化：" + lastBatteryPercent + " -> " + currentPercent);
-
-                // 计算电池消耗并更新数据（全程用包名）
-                if (currentPercent < lastBatteryPercent) {
-                    float dropPercent = lastBatteryPercent - currentPercent;
-                    long duration = System.currentTimeMillis() - lastCheckTime;
-                    LogUtils.d(TAG, "电池消耗：" + dropPercent + "%，时长：" + duration + "ms");
-                    // 重新获取最新运行时长（key：包名）
-                    appRunTimeCache = getAppRunTime();
-                    // 更新模型中的运行时长（包名匹配）
-                    updateAppRunTimeToModel();
-                    // 分配耗电（包名计算）
-                    distributeBatteryConsumption(dropPercent, appRunTimeCache);
-                }
-
-                lastBatteryPercent = currentPercent;
-                lastCheckTime = System.currentTimeMillis();
-            }
-        };
-        registerReceiver(batteryReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        // Java7 显式非空判断
-        if (batteryReceiver != null) {
-            unregisterReceiver(batteryReceiver);
-        }
-    }
-
-    /**
-     * 加载所有应用（仅获取包名，不查询应用名称，数据计算核心步骤）
-     */
-    private void loadAllAppPackage() {
-        List<ApplicationInfo> appList = mPackageManager.getInstalledApplications(PackageManager.GET_META_DATA);
-        dataList.clear(); // 清空列表避免重复
-
-        LogUtils.d(TAG, "开始加载应用包名列表，共找到" + appList.size() + "个应用");
-
-        // 仅遍历包名，不处理名称（避免名称获取异常影响）
-        for (ApplicationInfo appInfo : appList) {
-            String packageName = appInfo.packageName;
-            // 模型仅存包名、初始耗电0、初始时长0（名称显示/搜索时用缓存）
-            dataList.add(new AppBatteryModel(packageName, "0.0", 0));
-        }
-
-        LogUtils.d(TAG, "应用包名列表加载完成，共添加" + dataList.size() + "个包名。");
-    }
-
-    /**
-     * 新增：预缓存所有包名对应的应用名称（为搜索提供支持，避免重复查询）
-     */
-    private void preCacheAllAppNames() {
-        packageToAppNameCache.clear(); // 清空旧缓存
-        LogUtils.d(TAG, "开始预缓存包名-应用名称映射");
-
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            String appName = getAppNameByPackage(packageName); // 复用工具方法获取名称
-            packageToAppNameCache.put(packageName, appName); // 缓存映射关系
-        }
-
-        LogUtils.d(TAG, "预缓存完成，共缓存" + packageToAppNameCache.size() + "个应用名称");
-    }
-
-    /**
-     * 工具方法：通过包名获取应用名称（带异常处理，避免崩溃）
-     */
-    private String getAppNameByPackage(String packageName) {
-        try {
-            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName, 0);
-            return mPackageManager.getApplicationLabel(appInfo).toString();
-        } catch (PackageManager.NameNotFoundException e) {
-            // 包名不存在（如应用已卸载），用包名兜底
-            LogUtils.e(TAG, "包名" + packageName + "对应的应用未找到：" + e.getMessage());
-            return packageName;
-        } catch (Exception e) {
-            // 其他异常（如权限问题），同样用包名兜底
-            LogUtils.e(TAG, "查询应用名称失败（包名：" + packageName + "）：" + e.getMessage());
-            return packageName;
-        }
-    }
-
-    /**
-     * 更新运行时长到模型（用包名匹配，不涉及名称）
-     */
-    private void updateAppRunTimeToModel() {
-        int nCount = 0;
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            Long runTime;
-            // Java7 显式判断包名是否在缓存中
-            if (appRunTimeCache.containsKey(packageName)) {
-                runTime = appRunTimeCache.get(packageName);
-                LogUtils.d(TAG, String.format("应用包 %s 运行时长已更新。", packageName));
-                nCount++;
-            } else {
-                runTime = 0L;
-            }
-            model.setRunTime(runTime);
-        }
-        LogUtils.d(TAG, String.format("dataList.size() %d， appRunTimeCache.size() %d。", dataList.size(), appRunTimeCache.size()));
-        LogUtils.d(TAG, String.format("updateAppRunTimeToModel() 更新的数据量为：%d", nCount));
-    }
-
-    /**
-     * 新增：双维度过滤（包名+应用名称）
-     * 搜索关键词同时匹配“包名（不区分大小写）”或“应用名称（不区分大小写）”
-     */
-    private void filterAppsByPackageAndName(String keyword) {
-        filteredList.clear();
-        if (keyword == null || keyword.isEmpty()) {
-            filteredList.addAll(dataList);
-        } else {
-            String lowerKeyword = keyword.toLowerCase(); // 统一转为小写，实现不区分大小写搜索
-
-            for (AppBatteryModel model : dataList) {
-                String packageName = model.getPackageName();
-                String packageNameLower = packageName.toLowerCase();
-                // 从缓存中获取应用名称（避免重复查询PackageManager）
-                String appName = packageToAppNameCache.get(packageName);
-                String appNameLower = appName.toLowerCase();
-
-                // 匹配规则：包名包含关键词 OR 应用名称包含关键词
-                boolean isMatched = packageNameLower.contains(lowerKeyword) 
-					|| appNameLower.contains(lowerKeyword);
-
-                if (isMatched) {
-                    filteredList.add(model);
-
-                }
-            }
-        }
-        adapter.notifyDataSetChanged();
-    }
-
-    /**
-     * 获取应用运行时长（返回包名-时长映射，不处理名称）
-     */
-    private Map<String, Long> getAppRunTime() {
-        Map<String, Long> runTimeMap = new HashMap<String, Long>();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            try {
-                android.app.usage.UsageStatsManager manager =
-                    (android.app.usage.UsageStatsManager) getSystemService(Context.USAGE_STATS_SERVICE);
-                long endTime = System.currentTimeMillis();
-                long startTime = endTime - 24 * 3600 * 1000; // 近24小时
-                List<android.app.usage.UsageStats> statsList = manager.queryUsageStats(
-                    android.app.usage.UsageStatsManager.INTERVAL_DAILY, startTime, endTime);
-
-                // 仅存储包名和时长（不查名称）
-                for (android.app.usage.UsageStats stats : statsList) {
-                    long runTimeMs = stats.getTotalTimeInForeground();
-                    String packageName = stats.getPackageName();
-                    LogUtils.d(TAG, "包名" + packageName + "运行时长：" + formatRunTime(runTimeMs));
-                    runTimeMap.put(packageName, runTimeMs);
-                    if (packageName.equals("aidepro.top")) {
-                        LogUtils.d(TAG, String.format("runTimeMap.put(packageName, runTimeMs) 特殊查询 %s 查询有结果。", packageName));
-                    }
-                }
-            } catch (Exception e) {
-                LogUtils.e(TAG, "获取应用运行时长失败：" + e.getMessage());
-            }
-        }
-
-        LogUtils.d(TAG, String.format("应用运行时长列表数量%d。", runTimeMap.size()));
-        return runTimeMap;
-    }
-
-    /**
-     * 格式化运行时长（工具方法，与包名无关）
-     */
-    private String formatRunTime(long runTimeMs) {
-        if (runTimeMs <= 0) {
-            return "0秒";
-        }
-        long seconds = runTimeMs / 1000;
-        long hours = seconds / 3600;
-        long minutes = (seconds % 3600) / 60;
-        seconds = seconds % 60;
-
-        if (hours > 0) {
-            return String.format("%d时%d分%d秒", hours, minutes, seconds);
-        } else if (minutes > 0) {
-            return String.format("%d分%d秒", minutes, seconds);
-        } else {
-            return String.format("%d秒", seconds);
-        }
-    }
-
-    /**
-     * 分配电池消耗（全程用包名计算，不涉及名称）
-     */
-    private void distributeBatteryConsumption(float totalDropPercent, Map<String, Long> runTimeMap) {
-        long totalRunTime = 0;
-        // 遍历包名计算总时长
-        for (Map.Entry<String, Long> entry : runTimeMap.entrySet()) {
-            totalRunTime += entry.getValue();
-        }
-
-        // 按包名匹配计算各应用耗电
-        for (AppBatteryModel model : dataList) {
-            String packageName = model.getPackageName();
-            Long appRunTime;
-            // Java7 显式判断包名是否存在
-            if (runTimeMap.containsKey(packageName)) {
-                appRunTime = runTimeMap.get(packageName);
-            } else {
-                appRunTime = 0L;
-            }
-
-            float ratio = (totalRunTime > 0) ? (float) appRunTime / totalRunTime : 0;
-            float consumption = batteryCapacity * totalDropPercent / 100 * ratio;
-            model.setConsumption(String.format("%.1f", consumption));
-            model.setRunTime(appRunTime); // 同步更新时长
-        }
-
-        // 按耗电排序（用包名对应的耗电值排序）
-        Collections.sort(dataList, new Comparator<AppBatteryModel>() {
-				@Override
-				public int compare(AppBatteryModel m1, AppBatteryModel m2) {
-					float c1 = Float.parseFloat(m1.getConsumption());
-					float c2 = Float.parseFloat(m2.getConsumption());
-					return Float.compare(c2, c1); // 逆序（耗电从高到低）
-				}
-			});
-
-        // 重新应用“包名+名称”双维度过滤
-        filterAppsByPackageAndName(etSearch.getText().toString());
-    }
-
-    /**
-     * 权限检查（仅操作系统服务，与包名无关）
-     */
-    private boolean hasUsageStatsPermission(Context context) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            return false;
-        }
-
-        android.app.usage.UsageStatsManager manager =
-            (android.app.usage.UsageStatsManager) context.getSystemService(Context.USAGE_STATS_SERVICE);
-        if (manager == null) {
-            return false;
-        }
-
-        long endTime = System.currentTimeMillis();
-        long startTime = endTime - 1000 * 60;
-        List<android.app.usage.UsageStats> statsList = manager.queryUsageStats(
-            android.app.usage.UsageStatsManager.INTERVAL_DAILY, startTime, endTime);
-
-        return statsList != null && !statsList.isEmpty();
-    }
-
-    /**
-     * 数据模型（仅存储包名、耗电、时长，不存名称）
-     */
-    public static class AppBatteryModel {
-        private String packageName; // 核心标识：应用包名
-        private String consumption; // 电量消耗（mAh）
-        private long runTime;       // 运行时长（ms）
-
-        // Java7 显式构造（仅传入包名、初始耗电、初始时长）
-        public AppBatteryModel(String packageName, String consumption, long runTime) {
-            this.packageName = packageName;
-            this.consumption = consumption;
-            this.runTime = runTime;
-        }
-
-        // Getter/Setter（仅操作包名、耗电、时长）
-        public String getPackageName() {
-            return packageName;
-        }
-
-        public String getConsumption() {
-            return consumption;
-        }
-
-        public void setConsumption(String consumption) {
-            this.consumption = consumption;
-        }
-
-        public long getRunTime() {
-            return runTime;
-        }
-
-        public void setRunTime(long runTime) {
-            this.runTime = runTime;
-        }
-    }
-
-    /**
-     * RecyclerView 适配器（支持从缓存获取名称，避免重复查询）
-     */
-    public static class BatteryReportAdapter extends RecyclerView.Adapter<BatteryReportAdapter.ViewHolder> {
-        private Context mContext;
-        private List<AppBatteryModel> mDataList;
-        private PackageManager mPm; // 兜底用：缓存无名称时查询
-        private Map<String, String> mPackageToNameCache; // 新增：名称缓存映射
-
-        // Java7 显式构造（新增名称缓存参数）
-        public BatteryReportAdapter(Context context, List<AppBatteryModel> dataList, 
-                                    PackageManager pm, Map<String, String> packageToNameCache) {
-            this.mContext = context;
-            this.mDataList = dataList;
-            this.mPm = pm;
-            this.mPackageToNameCache = packageToNameCache; // 接收名称缓存
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            View itemView = LayoutInflater.from(mContext)
-                .inflate(android.R.layout.simple_list_item_2, parent, false);
-            return new ViewHolder(itemView);
-        }
-
-        // 绑定数据：优先从缓存取名称，无缓存时兜底查询
-        @Override
-        public void onBindViewHolder(ViewHolder holder, int position) {
-            // Java7 显式非空判断（避免空指针）
-            if (mDataList == null || mDataList.isEmpty() || position >= mDataList.size()) {
-                holder.tvAppName.setText("未知应用");
-                holder.tvConsumption.setText("耗电：0.0 mAh | 运行时长：0秒");
-                return;
-            }
-
-            AppBatteryModel model = mDataList.get(position);
-            String packageName = model.getPackageName();
-            String appName = "";
-
-            // 优先从缓存获取名称（避免重复调用PackageManager，提升性能）
-            if (mPackageToNameCache != null && mPackageToNameCache.containsKey(packageName)) {
-                appName = mPackageToNameCache.get(packageName);
-            } else {
-                // 缓存无数据时，兜底查询名称（兼容异常场景）
-                try {
-                    ApplicationInfo appInfo = mPm.getApplicationInfo(packageName, 0);
-                    appName = mPm.getApplicationLabel(appInfo).toString();
-                    // 同步更新到缓存，后续复用
-                    if (mPackageToNameCache != null) {
-                        mPackageToNameCache.put(packageName, appName);
-                    }
-                } catch (PackageManager.NameNotFoundException e) {
-                    appName = packageName;
-                    LogUtils.e("Adapter", "包名" + packageName + "对应的应用未找到：" + e.getMessage());
-                } catch (Exception e) {
-                    appName = packageName;
-                    LogUtils.e("Adapter", "查询应用名称失败（包名：" + packageName + "）：" + e.getMessage());
-                }
-            }
-
-            // 显示应用名称（缓存/兜底结果）
-            holder.tvAppName.setText(appName);
-
-            // 格式化运行时长（调用 Activity 的工具方法）
-            String runTimeStr = ((BatteryReportActivity) mContext).formatRunTime(model.getRunTime());
-            // 显示耗电+运行时长（基于包名计算的结果）
-            String consumptionText = String.format("耗电：%s mAh | 运行时长：%s",
-                                                   model.getConsumption(), runTimeStr);
-            holder.tvConsumption.setText(consumptionText);
-
-            // 优化显示：目标应用文字标蓝（通过包名匹配）
-
-			holder.tvAppName.setTextColor(mContext.getResources().getColor(android.R.color.holo_blue_dark));
-			holder.tvConsumption.setTextColor(mContext.getResources().getColor(android.R.color.holo_blue_dark));
-
-			//holder.tvAppName.setTextColor(mContext.getResources().getColor(android.R.color.black));
-			//holder.tvConsumption.setTextColor(mContext.getResources().getColor(android.R.color.darker_gray));
-
-
-            // 调整文字大小（提升可读性）
-            holder.tvAppName.setTextSize(16);
-            holder.tvConsumption.setTextSize(14);
-        }
-
-        // 获取列表长度（Java7 三元运算符）
-        @Override
-        public int getItemCount() {
-            return mDataList == null ? 0 : mDataList.size();
-        }
-
-        // ViewHolder（绑定系统布局的两个 TextView）
-        public static class ViewHolder extends RecyclerView.ViewHolder {
-            TextView tvAppName;     // 显示应用名称（缓存/兜底获取）
-            TextView tvConsumption; // 显示耗电+运行时长（包名计算结果）
-
-            // Java7 显式构造
-            public ViewHolder(View itemView) {
-                super(itemView);
-                // 强制类型转换（系统布局控件 ID：text1 和 text2）
-                tvAppName = (TextView) itemView.findViewById(android.R.id.text1);
-                tvConsumption = (TextView) itemView.findViewById(android.R.id.text2);
-            }
-        }
-    }
-}
-

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

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

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

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@android:color/white">
-
-    <!-- 搜索框：提示文本改为“搜索应用名称或包名” -->
-    <EditText
-        android:id="@+id/et_search"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:padding="12dp"
-        android:hint="搜索应用名称或包名"
-        android:background="@android:drawable/btn_default_small"
-        android:inputType="text"
-        android:textSize="16sp"/>
-
-    <!-- 应用列表 -->
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_battery_report"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"/>
-
-</LinearLayout>

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

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

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/action_battery_report"
-        android:title="@string/item_battery_report"/>
+        android:id="@+id/action_battery_reporter"
+        android:title="@string/item_battery_reporter"/>
     <item
         android:id="@+id/action_clearrecord"
         android:title="@string/item_clearrecord"/>

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

@@ -6,7 +6,7 @@
     <string name="about_crashed">This application has crashed, the author level is limited, please understand!</string>
     <string name="item_mainview">Main View</string>
     <string name="item_aboutview">About</string>
-    <string name="item_battery_report">Battery Report</string>
+    <string name="item_battery_reporter">Battery Reporter</string>
     <string name="item_clearrecord">Clear Record</string>
     <string name="item_changepicture">Change Picture</string>
     <string name="item_devoloperoptionsview">Developer View</string>