gengxin

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
index 91ce323..4940e53 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
@@ -433,10 +433,12 @@ void fr8012haq_timer_cfg(bool en)
         {
             FR8012HAQ_LOG("fr8012haq_timer_cfg:BP_MODE!!!!!\n");
             uos_timer_start(fr8012haq_timer, MS_TO_TICKS(500), MS_TO_TICKS(500), fr8012haq_timerout_cb, NULL);
-        }else if(FR8012HAQ_run_mode == YYL_MODE)//中医35秒
-        {
-            uos_timer_start(fr8012haq_timer, MS_TO_TICKS(31000), MS_TO_TICKS(31000), fr8012haq_timerout_cb, NULL);
-        }else//其他3秒
+        }
+               //else if(FR8012HAQ_run_mode == YYL_MODE)//中医35秒
+        //{
+        //    uos_timer_start(fr8012haq_timer, MS_TO_TICKS(31000), MS_TO_TICKS(31000), fr8012haq_timerout_cb, NULL);
+        //}
+               else//其他3秒
         {
             
             uos_timer_start(fr8012haq_timer, MS_TO_TICKS(3000), MS_TO_TICKS(3000), fr8012haq_timerout_cb, NULL);
@@ -1335,32 +1337,26 @@ void FR8012HAQ_result_set_wear_status(unsigned char wear_status)
     if(wear_status == 0 && s_FR8012HAQ_wear_status == 1)//佩戴变未佩戴
     {
         FR8012HAQ_LOG("s_FR8012HAQ_wear_status111:wear_status%d,s_FR8012HAQ_wear_status%d !!!!!!!!!!!!!!!!!\n\n\n",wear_status,s_FR8012HAQ_wear_status);
+        s_FR8012HAQ_wear_status = 0;
         fr8012haq_measure_wear_start();//开始佩戴模式
     }else if(wear_status == 1 && s_FR8012HAQ_wear_status == 0)//未佩戴变佩戴
     {
-        //s_FR8012HAQ_wear_status =1;
+               s_FR8012HAQ_wear_status = 1;
         //fr8012haq_timer_cfg(TRUE);//恢复定时器
 
-//     #ifdef __MMI_CUSTOM_HENGAI_TCMS__
-//             mmi_hengai_tcms_action();
-//     #endif
-//     printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-    }
-//     printf("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, wear_status);
-
-       if(wear_status != 1)
-    {
-       
-        s_FR8012HAQ_wear_status = 0;
+               mmi_hengai_tcms_action();
     }
-       else
-               s_FR8012HAQ_wear_status = 1;
+       //printf("[@CHENG_DEBUG][%s][%d]: wear=%d,s_wear=%d\n", __FUNCTION__, __LINE__, wear_status, s_FR8012HAQ_wear_status);
    FR8012HAQ_LOG("s_FR8012HAQ_wear_status:%d !!!!!!!!!!!!!!!!!\n\n\n",s_FR8012HAQ_wear_status);
 }
 unsigned char FR8012HAQ_result_get_wear_status(void)
 {
+       if((0 == s_FR8012HAQ_wear_status) && (WEAR_MODE != FR8012HAQ_run_mode))
+       {
+               fr8012haq_measure_wear_start();
+               //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+       }
        
-       //return 1;//
     return s_FR8012HAQ_wear_status ;
 }
 void FR8012HAQ_result_set_blood_oxygen(unsigned char blood_oxygen)

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
index 8975e3e..536d851 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
@@ -676,6 +676,7 @@ void mmi_hengai_bp_measure_finish_screen(void)
 
 void mmi_hengai_bp_measure_cycle_timeout(void * para)
 {
+#if 0
        if(false == mmi_health_measure_wear_state_get())
        {
                mmi_hsensor_close();
@@ -687,6 +688,7 @@ void mmi_hengai_bp_measure_cycle_timeout(void * para)
                
                return;
        }
+#endif
        
        s_hengai_bp_measure_count++;
 
@@ -1527,6 +1529,7 @@ void mmi_hengai_bp_calibrate_end_screen(void)
 
 void mmi_hengai_bp_calibrate_cycle_timeout(void * para)
 {
+#if 0
        if(false == mmi_health_measure_wear_state_get())
        {
                mmi_hsensor_close();
@@ -1538,6 +1541,7 @@ void mmi_hengai_bp_calibrate_cycle_timeout(void * para)
                
                return;
        }
+#endif
        
        s_hengai_bp_measure_count++;
                

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
index 6d833cb..30f87f3 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
@@ -176,7 +176,14 @@ bool mmi_health_measure_temperature_data_process(float * body_value, float * wri
        t_body_value = 36.0 + rand() % 4 * 0.1;
        t_wrist_value = t_body_value - 10.0;
 
-#elif USE_ACNT117 || USE_FR8012HAQ
+#elif USE_FR8012HAQ
+       float t_float_value = 0.0;
+
+       mmi_tsensor_body_value_get(&t_float_value);
+       t_body_value = 36.0 + t_float_value - (int)t_float_value;
+       t_wrist_value = t_body_value - 10.0;
+       //HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d,%d\n", __FUNCTION__, __LINE__, (uint16_t)(t_body_value*100), (uint16_t)(t_float_value*100));
+#elif USE_ACNT117
        float t_float_value = 0.0;
 
        mmi_tsensor_body_value_get(&t_float_value);