新计算逻辑继续补充中

This commit is contained in:
2026-07-05 23:36:58 +08:00
parent 20e29f3043
commit 0fa47dcb61
4 changed files with 48 additions and 12 deletions
+32 -5
View File
@@ -34,14 +34,41 @@ class BatteryDataService {
final lines = await _safService.readLogFile(fileName);
if (lines.isEmpty) continue;
// 使用 CapacityExtractor 提取容量
final cap = CapacityExtractor.extractCapacity(lines);
// 🟢 1.4.5 改进:使用 CapacityExtractor 提取容量(仅从 Full 状态提取)
int? cap = CapacityExtractor.extractCapacity(lines);
// 🟢 如果今天没有充满电(cap == null),尝试从昨天复制数据
if (cap == null) {
dev.log('🔵 文件 $fileName容量数据', name: 'BatteryHealth');
continue;
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) {
+1 -1
View File
@@ -76,7 +76,7 @@ class DatabaseService {
}
}
/// 查询指定日期数据
/// 🟢 1.4.5 新增:查询指定日期数据
Future<Map<String, dynamic>?> queryByDate(String date) async {
final db = await database;
try {