修复运动卡路里不出值的问题

diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
index bbc12d9..a1cdf2a 100644 (file)
--- a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
+++ b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
@@ -545,36 +545,49 @@ bool hx3695_check_wear(ppg_sensor_data_t *ppg_sensor_dat,uint8_t count)
 \r
         if(wear_status_pre != wear_status)\r
         {\r
-            if(uapi_dev_runtime_get_train_status() && !wear_status)\r
-                avg_hrs = 0;\r
 \r
             wear_status_pre = wear_status;\r
 \r
-            if(uapi_dev_runtime_get_sleep_monitoring_status())\r
+\r
+            if(uapi_dev_runtime_get_train_status())\r
             {\r
+                #ifdef SUPPORT_CYWEE_SERVICE\r
+                cywee_wear_status_update(&wear_status);\r
+                #endif\r
                 if(!wear_status)\r
                 {\r
-                    #ifdef SUPPORT_CYWEE_SERVICE\r
-                    cywee_wear_status_update(&wear_status);\r
-                    #endif\r
+                    avg_hrs = 0;\r
                 }\r
-                else if(living_status == 1 && wear_status)\r
+            }\r
+            else {\r
+            \r
+                if(uapi_dev_runtime_get_sleep_monitoring_status())\r
                 {\r
-                    #ifdef SUPPORT_CYWEE_SERVICE\r
-                    cywee_wear_status_update(&wear_status);\r
-                    #endif\r
+                    if(!wear_status)\r
+                    {\r
+                        #ifdef SUPPORT_CYWEE_SERVICE\r
+                        cywee_wear_status_update(&wear_status);\r
+                        #endif\r
+                    }\r
+                    else if(living_status == 1 && wear_status)\r
+                    {\r
+                        #ifdef SUPPORT_CYWEE_SERVICE\r
+                        cywee_wear_status_update(&wear_status);\r
+                        #endif\r
+                    }\r
                 }\r
-            }\r
-            else\r
-            {\r
-                if(living_status != 2)\r
+                else\r
                 {\r
+                    if(living_status != 2)\r
+                    {\r
 \r
-    #ifdef SUPPORT_CYWEE_SERVICE\r
-                    cywee_wear_status_update(&wear_status);\r
-    #endif\r
+        #ifdef SUPPORT_CYWEE_SERVICE\r
+                        cywee_wear_status_update(&wear_status);\r
+        #endif\r
+                    }\r
                 }\r
             }\r
+            \r
 \r
 \r
             // printf("wear_status:%d\n",wear_status);\r