From: hcj <1224667075@qq.com>
Date: Sat, 7 Sep 2024 01:37:14 +0000 (+0800)
Subject: 修复活动历史数据BUG
X-Git-Tag: release_V1.2.70_20241020_135402~528
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=27f4505c49c1d0a295e6d548c44723e2c7c0e6db;p=mirrors%2FFD230.git

修复活动历史数据BUG
---

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 5ae711c5f..3efe3cae9 100644
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -186,29 +186,25 @@ void cywee_get_version(char *databuf,uint8_t len)
 
 void cywee_save_data(void)
 {
-    stepcount+=history_step;
-    history_step=0;
-    CWM_OS_saveData(&stepcount,sizeof(int),CYWEE_SAVE_DATA_STEP);
-
+    history_step+=stepcount;
+    CWM_OS_saveData(&history_step,sizeof(int),CYWEE_SAVE_DATA_STEP);
     CWM_OS_OneHourAgo_saveData(&history_step_,sizeof(int),CYWEE_SAVE_DATA_STEP);
- 
-
-    new_calories+=history_calories;
-    history_calories=0;
-    CWM_OS_saveData(&(new_calories),sizeof(int),CYWEE_SAVE_DATA_CALORIES);
-
+    stepcount=0;
+    
+    history_calories+=new_calories;
+    CWM_OS_saveData(&(history_calories),sizeof(int),CYWEE_SAVE_DATA_CALORIES);
     CWM_OS_OneHourAgo_saveData(&history_calories_,sizeof(float),CYWEE_SAVE_DATA_CALORIES);
+    new_calories=0;
 
-    new_distance+=history_distances;
-    history_distances=0;
-    CWM_OS_saveData(&(new_distance),sizeof(int),CYWEE_SAVE_DATA_DISTANCE);
+    history_distances+=new_distance;
+    CWM_OS_saveData(&(history_distances),sizeof(int),CYWEE_SAVE_DATA_DISTANCE);
     CWM_OS_OneHourAgo_saveData(&history_distances_,sizeof(float),CYWEE_SAVE_DATA_DISTANCE);
+    new_distance=0;
 
-    new_fat+=history_fat;
-    history_fat=0;
-    CWM_OS_saveData(&new_fat,sizeof(int),CYWEE_SAVE_DATA_FAT);
+    history_fat+=new_fat;
+    CWM_OS_saveData(&history_fat,sizeof(int),CYWEE_SAVE_DATA_FAT);
     CWM_OS_OneHourAgo_saveData(&history_fat_,sizeof(uint16_t),CYWEE_SAVE_DATA_FAT);
-
+    new_fat=0;
 }
 
 void cywee_restoreData(void)