diff --git a/lib/pages/battery_health_page.dart b/lib/pages/battery_health_page.dart index 3fd6c31..29570e7 100644 --- a/lib/pages/battery_health_page.dart +++ b/lib/pages/battery_health_page.dart @@ -303,7 +303,7 @@ class _BatteryHealthPageState extends State { } await _getDeviceInfo(); - await _dataService.scanAndUpdateDB(); + await _dataService.scanAndUpdateDB(designCap: _designCap); final fileName = TimeUtils.getTodayFileName(); dev.log('🔵 今日文件名: $fileName', name: 'BatteryHealth'); diff --git a/lib/services/battery_data_service.dart b/lib/services/battery_data_service.dart index 8c8747a..7a64e79 100644 --- a/lib/services/battery_data_service.dart +++ b/lib/services/battery_data_service.dart @@ -9,8 +9,40 @@ class BatteryDataService { final SafStorageService _safService = SafStorageService(); final DatabaseService _dbService = DatabaseService(); + /// 🟢 1.7.0 容量有效性校验(入库专用) + int? _validateCapacityForDB(int? capacity, int designCap) { + if (capacity == null) return null; + + // 容量必须大于 0 + if (capacity <= 0) { + dev.log('⚠️ [DB校验] 容量异常:<= 0,已拒绝入库', name: 'BatteryDataService'); + return null; + } + + // 容量不能低于设计容量的 60% + if (capacity < designCap * 0.6) { + dev.log( + '⚠️ [DB校验] 容量异常:低于设计容量 60%($capacity < ${designCap * 0.6}),已拒绝入库', + name: 'BatteryDataService', + ); + return null; + } + + // 容量不能超过设计容量的 115% + if (capacity > designCap * 1.15) { + dev.log( + '⚠️ [DB校验] 容量异常:高于设计容量 115%($capacity > ${designCap * 1.15}),已拒绝入库', + name: 'BatteryDataService', + ); + return null; + } + + return capacity; + } + /// 扫描所有日志文件并更新数据库 - Future scanAndUpdateDB() async { + /// 🟢 1.7.0 增加 designCap 参数,用于入库前校验 + Future scanAndUpdateDB({int? designCap}) async { dev.log('🔵 scanAndUpdateDB 开始', name: 'BatteryHealth'); final state = await _safService.getPermissionState(); @@ -34,41 +66,28 @@ class BatteryDataService { final lines = await _safService.readLogFile(fileName); if (lines.isEmpty) continue; - // 🟢 1.4.5 改进:使用 CapacityExtractor 提取容量(仅从 Full 状态提取) - int? cap = CapacityExtractor.extractCapacity(lines); + // 使用 CapacityExtractor 提取容量 + final 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; // 已处理,跳过后续电压提取逻辑 + // 🟢 1.7.0 如果 designCap 传入,则进行入库前校验 + int? validatedCap = cap; + if (designCap != null && designCap > 0) { + validatedCap = _validateCapacityForDB(cap, designCap); } - // 提取电压极值(从所有有效行提取,不限于 Full) + if (validatedCap == null) { + if (cap != null) { + dev.log( + '🔵 日期 $dateStr 容量校验未通过 ($cap),跳过入库', + name: 'BatteryHealth', + ); + } else { + dev.log('🔵 日期 $dateStr 无有效容量数据,跳过入库', name: 'BatteryHealth'); + } + continue; + } + + // 提取电压极值 final voltReg = RegExp(r'vbat=(\d+)'); double? maxVolt, minVolt; for (String line in lines) { @@ -82,8 +101,16 @@ class BatteryDataService { } if (maxVolt == null || minVolt == null) continue; - await _dbService.insertOrUpdate(dateStr, cap, maxVolt, minVolt); - dev.log('🔵 插入数据库: $dateStr, cap=$cap', name: 'BatteryHealth'); + await _dbService.insertOrUpdate( + dateStr, + validatedCap, + maxVolt, + minVolt, + ); + dev.log( + '🔵 插入数据库: $dateStr, cap=$validatedCap', + name: 'BatteryHealth', + ); } catch (e) { dev.log('🔵 处理文件 $fileName 异常: $e', name: 'BatteryHealth'); }