背景色优化

2026-07-05 01:21:15 +08:00
27 changed files with 1197 additions and 2413 deletions
@@ -1,4 +1,3 @@
 {
-    "cmake.ignoreCMakeListsMissing": true,
-    "gitlens.codeLens.enabled": false
+    "cmake.ignoreCMakeListsMissing": true
 }
@@ -24,26 +24,18 @@

 | 版本 | 主题 | 状态 |
 | :--- | :--- | :--- |
-| 1.5.0 | 功率计算优化 | ✅ 已发布 |
-| 1.5.2 | 部分场景字体替换 | ✅ 已发布 |
-| 1.6.0 | 更新日志独立页面 | 📋近期开发 |
-| 1.7.0 | 适配夜间模式 | 📋近期开发 |
-| 2.0.0 | 数据看板月份显示扩展等系列更新 | 📋 远景 |
-| 3.0.0 | 搭配PC上位机记录充电信息等 | 📋 远景 |
+| 1.3.0 | 时间窗口 + real_type 优先级 | ✅ 已发布 |
+| 1.4.0 | SAF 权限改造 | 📋 规划中 |
+| 1.5.0 | 功率计算优化 | 📋 规划中 |
+| 2.0.0 | 数据看板扩展（月/季/年趋势） | 📋 远景 |
+
 ---

 ## 环境要求

 - Flutter SDK: ^3.9.2
 - Android: 8.0+ (API 26+)
-
---
-
-## 机型匹配情况
-目前据群友反馈已知：
- 魅族22无mbattery_charger目录生成，无法实时计算相应百分比，因此已在最近版本去除相关匹配信息
- 魅族18在后续的版本中关闭了mbattery_log生成，疑似无效，老版本可能支持
- 最完美的支持版本至少可覆盖魅族20/21系机型（20inf已确认，机型匹配ID已更新）
+- 仅支持魅族手机（15 系列 ~ 25 系列）

 ---

@@ -54,8 +46,7 @@
 flutter pub get

 # Debug 版本
-flutter run --debug
+flutter run

 # Release APK
-flutter build apk --release --target-platform android-arm64
-```
+flutter build apk --release
@@ -1,73 +0,0 @@
-plugins {
-    id("com.android.application")
-    id("kotlin-android")
-    id("dev.flutter.flutter-gradle-plugin")
-}
-
-android {
-    namespace = "com.lxh.battery_health"
-    compileSdk = 34
-    ndkVersion = flutter.ndkVersion
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    defaultConfig {
-        applicationId = "com.lxh.battery_health"
-        minSdk = flutter.minSdkVersion
-        targetSdk = 34
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
-        multiDexEnabled = true
-    }
-
-    signingConfigs {
-        // 如果没有正式签名，可以用 debug 签名代替（测试用）
-        // 正式发布时请替换为自己的密钥
-        getByName("debug") {
-            // debug 签名已经存在，无需额外配置
-        }
-        create("release") {
-            // 如果有正式签名，在这里配置
-            // keyAlias = "..."
-            // keyPassword = "..."
-            // storeFile = file("...")
-            // storePassword = "..."
-        }
-    }
-
-    buildTypes {
-        debug {
-            // 🟢 关键：debug 版本包名加 .dev 后缀
-            applicationIdSuffix = ".dev"
-            signingConfig = signingConfigs.getByName("debug")
-            isDebuggable = true
-            isMinifyEnabled = false
-            isShrinkResources = false
-        }
-        release {
-            // release 版本不加后缀，保持原包名
-            signingConfig = signingConfigs.getByName("debug") // 若没有正式签名，先用 debug 签名
-            isMinifyEnabled = true
-            isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-}
-
-flutter {
-    source = "../.."
-}
-
-dependencies {
-    // 无需额外添加 Activity KTX，因为已改用 startActivityForResult
-}
@@ -1,50 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-<!--<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
-<application
-    android:label="@string/app_name"
-    android:name="${applicationName}"
-    android:icon="@drawable/logo"
-    android:requestLegacyExternalStorage="true"
-    android:theme="@style/LaunchTheme">   <!-- 全局先用 LaunchTheme -->
-
-    <activity
-        android:name=".MainActivity"
-        android:exported="true"
-        android:launchMode="singleTop"
-        android:taskAffinity=""
-        android:theme="@style/AppTheme"   
-        android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-        android:hardwareAccelerated="true"
-        android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-    </application>
-    <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
-        </intent>
-    </queries>
-</manifest>
@@ -11,7 +11,6 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.DocumentsContract
 import android.provider.OpenableColumns
-import android.view.Window  // 🟢 必须包含
 import androidx.activity.ComponentActivity
 import androidx.annotation.NonNull
 import io.flutter.embedding.android.FlutterActivity
@@ -33,9 +32,6 @@ class MainActivity : FlutterActivity() {
    private val PREF_NAME = "battery_health_prefs"
    private val KEY_SAF_URI = "saf_uri"

-    // 🟢 刷新率控制通道
-    private val FRAME_RATE_CHANNEL = "com.lxh.battery_health/frame_rate"
-
    private val chargeReceiver = object : BroadcastReceiver() {
        override fun onReceive(context: Context?, intent: Intent?) {
            intent ?: return
@@ -78,6 +74,7 @@ class MainActivity : FlutterActivity() {
        try {
            safUri = Uri.parse(uriString)
            android.util.Log.d("BatteryHealth", "通过 MethodChannel 恢复 URI: $safUri")
+            // 同时保存到 SharedPreferences
            val prefs: SharedPreferences = getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE)
            prefs.edit().putString(KEY_SAF_URI, uriString).apply()
        } catch (e: Exception) {
@@ -225,34 +222,9 @@ class MainActivity : FlutterActivity() {
        return fileUri?.let { readFile(it) }
    }

-// 🟢 刷新率控制方法
-// 🟢 刷新率控制方法（使用 preferredRefreshRate，兼容性更好）
-private fun setHighRefreshRate() {
-    try {
-        val params = window.attributes
-        params.preferredRefreshRate = 120f
-        window.attributes = params
-        android.util.Log.d("BatteryHealth", "setHighRefreshRate: 设置 120Hz")
-    } catch (e: Exception) {
-        android.util.Log.e("BatteryHealth", "setHighRefreshRate 失败: ${e.message}")
-    }
-}
-
-private fun clearRefreshRate() {
-    try {
-        val params = window.attributes
-        params.preferredRefreshRate = 0f  // 0 表示让系统自动决定
-        window.attributes = params
-        android.util.Log.d("BatteryHealth", "clearRefreshRate: 恢复默认")
-    } catch (e: Exception) {
-        android.util.Log.e("BatteryHealth", "clearRefreshRate 失败: ${e.message}")
-    }
-}
-
    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
        super.configureFlutterEngine(flutterEngine)

-        // 充电状态通道
        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHARGE_CHANNEL)
            .setMethodCallHandler { call, result ->
                if (call.method == "getChargeState") {
@@ -275,7 +247,6 @@ private fun clearRefreshRate() {
                }
            }

-        // SAF 通道
        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, SAF_CHANNEL)
            .setMethodCallHandler { call, result ->
                when (call.method) {
@@ -312,23 +283,6 @@ private fun clearRefreshRate() {
                }
            }

-        // 🟢 刷新率控制通道
-        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, FRAME_RATE_CHANNEL)
-            .setMethodCallHandler { call, result ->
-                when (call.method) {
-                    "setHighRefreshRate" -> {
-                        setHighRefreshRate()
-                        result.success(true)
-                    }
-                    "clearRefreshRate" -> {
-                        clearRefreshRate()
-                        result.success(true)
-                    }
-                    else -> result.notImplemented()
-                }
-            }
-
-        // 事件通道
        EventChannel(flutterEngine.dartExecutor.binaryMessenger, EVENT_CHANNEL)
            .setStreamHandler(
                object : EventChannel.StreamHandler {
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- 应用主主题（浅色） -->
    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- 状态栏背景白色 -->
        <item name="android:statusBarColor">@android:color/white</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
-    </style>
-
-    <!-- 启动主题（用于闪屏，保持透明/深色以避免白屏闪烁） -->
-    <style name="LaunchTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- 启动时可保持透明 -->
-        <item name="android:windowBackground">@android:color/white</item>
-        <item name="android:statusBarColor">@android:color/white</item>
+        <!-- 状态栏图标亮色（深色图标） -->
        <item name="android:windowLightStatusBar">true</item>
    </style>
 </resources>
@@ -1,119 +0,0 @@
-## [1.6.0] - 2026-07-20
-
-### ✨ 新增
-
- **更新日志页面**：内置 `CHANGELOG.md` 渲染，版本历史一目了然
-  - 使用 `flutter_markdown` 解析，支持标准 Markdown 格式
-  - 滚动进度条：实时显示阅读进度，提升浏览体验
-  - 进入页面自动请求 120Hz 高刷新率，滑动更流畅（Flyme LTPO 适配）
-  - 滚动时呼吸动画维持高刷感知，停止后自动恢复省电策略
-
- **AppBar 菜单重构**：刷新按钮左移，右侧新增三点菜单
-  - `更新日志`：已可用
-  - `深色模式`：占位（1.7.0 实现）
-  - `关于`：占位（1.7.0 实现）
-
- **原生层高刷控制**：新增 `MethodChannel` 通道，支持 Dart 侧动态申请/释放 120Hz
-  - 进入更新日志页面自动触发
-  - 退出页面自动释放，不影响系统省电策略
-
-### ⚡ 优化
-
- **UI 拆分**：将 `BatteryHealthPage` 的 UI 部分抽离至独立文件，降低耦合度
- **动画简化**：移除复合动画控制器（`AnimationController`），改用轻量 `AnimatedOpacity` 控制充电条目显隐
- **更新日志性能**：缓存 Markdown 渲染结果，避免重复解析
- **LTPO 适配**：通过进度条微动 + 原生层 `preferredRefreshRate`，解决更新日志页面降频卡顿问题
-
-### 🐛 修复
-
- 修复更新日志页面因 `ListView` + `shrinkWrap` 导致的 `unbounded height` 渲染异常
- 修复充电条目动画状态残留导致的显示异常
- 修复部分 `TextStyle` 中 `color` 与 `foreground` 混用导致的渲染断言错误
-
-### 📊 影响范围
-
- `battery_health_page.dart`：AppBar 重构，动画简化
- `battery_data_layout.dart`（新增）：UI 布局抽离
- `changelog_page.dart`（新增）：更新日志页面
- `MainActivity.kt`：新增原生高刷控制通道
- `pubspec.yaml`：新增 `flutter_markdown` 依赖，添加 `assets/CHANGELOG.md`
-
----
-
-## [1.5.3] - 2026-07-19
- 新增：机型匹配优化
-
-### ✅ 已确认完美支持
- 魅族 20 / 20 Pro / 20 INFINITY（基于remaining_cap + status=full联合判断）
- 魅族 21 / 21 Pro（直接读取learned_cap字段信息）
-
-### ⚠️ 部分支持（测试中）
- 魅族 18 / 18s / 18 Pro / 18s Pro（日志存在，字段解析适配中）
- 魅族 16s（需回退原厂固件验证）
-
-### ❌ 确认不支持
- 魅族 21 Note（星纪团队固件，日志格式乱码无法识别，导致异常）
- 魅族 22（系统未生成 `mbattery_charger` 目录）
-
-### 📌 说明
- 适配状态仅针对 BMS 日志可读性，与手机硬件本身无关
- 部分旧机型（如 16 系）若无日志生成，则无法使用本工具
- 后续若发现其他机型可用，将持续补充
-
----
-
-## [1.5.2] - 2026-07-14
-
-### 新增
- 浪漫雅圆字体，工程内文件为FlymeFont.ttf
-
-### 🎨 UI 优化
-
- **字体体系重构**：数字全局替换为 FlymeFont（浪漫雅圆），中文保留 HarmonyOS Sans SC
-  - 健康度百分比、容量数值、循环次数、电压/温度读数均使用 FlymeFont
-  - 中文/单位/符号保持 HarmonyOS Sans SC，确保阅读舒适度
- **温标符号修正**：温度显示由 `°C`（度符号 + C）改为专用字符 `℃`（U+2103），与 FlymeFont 原生适配
- **容量行视觉权重优化**：
-  - 当前容量与设计容量数字使用 FlymeFont（字号 20，字重 300）
-  - `mAh` 单位改用 HarmonyOS Sans SC（字号 16，字重 500），与 `cycles` 保持一致
-  - 整行颜色统一为 `rgb(95, 95, 95)`，弱化视觉重量，突出健康度大数字
- **电压/温度极值显示优化**：数值与单位统一使用 FlymeFont，箭头符号保留 HarmonyOS
-
-### 🐛 修复
-
- 修复 FlymeFont 数字 1 在部分场景下显示为红色的问题（字体内部颜色预设）
- 修复容量行 `designCap`（设计容量）未正确应用 FlymeFont 的问题
- 修复部分 `TextStyle` 中 `color` 与 `foreground` 混用导致的渲染断言错误
- 统一主界面与二级页面状态栏样式
-
-### 📊 影响范围
-
- `battery_summary.dart`：健康度/循环/容量显示样式重构
- `battery_info_panel.dart`：电压/温度显示字体统一
- `charge_detail_page.dart`：数值字体统一
- `trend_chart.dart`：坐标轴数字字体统一
-
-### 📌 备注
-
- 本次更新纯 UI 优化，不影响数据读取与计算逻辑
-
----
-
-## [1.5.0] - 2026-07-09
-
-### 🐛 修复
- 修复有线充电功率计算单位错误（µV × µA 计算时少除 1000，导致功率放大 1000 倍，属于潜藏bug，外面看不出问题）
- 修复魅族 21 系列 `learned_cap` 因受 `status=Full` 限制导致容量未及时更新的问题
- `learned_cap` 优先级提升：在所有状态行中优先匹配，不再局限于 `status=Full`
-
-### ⚡ 优化
- 有线充电功率显示重构：
-  - 主界面：`≈{实际功率}w/{请求功率}w`（例：`≈30w/65w`）
-  - 二级页面：拆分为“请求档位”（`≈80w/L-10`）和“实际功率”（`≈30w`）两行
-  - USB 慢充保持 `≈7.5w` 不变
- UI 统一：
-  - 统一主界面与二级页面状态栏背景色
-  - 统一主界面与二级页面 AppBar 背景色为 `Colors.white`
-  - 状态栏图标保持深色（`Brightness.dark`）
-
-## 更早期日志请移步至项目Git Release页面查看
@@ -1,3 +0,0 @@
-description: This file stores settings for Dart & Flutter DevTools.
-documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
-extensions:
@@ -1,54 +0,0 @@
-/// 容量提取工具
-/// 支持两种日志格式：
-/// 1. learned_cap（21 系列）：单位 µAh，除以 1000 得到 mAh
-///    🟢 优先级最高，不受 status 限制（BMS 可能在任意状态行更新此值）
-/// 2. remaining_cap（20 系列）：仅从 status=Full 行提取，单位智能识别（µAh/mAh）
-class CapacityExtractor {
-  static int? extractCapacity(List<String> lines) {
-    final validLines = lines.where((line) => line.contains('tbat=')).toList();
-    if (validLines.isEmpty) return null;
-
-    // ============================================================
-    // 🟢 第一优先级：learned_cap（21 系列专属）
-    // 不限制 status，在所有有效行中搜索，取最新的一条
-    // ============================================================
-    final learnedReg = RegExp(r'learned_cap=(\d+)');
-    for (String line in validLines.reversed) {
-      final match = learnedReg.firstMatch(line);
-      if (match != null) {
-        final value = int.parse(match.group(1)!);
-        // learned_cap 单位固定为 µAh，直接除以 1000 转 mAh
-        return value ~/ 1000;
-      }
-    }
-
-    // ============================================================
-    // 🟢 第二优先级：remaining_cap（20 系列回退方案）
-    // 仅从 status=Full 行提取（充满状态下 BMS 最准确）
-    // ============================================================
-    final fullLines = validLines
-        .where((line) => line.contains('status=Full'))
-        .toList();
-    if (fullLines.isEmpty) return null;
-
-    final remainingReg = RegExp(r'remaining_cap=(\d+)');
-    int? maxRemaining;
-    for (String line in fullLines) {
-      final match = remainingReg.firstMatch(line);
-      if (match != null) {
-        final value = int.parse(match.group(1)!);
-        if (maxRemaining == null || value > maxRemaining) {
-          maxRemaining = value;
-        }
-      }
-    }
-    if (maxRemaining == null) return null;
-
-    // 🟢 智能单位识别：如果数值大于 100000（约 100 mAh），视为 µAh 需除以 1000
-    if (maxRemaining > 100000) {
-      return maxRemaining ~/ 1000;
-    } else {
-      return maxRemaining;
-    }
-  }
-}
@@ -1,140 +0,0 @@
-import 'dart:developer' as dev;
-import '../utils/time_utils.dart';
-
-/// 充电日志解析器
-class ChargeParser {
-  /// 解析充电数据，返回解析结果
-  static ParseResult parse(List<String> lines, DateTime? chargingStartTime) {
-    dev.log('[ChargeParser] 开始解析，共 ${lines.length} 行', name: 'BatteryHealth');
-
-    final validLines = _collectValidLines(lines, chargingStartTime);
-    if (validLines.isEmpty) {
-      dev.log('[ChargeParser] 无有效时间窗口内的数据行', name: 'BatteryHealth');
-      return ParseResult.empty();
-    }
-
-    // 按时间戳从新到旧排序
-    validLines.sort((a, b) => b['timestamp'].compareTo(a['timestamp']));
-    final latest = validLines.first;
-    final latestLine = latest['line'] as String;
-    final latestType = latest['type'] as String;
-
-    dev.log(
-      '[ChargeParser] 最新有效数据: $latestType, 时间: ${latest['timestamp']}',
-      name: 'BatteryHealth',
-    );
-
-    if (latestType == 'wls') {
-      return _parseWireless(latestLine);
-    } else {
-      return _parseWired(latestLine);
-    }
-  }
-
-  static List<Map<String, dynamic>> _collectValidLines(
-    List<String> lines,
-    DateTime? chargingStartTime,
-  ) {
-    final result = <Map<String, dynamic>>[];
-    for (String line in lines) {
-      final timestamp = TimeUtils.parseLogTimestamp(line);
-      if (!TimeUtils.isLogTimestampValid(timestamp, chargingStartTime)) {
-        continue;
-      }
-
-      final isUsb =
-          line.contains('chg_usb') &&
-          (line.contains('ibus=') || line.contains('real_type='));
-      final isWls = line.contains('chg_wls') && line.contains('wls_online=1');
-
-      if (isUsb || isWls) {
-        result.add({
-          'line': line,
-          'timestamp': timestamp,
-          'type': isWls ? 'wls' : 'usb',
-        });
-      }
-    }
-    return result;
-  }
-
-  static ParseResult _parseWireless(String line) {
-    final typeReg = RegExp(r'wls_type=(\w+)');
-    final voltReg = RegExp(r'wls_volt=(\d+)');
-    final currReg = RegExp(r'wls_curr=(\d+)');
-
-    final wlsType = typeReg.firstMatch(line)?.group(1);
-    final volt = int.parse(voltReg.firstMatch(line)?.group(1) ?? '0');
-    final curr = int.parse(currReg.firstMatch(line)?.group(1) ?? '0');
-
-    return ParseResult(
-      isWireless: true,
-      chargeType: wlsType ?? '无线',
-      power: (volt * curr) / 1000000.0,
-      volt: volt / 1000.0,
-      curr: curr / 1000.0,
-      wiredLevel: null,
-    );
-  }
-
-  static ParseResult _parseWired(String line) {
-    final ibusReg = RegExp(r'ibus=(\d+)');
-    final vbusReg = RegExp(r'vbus=(\d+)');
-    final levelReg = RegExp(r'wired_level=(\d+)');
-    final typeReg = RegExp(r'real_type=(\w+)');
-
-    final ibus = int.parse(ibusReg.firstMatch(line)?.group(1) ?? '0');
-    final vbus = int.parse(vbusReg.firstMatch(line)?.group(1) ?? '0');
-    final realType = typeReg.firstMatch(line)?.group(1);
-    final level = int.parse(levelReg.firstMatch(line)?.group(1) ?? '0');
-
-    String chargeType;
-    if (realType == 'PPS') {
-      chargeType = 'PPS';
-    } else if (realType == 'SDP' || realType == 'FLOAT') {
-      chargeType = 'SDP';
-    } else if (level >= 3) {
-      chargeType = 'PPS';
-    } else {
-      chargeType = 'SDP';
-    }
-
-    return ParseResult(
-      isWireless: false,
-      chargeType: chargeType,
-      power: (vbus * ibus) / 1000000000000.0,
-      volt: vbus / 1000000.0,
-      curr: ibus / 1000000.0,
-      wiredLevel: chargeType == 'PPS' ? level : null,
-    );
-  }
-}
-
-class ParseResult {
-  final bool isWireless;
-  final String chargeType;
-  final double power;
-  final double volt;
-  final double curr;
-  final int? wiredLevel;
-
-  ParseResult({
-    required this.isWireless,
-    required this.chargeType,
-    required this.power,
-    required this.volt,
-    required this.curr,
-    this.wiredLevel,
-  });
-
-  factory ParseResult.empty() {
-    return ParseResult(
-      isWireless: false,
-      chargeType: '',
-      power: 0.0,
-      volt: 0.0,
-      curr: 0.0,
-      wiredLevel: null,
-    );
-  }
-}
@@ -5,6 +5,7 @@ import 'services/saf_storage_service.dart';
 void main() async {
  WidgetsFlutterBinding.ensureInitialized();

+  // 🟢 初始化 SAF 服务
  await SafStorageService().init();

  runApp(const MyApp());
@@ -18,45 +19,9 @@ class MyApp extends StatelessWidget {
    return MaterialApp(
      title: '电池健康度',
      theme: ThemeData(
-        // 🟢 中文用 HarmonyOS Sans SC
        fontFamily: 'HarmonyOS_Sans_SC',
-        // 🟢 数字回退到 FlymeFont
-        fontFamilyFallback: const ['Flyme'],
-        // 🟢 统一文字颜色为黑色
        colorScheme: ColorScheme.fromSeed(
-          seedColor: const Color(0xFFFFFFFF),
-        ).copyWith(onSurface: Colors.black),
-        textTheme: const TextTheme(
-          // 大标题/数字（健康度、容量等）
-          displayMedium: TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            fontFamilyFallback: ['Flyme'],
-            color: Colors.black,
-          ),
-          // 标题（如“容量百分比变动趋势”）
-          headlineMedium: TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            fontFamilyFallback: ['Flyme'],
-            color: Colors.black,
-          ),
-          // 正文（电压、温度、循环次数等）
-          bodyMedium: TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            fontFamilyFallback: ['Flyme'],
-            color: Colors.black,
-          ),
-          // 小字（日期、辅助信息）
-          bodySmall: TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            fontFamilyFallback: ['Flyme'],
-            color: Colors.black87,
-          ),
-          // 数字专用（大号数字，如健康度百分比）
-          displayLarge: TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            fontFamilyFallback: ['Flyme'],
-            color: Colors.black,
-          ),
+          seedColor: const Color.fromARGB(255, 255, 255, 255),
        ),
        useMaterial3: true,
      ),
@@ -2,10 +2,11 @@
 class DeviceMatching {
  /// 根据机型返回设计容量（mAh）
  static int getDesignCapacity(String model) {
+    if (model.contains('22')) return 5510;
    if (model.contains('21 Pro')) return 5050;
    if (model.contains('21')) return 4800;
    if (model.contains('20 Pro')) return 5000;
-    if (model.contains('20 Inf')) return 4800;
+    if (model.contains('20 INFINITY')) return 4800;
    if (model.contains('20')) return 4700;
    if (model.contains('18s Pro')) return 4500;
    if (model.contains('18s')) return 4000;
@@ -28,10 +29,11 @@ class DeviceMatching {

  /// 根据机型返回显示名称
  static String getModelName(String model) {
+    if (model.contains('22')) return '魅族22';
    if (model.contains('21 Pro')) return '魅族21 Pro';
    if (model.contains('21')) return '魅族21';
    if (model.contains('20 Pro')) return '魅族20 Pro';
-    if (model.contains('20 Inf')) return '魅族20 Infinity';
+    if (model.contains('20 INFINITY')) return '魅族20 INFINITY';
    if (model.contains('20')) return '魅族20';
    if (model.contains('18s Pro')) return '魅族18s Pro';
    if (model.contains('18s')) return '魅族18s';
@@ -1,205 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart'; // 🟢 添加这一行
-import 'package:flutter/services.dart' show rootBundle;
-import 'package:flutter_markdown/flutter_markdown.dart';
-
-class ChangelogPage extends StatefulWidget {
-  const ChangelogPage({super.key});
-
-  @override
-  State<ChangelogPage> createState() => _ChangelogPageState();
-}
-
-class _ChangelogPageState extends State<ChangelogPage>
-    with SingleTickerProviderStateMixin {
-  // ---------- 数据 ----------
-  String _markdownContent = '';
-  bool _isLoading = true;
-  String? _error;
-  Widget? _cachedMarkdown;
-
-  // ---------- 滚动 ----------
-  final ScrollController _scrollController = ScrollController();
-  double _scrollProgress = 0.0;
-  bool _isScrolling = false;
-
-  // ---------- 呼吸动画（维持高刷感知） ----------
-  late AnimationController _breathController;
-  late Animation<double> _breathAnimation;
-
-  // ---------- 原生刷新率控制 ----------
-  // 🟢 改用 static final（不是 const）
-  static final _frameRateChannel = MethodChannel(
-    'com.lxh.battery_health/frame_rate',
-  );
-
-  // ---------- 生命周期 ----------
-  @override
-  void initState() {
-    super.initState();
-    _loadChangelog();
-
-    // 进入页面时申请高刷（原生层）
-    _frameRateChannel.invokeMethod('setHighRefreshRate');
-
-    // 呼吸动画：让进度条在滚动时轻微抖动，维持高刷感知
-    _breathController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 500),
-    )..repeat(reverse: true);
-
-    _breathAnimation = Tween<double>(begin: 0.0, end: 0.03).animate(
-      CurvedAnimation(parent: _breathController, curve: Curves.easeInOut),
-    );
-
-    _scrollController.addListener(() {
-      _updateProgress();
-      final isScrolling = _scrollController.position.isScrollingNotifier.value;
-      if (isScrolling != _isScrolling) {
-        setState(() {
-          _isScrolling = isScrolling;
-        });
-        if (isScrolling) {
-          _breathController.repeat(reverse: true);
-        } else {
-          _breathController.stop();
-          _breathController.reset();
-        }
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    // 离开页面时恢复默认刷新率
-    _frameRateChannel.invokeMethod('clearRefreshRate');
-
-    _scrollController.removeListener(_updateProgress);
-    _scrollController.dispose();
-    _breathController.dispose();
-    super.dispose();
-  }
-
-  // ---------- 方法 ----------
-  void _updateProgress() {
-    if (!_scrollController.hasClients) return;
-    final maxScroll = _scrollController.position.maxScrollExtent;
-    final currentScroll = _scrollController.position.pixels;
-    final progress = maxScroll > 0 ? currentScroll / maxScroll : 0.0;
-    setState(() {
-      _scrollProgress = progress;
-    });
-  }
-
-  Future<void> _loadChangelog() async {
-    try {
-      final content = await rootBundle.loadString('assets/CHANGELOG.md');
-      setState(() {
-        _markdownContent = content;
-        _isLoading = false;
-        _cachedMarkdown = _buildMarkdown(content);
-      });
-    } catch (e) {
-      setState(() {
-        _error = '无法加载更新日志: $e';
-        _isLoading = false;
-      });
-    }
-  }
-
-  Widget _buildMarkdown(String content) {
-    return Markdown(
-      data: content,
-      shrinkWrap: true,
-      physics: const NeverScrollableScrollPhysics(),
-      styleSheet: MarkdownStyleSheet(
-        h1: const TextStyle(
-          fontFamily: 'HarmonyOS_Sans_SC',
-          fontSize: 24,
-          fontWeight: FontWeight.w700,
-          color: Colors.black,
-        ),
-        h2: const TextStyle(
-          fontFamily: 'HarmonyOS_Sans_SC',
-          fontSize: 20,
-          fontWeight: FontWeight.w600,
-          color: Colors.black87,
-        ),
-        h3: const TextStyle(
-          fontFamily: 'HarmonyOS_Sans_SC',
-          fontSize: 18,
-          fontWeight: FontWeight.w600,
-          color: Colors.black87,
-        ),
-        p: const TextStyle(
-          fontFamily: 'HarmonyOS_Sans_SC',
-          fontSize: 16,
-          color: Colors.black87,
-        ),
-        listBullet: const TextStyle(
-          fontFamily: 'HarmonyOS_Sans_SC',
-          fontSize: 16,
-          color: Colors.black87,
-        ),
-        code: const TextStyle(
-          fontFamily: 'HarmonyOS_Sans_SC',
-          fontSize: 14,
-          color: Colors.black87,
-          backgroundColor: Color(0xFFF5F5F5),
-        ),
-      ),
-    );
-  }
-
-  // ---------- Build ----------
-  @override
-  Widget build(BuildContext context) {
-    final breathOffset = _isScrolling ? _breathAnimation.value : 0.0;
-    final displayProgress = (_scrollProgress + breathOffset).clamp(0.0, 1.0);
-
-    return Scaffold(
-      backgroundColor: Colors.white,
-      appBar: AppBar(
-        title: const Text(
-          '更新日志',
-          style: TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            color: Colors.black,
-          ),
-        ),
-        backgroundColor: Colors.white,
-        elevation: 0,
-        foregroundColor: Colors.black,
-        iconTheme: const IconThemeData(color: Colors.black),
-        bottom: PreferredSize(
-          preferredSize: const Size.fromHeight(2.0),
-          child: LinearProgressIndicator(
-            value: displayProgress,
-            backgroundColor: Colors.grey.shade200,
-            valueColor: const AlwaysStoppedAnimation<Color>(
-              Color.fromRGBO(157, 212, 237, 1.0),
-            ),
-            minHeight: 2.0,
-          ),
-        ),
-      ),
-      body: _isLoading
-          ? const Center(child: CircularProgressIndicator())
-          : _error != null
-          ? Center(
-              child: Text(
-                _error!,
-                style: const TextStyle(
-                  fontFamily: 'HarmonyOS_Sans_SC',
-                  color: Colors.grey,
-                ),
-              ),
-            )
-          : SingleChildScrollView(
-              controller: _scrollController,
-              padding: const EdgeInsets.all(16.0),
-              child: _cachedMarkdown ?? const SizedBox.shrink(),
-            ),
-    );
-  }
-}
@@ -1,107 +0,0 @@
-import 'dart:developer' as dev;
-import '../services/database_service.dart';
-import '../logic/capacity_extractor.dart';
-import '../models/saf_permission_state.dart';
-import '../services/saf_storage_service.dart';
-
-/// 电池数据服务：扫描日志、更新数据库
-class BatteryDataService {
-  final SafStorageService _safService = SafStorageService();
-  final DatabaseService _dbService = DatabaseService();
-
-  /// 扫描所有日志文件并更新数据库
-  Future<void> scanAndUpdateDB() async {
-    dev.log('🔵 scanAndUpdateDB 开始', name: 'BatteryHealth');
-
-    final state = await _safService.getPermissionState();
-    if (state != SafPermissionState.authorized) {
-      dev.log('🔵 scanAndUpdateDB: 未授权', name: 'BatteryHealth');
-      return;
-    }
-
-    try {
-      final files = await _safService.listFiles();
-      final filePattern = RegExp(r'mbattery_charger_log_(\d{4}_\d{2}_\d{2})$');
-
-      for (String fileName in files) {
-        final match = filePattern.firstMatch(fileName);
-        if (match == null) continue;
-
-        final dateStr = match.group(1)!.replaceAll('_', '-');
-        dev.log('🔵 处理文件: $fileName, 日期: $dateStr', name: 'BatteryHealth');
-
-        try {
-          final lines = await _safService.readLogFile(fileName);
-          if (lines.isEmpty) continue;
-
-          // 🟢 1.4.5 改进：使用 CapacityExtractor 提取容量（仅从 Full 状态提取）
-          int? cap = CapacityExtractor.extractCapacity(lines);
-
-          // 🟢 如果今天没有充满电（cap == null），尝试从昨天复制数据
-          if (cap == null) {
-            dev.log('🔵 日期 $dateStr 无充满记录，尝试复制前一天数据', name: 'BatteryHealth');
-
-            // 查询最近一条已有数据
-            final recentData = await _dbService.queryRecentData(1);
-            if (recentData.isNotEmpty) {
-              final yesterdayCap = recentData.first['capacity'] as int;
-              final yesterdayMaxVolt =
-                  recentData.first['volt_max'] as double? ?? 0.0;
-              final yesterdayMinVolt =
-                  recentData.first['volt_min'] as double? ?? 0.0;
-
-              dev.log(
-                '🔵 复制前一天数据: cap=$yesterdayCap, date=$dateStr',
-                name: 'BatteryHealth',
-              );
-
-              // 🟢 复制昨天的容量和电压极值到今天
-              await _dbService.insertOrUpdate(
-                dateStr,
-                yesterdayCap,
-                yesterdayMaxVolt,
-                yesterdayMinVolt,
-              );
-            } else {
-              dev.log('🔵 无历史数据可复制，跳过日期 $dateStr', name: 'BatteryHealth');
-            }
-            continue; // 已处理，跳过后续电压提取逻辑
-          }
-
-          // 提取电压极值（从所有有效行提取，不限于 Full）
-          final voltReg = RegExp(r'vbat=(\d+)');
-          double? maxVolt, minVolt;
-          for (String line in lines) {
-            if (!line.contains('tbat=')) continue;
-            final match = voltReg.firstMatch(line);
-            if (match != null) {
-              final v = int.parse(match.group(1)!) / 1000000;
-              if (maxVolt == null || v > maxVolt) maxVolt = v;
-              if (minVolt == null || v < minVolt) minVolt = v;
-            }
-          }
-          if (maxVolt == null || minVolt == null) continue;
-
-          await _dbService.insertOrUpdate(dateStr, cap, maxVolt, minVolt);
-          dev.log('🔵 插入数据库: $dateStr, cap=$cap', name: 'BatteryHealth');
-        } catch (e) {
-          dev.log('🔵 处理文件 $fileName 异常: $e', name: 'BatteryHealth');
-        }
-      }
-    } catch (e) {
-      dev.log('🔵 scanAndUpdateDB 异常: $e', name: 'BatteryHealth');
-    }
-  }
-
-  /// 获取趋势数据（最近 N 天）
-  Future<List<Map<String, dynamic>>> getTrendData(int days) async {
-    return await _dbService.queryRecentData(days);
-  }
-
-  /// 获取最近一条数据
-  Future<Map<String, dynamic>?> getLatestData() async {
-    final data = await _dbService.queryRecentData(1);
-    if (data.isNotEmpty) return data.first;
-    return null;
-  }
-}
@@ -1,130 +0,0 @@
-import 'dart:developer' as dev;
-import 'package:sqflite/sqflite.dart';
-import 'package:path/path.dart';
-
-/// 数据库服务：管理电池数据持久化
-class DatabaseService {
-  static Database? _database;
-  static const String _tableName = 'battery_data';
-
-  /// 获取数据库实例（单例）
-  Future<Database> get database async {
-    if (_database != null) return _database!;
-    _database = await _initDatabase();
-    return _database!;
-  }
-
-  /// 初始化数据库
-  Future<Database> _initDatabase() async {
-    final dbPath = await getDatabasesPath();
-    final path = join(dbPath, 'battery_health.db');
-
-    return await openDatabase(
-      path,
-      version: 1,
-      onCreate: (db, version) async {
-        await db.execute('''
-          CREATE TABLE $_tableName (
-            date TEXT PRIMARY KEY,
-            capacity INTEGER NOT NULL,
-            volt_max REAL NOT NULL,
-            volt_min REAL NOT NULL,
-            updated_at TEXT NOT NULL
-          )
-        ''');
-        await db.execute('''
-          CREATE INDEX idx_date ON $_tableName (date DESC)
-        ''');
-        dev.log('✅ 数据库表创建成功', name: 'DatabaseService');
-      },
-    );
-  }
-
-  /// 插入或更新数据
-  Future<void> insertOrUpdate(
-    String date,
-    int capacity,
-    double voltMax,
-    double voltMin,
-  ) async {
-    final db = await database;
-    final now = DateTime.now().toIso8601String();
-
-    await db.insert(_tableName, {
-      'date': date,
-      'capacity': capacity,
-      'volt_max': voltMax,
-      'volt_min': voltMin,
-      'updated_at': now,
-    }, conflictAlgorithm: ConflictAlgorithm.replace);
-    dev.log('📝 数据已保存: $date, cap=$capacity', name: 'DatabaseService');
-  }
-
-  /// 查询最近 N 条数据（按日期倒序）
-  Future<List<Map<String, dynamic>>> queryRecentData(int limit) async {
-    final db = await database;
-    try {
-      final result = await db.query(
-        _tableName,
-        orderBy: 'date DESC',
-        limit: limit,
-      );
-      return result;
-    } catch (e) {
-      dev.log('⚠️ 查询数据失败: $e', name: 'DatabaseService');
-      return [];
-    }
-  }
-
-  /// 🟢 1.4.5 新增：查询指定日期数据
-  Future<Map<String, dynamic>?> queryByDate(String date) async {
-    final db = await database;
-    try {
-      final result = await db.query(
-        _tableName,
-        where: 'date = ?',
-        whereArgs: [date],
-      );
-      return result.isNotEmpty ? result.first : null;
-    } catch (e) {
-      dev.log('⚠️ 查询单日数据失败: $e', name: 'DatabaseService');
-      return null;
-    }
-  }
-
-  /// 删除指定日期数据
-  Future<void> deleteByDate(String date) async {
-    final db = await database;
-    await db.delete(_tableName, where: 'date = ?', whereArgs: [date]);
-  }
-
-  /// 获取数据库中所有日期列表
-  Future<List<String>> getAllDates() async {
-    final db = await database;
-    try {
-      final result = await db.query(
-        _tableName,
-        columns: ['date'],
-        orderBy: 'date DESC',
-      );
-      return result.map((row) => row['date'] as String).toList();
-    } catch (e) {
-      return [];
-    }
-  }
-
-  /// 清空所有数据
-  Future<void> clearAll() async {
-    final db = await database;
-    await db.delete(_tableName);
-    dev.log('🗑️ 所有数据已清空', name: 'DatabaseService');
-  }
-
-  /// 关闭数据库
-  Future<void> close() async {
-    if (_database != null) {
-      await _database!.close();
-      _database = null;
-    }
-  }
-}
@@ -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 "识别中...";
    }
@@ -1,46 +0,0 @@
-class TimeUtils {
-  /// 解析日志行中的时间戳，强制解析为 UTC
-  static DateTime? parseLogTimestamp(String line) {
-    final reg = RegExp(r'\[(\d{4}-\d{2}-\d{2}) (\d{2}:\d{2}:\d{2})\]');
-    final match = reg.firstMatch(line);
-    if (match == null) return null;
-    try {
-      final dateParts = match.group(1)!.split('-');
-      final timeParts = match.group(2)!.split(':');
-      return DateTime.utc(
-        int.parse(dateParts[0]),
-        int.parse(dateParts[1]),
-        int.parse(dateParts[2]),
-        int.parse(timeParts[0]),
-        int.parse(timeParts[1]),
-        int.parse(timeParts[2]),
-      );
-    } catch (_) {
-      return null;
-    }
-  }
-
-  /// 判断日志时间戳是否在有效窗口内
-  static bool isLogTimestampValid(
-    DateTime? logTime,
-    DateTime? chargingStartTime,
-  ) {
-    if (logTime == null) return false;
-    if (chargingStartTime == null) {
-      final nowUtc = DateTime.now().toUtc();
-      final diff = nowUtc.difference(logTime);
-      return diff.abs().inMinutes <= 3;
-    }
-    final endTime = chargingStartTime.add(const Duration(minutes: 3));
-    return logTime.isAfter(chargingStartTime) && logTime.isBefore(endTime);
-  }
-
-  /// 生成今日日志文件名（UTC）
-  static String getTodayFileName() {
-    final nowUtc = DateTime.now().toUtc();
-    final year = nowUtc.year.toString();
-    final month = nowUtc.month.toString().padLeft(2, '0');
-    final day = nowUtc.day.toString().padLeft(2, '0');
-    return 'mbattery_charger_log_${year}_${month}_$day';
-  }
-}
@@ -1,151 +0,0 @@
-import 'package:flutter/material.dart';
-import '../widgets/trend_chart.dart';
-import '../widgets/battery_summary.dart';
-import '../widgets/battery_info_panel.dart';
-import '../widgets/charge_entry.dart';
-import '../widgets/charge_detail_page.dart';
-
-/// 电池数据布局（含数据展示、趋势图、充电状态、电压温度面板）
-class BatteryDataLayout extends StatelessWidget {
-  final String deviceModel;
-  final double healthPercent;
-  final int cycleCount;
-  final double currentCap;
-  final int designCap;
-  final List<Map<String, dynamic>> trendData;
-  final bool isCharging;
-  final String chargeSummary;
-  final double batteryVolt;
-  final double batteryTemp;
-  final double maxVolt;
-  final double minVolt;
-  final double maxTemp;
-  final double minTemp;
-  final String chargeType;
-  final bool isWireless;
-  final double chargePower;
-  final double chargeVolt;
-  final double chargeCurr;
-  final int? wiredLevel;
-
-  const BatteryDataLayout({
-    super.key,
-    required this.deviceModel,
-    required this.healthPercent,
-    required this.cycleCount,
-    required this.currentCap,
-    required this.designCap,
-    required this.trendData,
-    required this.isCharging,
-    required this.chargeSummary,
-    required this.batteryVolt,
-    required this.batteryTemp,
-    required this.maxVolt,
-    required this.minVolt,
-    required this.maxTemp,
-    required this.minTemp,
-    required this.chargeType,
-    required this.isWireless,
-    required this.chargePower,
-    required this.chargeVolt,
-    required this.chargeCurr,
-    this.wiredLevel,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(20.0),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            deviceModel,
-            style: const TextStyle(
-              fontSize: 14,
-              color: Colors.grey,
-              fontWeight: FontWeight.w400,
-            ),
-          ),
-          const SizedBox(height: 4),
-
-          BatterySummary(
-            healthPercent: healthPercent,
-            cycleCount: cycleCount,
-            currentCap: currentCap,
-            designCap: designCap,
-          ),
-
-          const SizedBox(height: 24),
-
-          TrendChart(data: trendData, designCap: designCap),
-
-          const SizedBox(height: 8),
-
-          // 充电状态 + 信息面板（带进场动画）
-          _buildChargeAndInfoPanel(context),
-
-          const Spacer(),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildChargeAndInfoPanel(BuildContext context) {
-    return Column(
-      children: [
-        // 充电状态入口（保持原有的透明度/位移动画由父级控制）
-        ChargeEntry(
-          summary: chargeSummary,
-          isCharging: isCharging,
-          onTap: () {
-            if (isCharging) {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => ChargeDetailPage(
-                    chargeType: chargeType,
-                    isWireless: isWireless,
-                    power: chargePower,
-                    volt: chargeVolt,
-                    curr: chargeCurr,
-                    wiredLevel: wiredLevel,
-                  ),
-                ),
-              );
-            }
-          },
-        ),
-        const SizedBox(height: 4),
-        BatteryInfoPanel(
-          batteryVolt: batteryVolt,
-          batteryTemp: batteryTemp,
-          maxVolt: maxVolt,
-          minVolt: minVolt,
-          maxTemp: maxTemp,
-          minTemp: minTemp,
-        ),
-      ],
-    );
-  }
-}
-
-/// 空状态布局（无数据时显示）
-class EmptyStateLayout extends StatelessWidget {
-  const EmptyStateLayout({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return const Center(
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Icon(Icons.battery_unknown, size: 64, color: Colors.grey),
-          SizedBox(height: 16),
-          Text('暂无数据', style: TextStyle(fontSize: 18, color: Colors.grey)),
-          Text('点击右上角刷新尝试', style: TextStyle(fontSize: 14, color: Colors.grey)),
-        ],
-      ),
-    );
-  }
-}
@@ -1,194 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-
-class BatteryInfoPanel extends StatelessWidget {
-  final double batteryVolt;
-  final double batteryTemp;
-  final double maxVolt;
-  final double minVolt;
-  final double maxTemp;
-  final double minTemp;
-
-  const BatteryInfoPanel({
-    super.key,
-    required this.batteryVolt,
-    required this.batteryTemp,
-    required this.maxVolt,
-    required this.minVolt,
-    required this.maxTemp,
-    required this.minTemp,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildInfoItem(
-                _buildIcon('voltage'),
-                '电压',
-                '${batteryVolt.toStringAsFixed(3)}V',
-              ),
-              const SizedBox(height: 8),
-              Row(
-                children: [
-                  RichText(
-                    text: TextSpan(
-                      style: TextStyle(
-                        fontFamily: 'Flyme',
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                        color: Colors.red,
-                      ),
-                      children: [
-                        const TextSpan(
-                          text: '↑ ',
-                          style: TextStyle(
-                            fontFamily: 'HarmonyOS_Sans_SC',
-                            color: Colors.red,
-                          ),
-                        ),
-                        TextSpan(text: '${maxVolt.toStringAsFixed(3)}V'),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(width: 12),
-                  RichText(
-                    text: TextSpan(
-                      style: TextStyle(
-                        fontFamily: 'Flyme',
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                        color: Colors.blue,
-                      ),
-                      children: [
-                        const TextSpan(
-                          text: '↓ ',
-                          style: TextStyle(
-                            fontFamily: 'HarmonyOS_Sans_SC',
-                            color: Colors.blue,
-                          ),
-                        ),
-                        TextSpan(text: '${minVolt.toStringAsFixed(3)}V'),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ],
-          ),
-        ),
-        Expanded(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildInfoItem(
-                _buildIcon('temperature'),
-                '温度',
-                '${batteryTemp.toStringAsFixed(0)}℃',
-              ),
-              const SizedBox(height: 8),
-              Row(
-                children: [
-                  RichText(
-                    text: TextSpan(
-                      style: TextStyle(
-                        fontFamily: 'Flyme',
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                        color: Colors.red,
-                      ),
-                      children: [
-                        const TextSpan(
-                          text: '↑ ',
-                          style: TextStyle(
-                            fontFamily: 'HarmonyOS_Sans_SC',
-                            color: Colors.red,
-                          ),
-                        ),
-                        TextSpan(text: '${maxTemp.toStringAsFixed(0)}℃'),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(width: 12),
-                  RichText(
-                    text: TextSpan(
-                      style: TextStyle(
-                        fontFamily: 'Flyme',
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                        color: Colors.blue,
-                      ),
-                      children: [
-                        const TextSpan(
-                          text: '↓ ',
-                          style: TextStyle(
-                            fontFamily: 'HarmonyOS_Sans_SC',
-                            color: Colors.blue,
-                          ),
-                        ),
-                        TextSpan(text: '${minTemp.toStringAsFixed(0)}℃'),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildIcon(String type) {
-    switch (type) {
-      case 'voltage':
-        return SvgPicture.asset(
-          'assets/icons/si--lightning-fill.svg',
-          width: 18,
-          height: 18,
-          colorFilter: const ColorFilter.mode(Colors.grey, BlendMode.srcIn),
-        );
-      case 'temperature':
-        return SvgPicture.asset(
-          'assets/icons/mdi--temperature.svg',
-          width: 18,
-          height: 18,
-          colorFilter: const ColorFilter.mode(Colors.grey, BlendMode.srcIn),
-        );
-      default:
-        return const Icon(Icons.help_outline, size: 18, color: Colors.grey);
-    }
-  }
-
-  Widget _buildInfoItem(Widget icon, String label, String value) {
-    return Row(
-      children: [
-        icon,
-        const SizedBox(width: 6),
-        Text(
-          label,
-          style: const TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            fontSize: 14,
-            color: Colors.grey,
-          ),
-        ),
-        const SizedBox(width: 6),
-        Text(
-          value,
-          style: const TextStyle(
-            fontFamily: 'Flyme',
-            fontSize: 16,
-            fontWeight: FontWeight.w500,
-            color: Colors.black,
-          ),
-        ),
-      ],
-    );
-  }
-}
@@ -1,115 +0,0 @@
-import 'package:flutter/material.dart';
-
-class BatterySummary extends StatelessWidget {
-  final double healthPercent;
-  final int cycleCount;
-  final double currentCap;
-  final int designCap;
-
-  const BatterySummary({
-    super.key,
-    required this.healthPercent,
-    required this.cycleCount,
-    required this.currentCap,
-    required this.designCap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final bool isLowHealth = healthPercent < 70;
-
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.end,
-      children: [
-        // 健康度大数字
-        Row(
-          crossAxisAlignment: CrossAxisAlignment.baseline,
-          textBaseline: TextBaseline.alphabetic,
-          children: [
-            Text(
-              healthPercent.toStringAsFixed(1),
-              style: TextStyle(
-                fontFamily: 'Flyme',
-                fontSize: 40,
-                fontWeight: FontWeight.w500,
-                height: 1.0,
-                color: isLowHealth ? Colors.red : Colors.black,
-              ),
-            ),
-            const SizedBox(width: 2),
-            Text(
-              '%',
-              style: TextStyle(
-                fontFamily: 'Flyme',
-                fontSize: 20,
-                fontWeight: FontWeight.w300,
-                height: 1.0,
-                color: isLowHealth ? Colors.red : Colors.grey.shade600,
-              ),
-            ),
-          ],
-        ),
-        const Spacer(),
-        // cycles + mAh
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.end,
-          children: [
-            RichText(
-              text: TextSpan(
-                style: TextStyle(
-                  fontFamily: 'Flyme',
-                  fontSize: 16,
-                  fontWeight: FontWeight.w500,
-                  height: 1.2,
-                  color: Colors.black,
-                ),
-                children: [
-                  TextSpan(text: '$cycleCount'),
-                  TextSpan(
-                    text: ' cycles',
-                    style: const TextStyle(
-                      fontFamily: 'HarmonyOS_Sans_SC',
-                      color: Colors.black,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(height: 4),
-            RichText(
-              text: TextSpan(
-                style: TextStyle(
-                  fontFamily: 'Flyme',
-                  fontSize: 20,
-                  fontWeight: FontWeight.w300,
-                  height: 1.0,
-                  color: const Color(0xFF5F5F5F),
-                ),
-                children: [
-                  TextSpan(text: currentCap.toStringAsFixed(0)),
-                  TextSpan(
-                    text: ' / ',
-                    style: TextStyle(
-                      fontFamily: 'HarmonyOS_Sans_SC',
-                      color: const Color(0xFF5F5F5F).withValues(alpha: 0.5),
-                    ),
-                  ),
-                  TextSpan(text: designCap.toString()),
-                  TextSpan(
-                    text: ' mAh',
-                    style: const TextStyle(
-                      fontFamily: 'HarmonyOS_Sans_SC',
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                      color: Color(0xFF5F5F5F),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import '../utils/charge_utils.dart';

+/// 充电详情页
 class ChargeDetailPage extends StatelessWidget {
  final String chargeType;
  final bool isWireless;
@@ -20,91 +20,62 @@ class ChargeDetailPage extends StatelessWidget {
    this.wiredLevel,
  });

+  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 快充';
-    if (chargeType == 'SDP') return 'USB 充电';
+    if (chargeType == 'SDP') return 'USB 充电'; // 🟢 改成和主页面一致
    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>(
-      value: const SystemUiOverlayStyle(
-        statusBarColor: Color.fromRGBO(157, 212, 237, 0.1),
-        statusBarIconBrightness: Brightness.dark,
-        statusBarBrightness: Brightness.dark,
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('充电详情'),
+        backgroundColor: const Color.fromARGB(0, 255, 255, 255),
+        elevation: 0,
+        foregroundColor: Colors.black,
+        iconTheme: const IconThemeData(color: Colors.black),
      ),
-      child: Scaffold(
-        backgroundColor: Colors.white,
-        appBar: AppBar(
-          title: const Text('充电详情'),
-          backgroundColor: Colors.white,
-          elevation: 0,
-          scrolledUnderElevation: 0,
-          shadowColor: Colors.transparent,
-          surfaceTintColor: Colors.transparent,
-          foregroundColor: Colors.black,
-          iconTheme: const IconThemeData(color: Colors.black),
-        ),
-        body: Padding(
-          padding: const EdgeInsets.all(20.0),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildTextRow('协议', _getProtocolDisplay()),
-              const Divider(),
-
-              if (!isWireless) ...[
-                _buildTextRow('标定档位', _getRequestedDisplay()),
-                const Divider(),
-                _buildTextRow('实际功率', _getActualDisplay()),
-                const Divider(),
-              ] else ...[
-                _buildTextRow('功率', ChargeUtils.getDisplayPowerWireless(power)),
-                const Divider(),
-              ],
-
-              _buildDetailRow('电压', volt, 'V'),
-              const Divider(),
-              _buildDetailRow('电流', curr, 'A'),
-              const Divider(),
-
-              if (isWireless) _buildTextRow('类型', '无线'),
-              if (!isWireless && wiredLevel == null) _buildTextRow('档位', '自动'),
-
-              const Spacer(),
-              Center(
-                child: Text(
-                  '数据来自 BMS 实时日志',
-                  style: TextStyle(
-                    fontFamily: 'HarmonyOS_Sans_SC',
-                    fontSize: 12,
-                    color: Colors.grey.shade500,
-                  ),
-                ),
+      body: Padding(
+        padding: const EdgeInsets.all(20.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildDetailRow('协议', _getProtocolDisplay()),
+            const Divider(),
+            _buildDetailRow('功率', _getDisplayPower()),
+            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('类型', '无线'),
+            const Spacer(),
+            Center(
+              child: Text(
+                '数据来自 BMS 实时日志',
+                style: TextStyle(fontSize: 12, color: Colors.grey.shade500),
              ),
-            ],
-          ),
+            ),
+          ],
        ),
      ),
    );
  }

-  /// 纯文本行（协议、功率、档位等）
-  Widget _buildTextRow(String label, String value) {
+  Widget _buildDetailRow(String label, String value) {
    return Padding(
      padding: const EdgeInsets.symmetric(vertical: 6.0),
      child: Row(
@@ -113,7 +84,6 @@ class ChargeDetailPage extends StatelessWidget {
          Text(
            label,
            style: const TextStyle(
-              fontFamily: 'HarmonyOS_Sans_SC',
              fontSize: 16,
              fontWeight: FontWeight.w400,
              color: Colors.grey,
@@ -122,7 +92,6 @@ class ChargeDetailPage extends StatelessWidget {
          Text(
            value,
            style: const TextStyle(
-              fontFamily: 'HarmonyOS_Sans_SC', // 复杂字符串保持 Harmony
              fontSize: 16,
              fontWeight: FontWeight.w500,
              color: Colors.black87,
@@ -132,44 +101,4 @@ class ChargeDetailPage extends StatelessWidget {
      ),
    );
  }
-
-  /// 数值行（电压/电流，数字用 Flyme，单位用 Harmony）
-  Widget _buildDetailRow(String label, double value, String unit) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 6.0),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            label,
-            style: const TextStyle(
-              fontFamily: 'HarmonyOS_Sans_SC',
-              fontSize: 16,
-              fontWeight: FontWeight.w400,
-              color: Colors.grey,
-            ),
-          ),
-          RichText(
-            text: TextSpan(
-              style: const TextStyle(
-                fontSize: 16,
-                fontWeight: FontWeight.w500,
-                color: Colors.black87,
-              ),
-              children: [
-                TextSpan(
-                  text: value.toStringAsFixed(2),
-                  style: const TextStyle(fontFamily: 'Flyme'), // 🟢 数字用 Flyme
-                ),
-                TextSpan(
-                  text: unit,
-                  style: const TextStyle(fontFamily: 'HarmonyOS_Sans_SC'),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
 }
@@ -1,58 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ChargeEntry extends StatelessWidget {
-  final String summary;
-  final bool isCharging;
-  final VoidCallback onTap;
-
-  const ChargeEntry({
-    super.key,
-    required this.summary,
-    required this.isCharging,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: isCharging ? onTap : null,
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            summary,
-            style: const TextStyle(
-              fontFamily: 'HarmonyOS_Sans_SC', // 🟢 混合文本用 Harmony
-              fontSize: 16,
-              fontWeight: FontWeight.w500,
-              color: Colors.black87,
-            ),
-          ),
-          Row(
-            children: [
-              Text(
-                '充电信息',
-                style: TextStyle(
-                  fontFamily: 'HarmonyOS_Sans_SC',
-                  fontSize: 16,
-                  fontWeight: FontWeight.w500,
-                  color: Colors.grey.shade700,
-                ),
-              ),
-              const SizedBox(width: 4),
-              Text(
-                '>',
-                style: TextStyle(
-                  fontFamily: 'HarmonyOS_Sans_SC',
-                  fontSize: 16,
-                  fontWeight: FontWeight.w500,
-                  color: Colors.grey.shade700,
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}
@@ -1,234 +0,0 @@
-import 'package:flutter/material.dart';
-
-// --- 潘通色定义 ---
-const Color kHealthGreen = Color(0xFF00B140);
-const Color kHealthYellow = Color(0xFFEFDF00);
-const Color kHealthOrange = Color(0xFFD75A16);
-
-/// 趋势图柱状图组件
-class TrendChart extends StatelessWidget {
-  final List<Map<String, dynamic>> data;
-  final int designCap;
-
-  const TrendChart({super.key, required this.data, required this.designCap});
-
-  @override
-  Widget build(BuildContext context) {
-    List<Map<String, dynamic>> displayData = data.isNotEmpty
-        ? data
-        : _getMockData();
-
-    List<String> dates = displayData.map((e) {
-      String date = e['date'] as String;
-      var parts = date.split('-');
-      return '${parts[1]}/${parts[2]}';
-    }).toList();
-
-    List<double> percents = displayData.map((e) {
-      int cap = e['capacity'] as int;
-      return (cap / designCap) * 100;
-    }).toList();
-
-    while (percents.length < 15) {
-      percents.insert(0, 0);
-      dates.insert(0, '');
-    }
-    if (percents.length > 15) {
-      percents = percents.sublist(percents.length - 15);
-      dates = dates.sublist(dates.length - 15);
-    }
-
-    int todayIndex = percents.length - 1;
-    int sevenDaysAgoIndex = todayIndex - 7;
-    bool showSevenDaysAgo = sevenDaysAgoIndex >= 0;
-
-    String sevenDaysAgoDate = showSevenDaysAgo ? dates[sevenDaysAgoIndex] : '';
-    String todayDate = dates[todayIndex];
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const Text(
-          '容量百分比变动趋势（近15天）',
-          style: TextStyle(
-            fontFamily: 'HarmonyOS_Sans_SC',
-            fontSize: 16,
-            fontWeight: FontWeight.w500,
-          ),
-        ),
-        const SizedBox(height: 8),
-        Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            SizedBox(
-              height: 180,
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: const [
-                  Text(
-                    '100',
-                    style: TextStyle(
-                      fontFamily: 'Flyme',
-                      fontSize: 10,
-                      color: Colors.grey,
-                      height: 1.0,
-                    ),
-                  ),
-                  Text(
-                    '70',
-                    style: TextStyle(
-                      fontFamily: 'Flyme',
-                      fontSize: 10,
-                      color: Colors.grey,
-                      height: 1.0,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(width: 4),
-            Expanded(
-              child: LayoutBuilder(
-                builder: (context, constraints) {
-                  double totalWidth = constraints.maxWidth;
-                  double step = totalWidth / 15;
-
-                  return SizedBox(
-                    height: 180,
-                    child: Stack(
-                      children: [
-                        Padding(
-                          padding: const EdgeInsets.only(bottom: 20),
-                          child: Row(
-                            crossAxisAlignment: CrossAxisAlignment.end,
-                            children: List.generate(percents.length, (index) {
-                              double value = percents[index];
-                              Color barColor;
-                              if (value > 0) {
-                                if (value >= 80) {
-                                  barColor = kHealthGreen;
-                                } else if (value >= 70) {
-                                  barColor = kHealthYellow;
-                                } else {
-                                  barColor = Colors.red;
-                                }
-                              } else {
-                                barColor = Colors.grey.shade300;
-                              }
-                              double clampedValue = value.clamp(70.0, 100.0);
-                              double heightFactor =
-                                  (clampedValue - 70.0) / 30.0;
-
-                              return Expanded(
-                                child: Align(
-                                  alignment: Alignment.bottomCenter,
-                                  child: Container(
-                                    margin: const EdgeInsets.symmetric(
-                                      horizontal: 2,
-                                    ),
-                                    height: 20 + (100 * heightFactor),
-                                    width: 18,
-                                    decoration: BoxDecoration(
-                                      color: barColor,
-                                      borderRadius: BorderRadius.circular(4),
-                                    ),
-                                  ),
-                                ),
-                              );
-                            }),
-                          ),
-                        ),
-                        if (showSevenDaysAgo && sevenDaysAgoDate.isNotEmpty)
-                          Positioned(
-                            left: sevenDaysAgoIndex * step + (step / 2) - 14,
-                            bottom: 2,
-                            child: Text(
-                              sevenDaysAgoDate,
-                              style: const TextStyle(
-                                fontFamily: 'HarmonyOS_Sans_SC',
-                                fontSize: 9,
-                                color: Colors.grey,
-                                height: 1.0,
-                              ),
-                            ),
-                          ),
-                        if (todayDate.isNotEmpty)
-                          Positioned(
-                            left: todayIndex * step + (step / 2) - 14,
-                            bottom: 2,
-                            child: Text(
-                              todayDate,
-                              style: const TextStyle(
-                                fontFamily: 'HarmonyOS_Sans_SC',
-                                fontSize: 9,
-                                color: Colors.black,
-                                height: 1.0,
-                                fontWeight: FontWeight.w600,
-                              ),
-                            ),
-                          ),
-                      ],
-                    ),
-                  );
-                },
-              ),
-            ),
-          ],
-        ),
-        if (percents.every((v) => v == 0))
-          const Padding(
-            padding: EdgeInsets.only(top: 8.0),
-            child: Text(
-              '暂无历史数据，请点击刷新按钮更新',
-              style: TextStyle(
-                fontFamily: 'HarmonyOS_Sans_SC',
-                fontSize: 12,
-                color: Colors.grey,
-              ),
-            ),
-          ),
-      ],
-    );
-  }
-
-  List<Map<String, dynamic>> _getMockData() {
-    List<String> mockDates = [
-      '2026-06-14',
-      '2026-06-15',
-      '2026-06-16',
-      '2026-06-17',
-      '2026-06-18',
-      '2026-06-19',
-      '2026-06-20',
-      '2026-06-21',
-      '2026-06-22',
-      '2026-06-23',
-      '2026-06-24',
-      '2026-06-25',
-      '2026-06-26',
-      '2026-06-27',
-      '2026-06-28',
-    ];
-    List<int> mockCap = [
-      4635,
-      4632,
-      4628,
-      4625,
-      4620,
-      4618,
-      4615,
-      4610,
-      4608,
-      4605,
-      4600,
-      4598,
-      4595,
-      4590,
-      4585,
-    ];
-    return List.generate(
-      15,
-      (i) => {'date': mockDates[i], 'capacity': mockCap[i]},
-    );
-  }
-}
@@ -126,14 +126,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "5.0.0"
-  flutter_markdown:
-    dependency: "direct main"
-    description:
-      name: flutter_markdown
-      sha256: "08fb8315236099ff8e90cb87bb2b935e0a724a3af1623000a9cec930468e0f27"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.7.7+1"
  flutter_svg:
    dependency: "direct main"
    description:
@@ -232,14 +224,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "1.3.0"
-  markdown:
-    dependency: transitive
-    description:
-      name: markdown
-      sha256: ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "7.3.1"
  matcher:
    dependency: transitive
    description:
@@ -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.3
+version: 1.4.0

 environment:
  sdk: ^3.9.2
@@ -38,7 +38,6 @@ dependencies:
  path: ^1.9.0
  flutter_svg: ^2.0.10+1
  shared_preferences: ^2.2.0
-  flutter_markdown: ^0.7.0


  # The following adds the Cupertino Icons font to your application.
@@ -76,12 +75,8 @@ flutter:
          weight: 400
        - asset: assets/fonts/HarmonyOS_Sans_SC_Medium.ttf
          weight: 500
-    - family: Flyme
-      fonts:
-        - asset: assets/fonts/flymeFont.ttf
  assets:
    - assets/icons/
-    - assets/CHANGELOG.md

  # To add assets to your application, add an assets section, like this:
  # assets: