更新一下readme

README.md

@@ -24,7 +24,9 @@
 
 | 版本 | 主题 | 状态 |
 | :--- | :--- | :--- |
-| 1.5.0 | 功率计算优化 | ✅ 已发布 |
+| 1.4.0 | SAF 权限改造 | ✅ 已发布 |
+| 1.4.5 | 魅族20系补充适配调整 | ✅ 已发布 |
+| 1.5.0 | 功率计算优化 | 📋 规划中 |
 | 2.0.0 | 数据看板扩展（月/季/年趋势） | 📋 远景 |
 
 ---
@@ -33,7 +35,7 @@
 
 - Flutter SDK: ^3.9.2
 - Android: 8.0+ (API 26+)
-- 仅支持魅族手机（15 系列 ~ 22 系列）
+- 仅支持魅族手机（15 系列 ~ 25 系列）
 
 ---
 
@@ -47,5 +49,4 @@ flutter pub get
 flutter run
 
 # Release APK
-flutter build apk --release --target-platform android-arm64
-```
+flutter build apk --release

lib/logic/capacity_extractor.dart

@@ -1,36 +1,31 @@
 /// 容量提取工具
 /// 支持两种日志格式：
 /// 1. learned_cap（21 系列）：单位 µAh，除以 1000 得到 mAh
-///    🟢 优先级最高，不受 status 限制（BMS 可能在任意状态行更新此值）
-/// 2. remaining_cap（20 系列）：仅从 status=Full 行提取，单位智能识别（µAh/mAh）
+/// 2. remaining_cap（20 系列）：单位 mAh，直接使用（但 21 系列的 remaining_cap 也是 µAh，需判断）
+///
+/// 🟢 1.4.5 优化：仅从 status=Full 的行中提取容量（充满状态下 BMS 最准确）
 class CapacityExtractor {
   static int? extractCapacity(List<String> lines) {
-    final validLines = lines.where((line) => line.contains('tbat=')).toList();
-    if (validLines.isEmpty) return null;
+    // 🟢 只保留包含 tbat= 且 status=Full 的行
+    final fullLines = lines.where((line) {
+      return line.contains('tbat=') && line.contains('status=Full');
+    }).toList();
 
-    // ============================================================
-    // 🟢 第一优先级：learned_cap（21 系列专属）
-    // 不限制 status，在所有有效行中搜索，取最新的一条
-    // ============================================================
+    if (fullLines.isEmpty) {
+      // 今天没有充满电的记录，返回 null 表示无有效数据
+      return null;
+    }
+
+    // 模式一：learned_cap（21 系列）
     final learnedReg = RegExp(r'learned_cap=(\d+)');
-    for (String line in validLines.reversed) {
+    for (String line in fullLines.reversed) {
       final match = learnedReg.firstMatch(line);
       if (match != null) {
-        final value = int.parse(match.group(1)!);
-        // learned_cap 单位固定为 µAh，直接除以 1000 转 mAh
-        return value ~/ 1000;
+        return int.parse(match.group(1)!) ~/ 1000;
       }
     }
 
-    // ============================================================
-    // 🟢 第二优先级：remaining_cap（20 系列回退方案）
-    // 仅从 status=Full 行提取（充满状态下 BMS 最准确）
-    // ============================================================
-    final fullLines = validLines
-        .where((line) => line.contains('status=Full'))
-        .toList();
-    if (fullLines.isEmpty) return null;
-
+    // 模式二：remaining_cap 最大值（20 系列，或 21 系列回退）
     final remainingReg = RegExp(r'remaining_cap=(\d+)');
     int? maxRemaining;
     for (String line in fullLines) {
@@ -44,7 +39,7 @@ class CapacityExtractor {
     }
     if (maxRemaining == null) return null;
 
-    // 🟢 智能单位识别：如果数值大于 100000（约 100 mAh），视为 µAh 需除以 1000
+    // 🟢 判断单位：如果数值大于 100000（约 100 mAh），则认为是 µAh，需除以 1000
     if (maxRemaining > 100000) {
       return maxRemaining ~/ 1000;
     } else {

lib/logic/charge_parser.dart

@@ -38,9 +38,8 @@ class ChargeParser {
     final result = <Map<String, dynamic>>[];
     for (String line in lines) {
       final timestamp = TimeUtils.parseLogTimestamp(line);
-      if (!TimeUtils.isLogTimestampValid(timestamp, chargingStartTime)) {
+      if (!TimeUtils.isLogTimestampValid(timestamp, chargingStartTime))
         continue;
-      }
 
       final isUsb =
           line.contains('chg_usb') &&
@@ -102,7 +101,7 @@ class ChargeParser {
     return ParseResult(
       isWireless: false,
       chargeType: chargeType,
-      power: (vbus * ibus) / 1000000000000.0,
+      power: (vbus * ibus) / 1000000000.0,
       volt: vbus / 1000000.0,
       curr: ibus / 1000000.0,
       wiredLevel: chargeType == 'PPS' ? level : null,

lib/pages/battery_health_page.dart

@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:developer' as dev;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 // 检查这些导入是否正确
 import '../models/device_matching.dart'; // ✅ 存在
@@ -320,7 +322,10 @@ class _BatteryHealthPageState extends State<BatteryHealthPage>
 
   // ---------- 读取当前数据 ----------
   Future<void> readBatteryCapacity() async {
-    dev.log('🔴🔴🔴 readBatteryCapacity 被调用了 🔴🔴🔴', name: 'BatteryHealth');
+    dev.log(
+      '🔵 ========== readBatteryCapacity 开始 ==========',
+      name: 'BatteryHealth',
+    );
 
     _safState = await _safService.getPermissionState();
     dev.log('🔵 SAF状态: $_safState', name: 'BatteryHealth');
@@ -349,10 +354,6 @@ class _BatteryHealthPageState extends State<BatteryHealthPage>
           _currentCap = recent.first['capacity'].toDouble();
           _maxVolt = recent.first['volt_max'] ?? 0;
           _minVolt = recent.first['volt_min'] ?? 0;
-          // 🟢 数据库目前不存温度，后续升级可扩展，暂时保留为 0
-          _maxTemp = 0;
-          _minTemp = 0;
-          _cycleCount = 0;
           _hasData = true;
         });
         await _updateTrendChart();
@@ -379,7 +380,20 @@ class _BatteryHealthPageState extends State<BatteryHealthPage>
         return;
       }
 
-      // 🟢 提取所有有效行（包含 tbat=）
+      // 使用 CapacityExtractor 提取容量
+      final cap = CapacityExtractor.extractCapacity(lines);
+      if (cap == null) {
+        dev.log(
+          '🔵 未找到容量数据（learned_cap 或 remaining_cap）',
+          name: 'BatteryHealth',
+        );
+        setState(() => _hasData = false);
+        _chargeAnimationController.reset();
+        _updateChargeState();
+        return;
+      }
+
+      // 提取最后一条有效数据用于显示
       final validLines = lines.where((line) => line.contains('tbat=')).toList();
       if (validLines.isEmpty) {
         dev.log('🔵 无有效数据行', name: 'BatteryHealth');
@@ -389,8 +403,6 @@ class _BatteryHealthPageState extends State<BatteryHealthPage>
         return;
       }
 
-      // 🟢 1.4.7 核心改动：字段提取与容量提取解耦
-      // 无论 cap 是否为 null，都提取常规字段
       final lastLine = validLines.last;
       final cycle = _extractCycle(lastLine);
       final temp = _extractTemp(lastLine);
@@ -399,34 +411,12 @@ class _BatteryHealthPageState extends State<BatteryHealthPage>
       final (maxVolt, minVolt) = _extractVoltExtremes(validLines);
 
       dev.log(
-        '🔵 字段提取: cycle=$cycle, temp=$temp, volt=$volt',
+        '🔵 解析结果: cap=$cap, cycle=$cycle, temp=$temp, volt=$volt',
         name: 'BatteryHealth',
       );
 
-      // 🟢 容量提取（可能为 null）
-      final cap = CapacityExtractor.extractCapacity(lines);
-      int? finalCap;
-
-      if (cap != null) {
-        // ✅ 今日有充满记录，直接使用
-        finalCap = cap;
-        dev.log('🔵 从日志提取容量: $cap', name: 'BatteryHealth');
-      } else {
-        // ⚠️ 今日无充满记录，尝试从数据库复制前一天容量
-        dev.log('🔵 今日无充满记录，尝试复制前一天容量', name: 'BatteryHealth');
-        final recent = await _dbService.queryRecentData(1);
-        if (recent.isNotEmpty) {
-          finalCap = recent.first['capacity'] as int;
-          dev.log('🔵 复制前一天容量: $finalCap', name: 'BatteryHealth');
-        } else {
-          finalCap = null;
-          dev.log('🔵 无历史数据可复制', name: 'BatteryHealth');
-        }
-      }
-
-      // 🟢 一次性 setState 更新所有字段
       setState(() {
-        _currentCap = (finalCap ?? _currentCap).toDouble();
+        _currentCap = cap.toDouble();
         _cycleCount = cycle;
         _batteryTemp = temp;
         _batteryVolt = volt;
@@ -613,8 +603,7 @@ class _BatteryHealthPageState extends State<BatteryHealthPage>
     if (_isWireless) {
       return ChargeUtils.getDisplayPowerWireless(_chargePower);
     } else {
-      // 🟢 1.5.0 改用新格式：实际/标定
-      return ChargeUtils.getMainDisplayPowerWired(
+      return ChargeUtils.getDisplayPowerWired(
         _chargePower,
         _wiredLevel,
         _chargeType,
@@ -631,8 +620,7 @@ class _BatteryHealthPageState extends State<BatteryHealthPage>
   Widget build(BuildContext context) {
     return AnnotatedRegion<SystemUiOverlayStyle>(
       value: const SystemUiOverlayStyle(
-        // 🟢 1.5.0 统一状态栏颜色
-        statusBarColor: Color.fromRGBO(157, 212, 237, 0.1),
+        statusBarColor: Colors.white,
         statusBarIconBrightness: Brightness.dark,
         statusBarBrightness: Brightness.dark,
       ),

lib/utils/charge_utils.dart

@@ -1,7 +1,6 @@
 import '../constants/charge_maps.dart';
 
 class ChargeUtils {
-  // ============ 无线充电（保持不变） ============
   static String getDisplayPowerWireless(double power) {
     if (power == 0) return '读取中...';
     const List<int> levels = [5, 7, 15, 27, 40, 50, 66];
@@ -13,17 +12,21 @@ class ChargeUtils {
     return '≈${matchedLevel}W';
   }
 
-  // ============ 原有有线逻辑（保留兼容，但主界面不再直接调用） ============
   static String getDisplayPowerWired(
     double power,
     int? wiredLevel,
     String chargeType,
   ) {
+    // USB 慢充锁定 7.5W
     if (chargeType == "SDP") return "≈7.5W";
+
+    // 🟢 优先使用 wiredLevel 精确匹配
     if (wiredLevel != null && ChargeMaps.wiredPower.containsKey(wiredLevel)) {
       double p = ChargeMaps.wiredPower[wiredLevel]!;
       if (p > 0) return '≈${p.toInt()}W';
     }
+
+    // 🟢 匹配阈值收窄到 ±3W，减少跳变
     double best = 0;
     for (var entry in ChargeMaps.wiredPower.entries) {
       if (entry.value <= power + 3 && entry.value > best) {
@@ -34,61 +37,11 @@ class ChargeUtils {
     return best > 0 ? '≈${best.toInt()}W' : '≈${power.round()}W';
   }
 
-  // ============ 🟢 1.5.0 新增：主界面显示（实际/标定） ============
-  /// 示例：≈30w/65w
-  static String getMainDisplayPowerWired(
-    double power,
-    int? wiredLevel,
-    String chargeType,
-  ) {
-    // USB 慢充锁定 7.5W
-    if (chargeType == "SDP") return "≈7.5w";
-
-    if (power == 0) return "读取中...";
-
-    final actual = power.round();
-
-    // 有档位且能查到标定值
-    if (wiredLevel != null && ChargeMaps.wiredPower.containsKey(wiredLevel)) {
-      final requested = ChargeMaps.wiredPower[wiredLevel]!.round();
-      return "≈${actual}w/${requested}w";
-    }
-
-    // 无档位信息，仅显示实际功率
-    return "≈${actual}w";
-  }
-
-  // ============ 🟢 1.5.0 新增：二级页面标定档位显示 ============
-  /// 示例：≈80w/L-10
-  static String getDetailRequestedPowerWired(
-    double power,
-    int? wiredLevel,
-    String chargeType,
-  ) {
-    if (chargeType == "SDP") return "≈7.5w";
-
-    if (power == 0) return "读取中...";
-
-    if (wiredLevel != null && ChargeMaps.wiredPower.containsKey(wiredLevel)) {
-      final requested = ChargeMaps.wiredPower[wiredLevel]!.round();
-      return "≈${requested}w/L-$wiredLevel";
-    }
-
-    return "≈${power.round()}w";
-  }
-
-  // ============ 🟢 1.5.0 新增：二级页面实际功率显示 ============
-  static String getDetailActualPowerWired(double power, String chargeType) {
-    if (chargeType == "SDP") return "≈7.5w";
-    if (power == 0) return "读取中...";
-    return "≈${power.round()}w";
-  }
-
-  // ============ 充电类型标签（保持不变） ============
   static String getChargeTypeLabel(bool isWireless, String chargeType) {
     if (isWireless) {
       return chargeType == "无线" ? "无线" : chargeType;
     }
+    // 🟢 空类型显示"识别中..."，比"等待log信息"更友好
     if (chargeType.isEmpty) {
       return "识别中...";
     }

lib/utils/time_utils.dart

@@ -1,3 +1,5 @@
+import 'dart:developer' as dev;
+
 class TimeUtils {
   /// 解析日志行中的时间戳，强制解析为 UTC
   static DateTime? parseLogTimestamp(String line) {

lib/widgets/charge_detail_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import '../utils/charge_utils.dart';
 
 /// 充电详情页
@@ -21,6 +20,14 @@ class ChargeDetailPage extends StatelessWidget {
     this.wiredLevel,
   }) : super(key: key);
 
+  String _getDisplayPower() {
+    if (isWireless) {
+      return ChargeUtils.getDisplayPowerWireless(power);
+    } else {
+      return ChargeUtils.getDisplayPowerWired(power, wiredLevel, chargeType);
+    }
+  }
+
   String _getProtocolDisplay() {
     if (isWireless) return '无线充电（$chargeType）';
     if (chargeType == 'PPS') return 'PPS 快充';
@@ -28,36 +35,13 @@ class ChargeDetailPage extends StatelessWidget {
     return chargeType;
   }
 
-  String _getRequestedDisplay() {
-    return ChargeUtils.getDetailRequestedPowerWired(
-      power,
-      wiredLevel,
-      chargeType,
-    );
-  }
-
-  String _getActualDisplay() {
-    return ChargeUtils.getDetailActualPowerWired(power, chargeType);
-  }
-
   @override
   Widget build(BuildContext context) {
-    return AnnotatedRegion<SystemUiOverlayStyle>(
-      // 🟢 1.5.0 与主界面统一状态栏样式
-      value: const SystemUiOverlayStyle(
-        statusBarColor: Color.fromRGBO(157, 212, 237, 0.5),
-        statusBarIconBrightness: Brightness.dark,
-        statusBarBrightness: Brightness.dark,
-      ),
-      child: Scaffold(
-        backgroundColor: Colors.white,
+    return Scaffold(
       appBar: AppBar(
         title: const Text('充电详情'),
-          backgroundColor: Colors.white, // 🟢 与主界面统一
+        backgroundColor: const Color.fromARGB(0, 255, 255, 255),
         elevation: 0,
-          scrolledUnderElevation: 0,
-          shadowColor: Colors.transparent,
-          surfaceTintColor: Colors.transparent,
         foregroundColor: Colors.black,
         iconTheme: const IconThemeData(color: Colors.black),
       ),
@@ -68,31 +52,16 @@ class ChargeDetailPage extends StatelessWidget {
           children: [
             _buildDetailRow('协议', _getProtocolDisplay()),
             const Divider(),
-
-              // 有线充电：标定档位 + 实际功率
-              if (!isWireless) ...[
-                _buildDetailRow('标定档位', _getRequestedDisplay()),
+            _buildDetailRow('功率', _getDisplayPower()),
             const Divider(),
-                _buildDetailRow('实际功率', _getActualDisplay()),
-                const Divider(),
-              ] else ...[
-                _buildDetailRow(
-                  '功率',
-                  ChargeUtils.getDisplayPowerWireless(power),
-                ),
-                const Divider(),
-              ],
-
             _buildDetailRow('电压', '${volt.toStringAsFixed(2)}V'),
             const Divider(),
             _buildDetailRow('电流', '${curr.toStringAsFixed(2)}A'),
             const Divider(),
-
-              // 辅助信息
+            if (!isWireless && wiredLevel != null)
+              _buildDetailRow('档位', '$wiredLevel'),
+            if (!isWireless && wiredLevel == null) _buildDetailRow('档位', '自动'),
             if (isWireless) _buildDetailRow('类型', '无线'),
-              if (!isWireless && wiredLevel == null)
-                _buildDetailRow('档位', '自动'),
-
             const Spacer(),
             Center(
               child: Text(
@@ -103,7 +72,6 @@ class ChargeDetailPage extends StatelessWidget {
           ],
         ),
       ),
-      ),
     );
   }
 

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.5.0
+version: 1.4.0
 
 environment:
   sdk: ^3.9.2