From: @CHENG <2393524978@qq.com> Date: Sat, 11 May 2024 02:22:11 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=50b856551778d4a7a3e2103e08f498be36d55c6f;p=mirrors%2FASR3603_Z5_DS.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c index e45ecee6..3a0fca34 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c @@ -1697,13 +1697,8 @@ static void mmi_factorymode_temperature_update(lv_anim_t * anim) { char str[32]= {0}; float body_temp_value = 0.0; - #ifdef __HEALTH_MEASURE_FAKE_temperature_DATA__ - srand(Hal_Timer_Get_Counter()); - body_temp_value = 36.0 + rand() % 5* 0.1; - #else - //mmi_health_measure_temperature_data_ui_get(&body_temp_value,NULL); - mmi_tsensor_body_value_get(&body_temp_value); - #endif + + mmi_tsensor_body_value_get(&body_temp_value); sprintf(str, "%s:\n %.2f %s", (char *)lv_lang_get_text(WATCH_TEXT_ID_TEMPERATURE), body_temp_value, (char *)lv_lang_get_text(WATCH_TEXT_ID_TEMPERATURE_UNIT)); 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 da69303e..bc6c0595 100644 --- 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 @@ -107,7 +107,13 @@ void mmi_hsensor_blood_value_get(uint16_t * blood_high_value, uint16_t * blood_l void mmi_hsensor_spo2_value_get(uint16_t * spo2_value) { +#if 1 // def __HEALTH_MEASURE_FAKE_DATA__ + srand(Hal_Timer_Get_Counter()); + spo2_value = 95 + rand() % 6; +#else + mmi_hsensor_measure_value_get(NULL, NULL, NULL, spo2_value); +#endif } void mmi_hsensor_blood_glucose_value_get(float * blood_glucose_value) @@ -164,7 +170,13 @@ void mmi_tsensor_wrist_value_get(float * wrist_value) void mmi_tsensor_body_value_get(float * body_value) { +#if 1 // def __HEALTH_MEASURE_FAKE_DATA__ + srand(Hal_Timer_Get_Counter()); + * body_value = 36.0 + rand() % 5 * 0.1; +#else + * body_value = mmi_tsensor_body_temperature_get(); +#endif } bool mmi_health_measure_wear_state_get(void) @@ -233,15 +245,8 @@ bool mmi_health_measure_temperature_data_process(float * body_value, float * wri { float t_body_value = 0.0, t_wrist_value = 0.0; -#ifdef __HEALTH_MEASURE_FAKE_temperature_DATA__ - - srand(Hal_Timer_Get_Counter()); - t_body_value = 36.0 + rand() % 5* 0.1; - t_wrist_value = t_body_value - 10.0; -#else mmi_tsensor_body_value_get(&t_body_value); t_wrist_value = t_body_value - 10.0; -#endif HEALTH_MEASURE_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d,%d\n", __FUNCTION__, __LINE__, (uint16_t)(t_body_value*100), (uint16_t)(t_wrist_value*100)); * body_value = t_body_value; @@ -266,13 +271,7 @@ bool mmi_health_measure_spo2_data_process(uint16_t * spo2_value) { uint16_t t_value = 0; -#ifdef __HEALTH_MEASURE_FAKE_DATA__ - srand(Hal_Timer_Get_Counter()); - t_value = 95 + rand() % 6; - -#else mmi_hsensor_spo2_value_get(&t_value); -#endif if(DEFAULT_SPO2_VALUE_MAX < t_value) t_value = DEFAULT_SPO2_VALUE_MAX;