Merge #929 into sdk602patch0626 from refs/changes/929/head

修复距离 卡路里不清零的BUG

* refs/changes/929/head: (1 commits squashed)

  - 修复距离 卡路里不清零的BUG

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/929

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 210a157..2f1ddd1 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -1155,7 +1155,7 @@ void MsgCenterNotifyActivityProc(const Topic topic, Request* req)
     if(c_activity_result_t->activity_mode == SPORT_ACTIVE_MODE_NORMAL)
     {
         /*更新卡路里数据*/
-        if(c_activity_result_t->calories!=0)
+        //if(c_activity_result_t->calories!=0)
         {
             set_calories_data(c_activity_result_t->calories);
 #if DIALDATASET
@@ -1163,7 +1163,7 @@ void MsgCenterNotifyActivityProc(const Topic topic, Request* req)
 #endif
         }
         /*更新距离数据*/
-        if(c_activity_result_t->distance!=0)
+        //if(c_activity_result_t->distance != 0)
         {
             set_distance_data(c_activity_result_t->distance);  
 #if DIALDATASET

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 7d584c6..4b2765f 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -384,7 +384,8 @@ void cywee_reset_daily_data(void)
     history_step = 0;
     history_calories=0; //卡路里数据
     history_distances=0; //历史数据
-    history_fat=0; //历史数据
+    history_fat=0; //历史燃脂数据
+    new_fat = 0; //当前燃脂数据
 }
 
 //INT[1] : 0 立即输出，但不中止睡眠。 1 立即输出且中止睡眠