<powerbell>APK 15.4.15 release Publish.

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Sep 28 04:40:43 GMT 2025
+#Tue Jun 24 09:54:47 HKT 2025
 stageCount=3
 libraryProject=
 baseVersion=15.2
 publishVersion=15.2.2
-buildCount=1
+buildCount=0
 baseBetaVersion=15.2.3

powerbell/build.gradle

@@ -41,6 +41,17 @@ 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 Sep 03 20:59:53 HKT 2025
+#Wed Oct 22 17:45:14 HKT 2025
-stageCount=13
+stageCount=16
 libraryProject=
 baseVersion=15.4
-publishVersion=15.4.12
+publishVersion=15.4.15
 buildCount=0
-baseBetaVersion=15.4.13
+baseBetaVersion=15.4.16

powerbell/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?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">
 
     <!-- 拍摄照片和视频 -->
@@ -24,10 +25,29 @@
     <!-- 显示通知 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
+    <!-- PACKAGE_USAGE_STATS -->
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+
+    <!-- BATTERY_STATS -->
+    <uses-permission android:name="android.permission.BATTERY_STATS"/>
+
+    <uses-permission android:name="android.permission.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"
@@ -123,6 +143,8 @@
 
         <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.BatteryReporterActivity;
+import cc.winboll.studio.powerbell.activities.BatteryReportActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
 import cc.winboll.studio.powerbell.activities.WinBoLLActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -161,7 +161,7 @@ public class MainActivity extends WinBoLLActivity {
             startActivity(intent);
         } else if (menuItemId == R.id.action_battery_reporter) {
             Intent intent = new Intent();
-            intent.setClass(this, BatteryReporterActivity.class);
+            intent.setClass(this, BatteryReportActivity.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

@@ -0,0 +1,549 @@
+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 static final String TARGET_APP_PACKAGE = "cc.winboll.studio.mymessagemanager";
+
+    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_batteryreport);
+        // 初始化包管理工具（仅一次，供后续查询名称使用）
+        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();
+        // 3. 强制添加目标应用（包名兜底）
+        //forceAddTargetPackage();
+        // 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 forceAddTargetPackage() {
+        // 1. 先检查列表中是否已存在目标包名
+        boolean isTargetExists = false;
+        for (AppBatteryModel model : dataList) {
+            if (TARGET_APP_PACKAGE.equals(model.getPackageName())) {
+                isTargetExists = true;
+                break;
+            }
+        }
+
+        if (isTargetExists) {
+            LogUtils.d(TAG, "目标包名已在列表中，无需重复添加");
+            return;
+        }
+
+        // 2. 仅用包名创建模型，强制添加（不依赖名称查询）
+        dataList.add(0, new AppBatteryModel(TARGET_APP_PACKAGE, "0.0", 0));
+        // 同步更新名称缓存
+        packageToAppNameCache.put(TARGET_APP_PACKAGE, getAppNameByPackage(TARGET_APP_PACKAGE));
+        LogUtils.d(TAG, "强制添加目标包名成功：" + TARGET_APP_PACKAGE);
+    }
+
+    /**
+     * 更新运行时长到模型（用包名匹配，不涉及名称）
+     */
+    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(); // 统一转为小写，实现不区分大小写搜索
+            boolean isTargetMatched = false;
+
+            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);
+                    // 检查是否是目标包名
+                    if (TARGET_APP_PACKAGE.equals(packageName)) {
+                        isTargetMatched = true;
+                    }
+                }
+            }
+
+            // 兜底：目标包名未匹配时强制添加
+            if (!isTargetMatched) {
+                for (AppBatteryModel model : dataList) {
+                    if (TARGET_APP_PACKAGE.equals(model.getPackageName())) {
+                        filteredList.add(0, model);
+                        LogUtils.d(TAG, "搜索兜底：强制添加目标包名到结果列表");
+                        break;
+                    }
+                }
+            }
+        }
+        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);
+
+            // 优化显示：目标应用文字标蓝（通过包名匹配）
+            if (BatteryReportActivity.TARGET_APP_PACKAGE.equals(packageName)) {
+                holder.tvAppName.setTextColor(mContext.getResources().getColor(android.R.color.holo_blue_dark));
+                holder.tvConsumption.setTextColor(mContext.getResources().getColor(android.R.color.holo_blue_dark));
+            } else {
+                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

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

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

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

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

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