From: @CHENG <2393524978@qq.com> Date: Thu, 4 Jan 2024 09:00:30 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7d6015674b13123317380f7b4b4042f28936f5c4;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c index bf1f06ac..ae10d55d 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c @@ -937,6 +937,7 @@ const void * lang_text_ch[] = { "体验模式", // WATCH_TEXT_ID_BP_ATTEMPT_MODE, "结果分析中", // WATCH_TEXT_ID_WAIT_RESULT, "开始测量", // WATCH_TEXT_ID_START_MEASURE, + "正在测量", // WATCH_TEXT_ID_IN_MEASURING, "停止测量", // WATCH_TEXT_ID_STOP_MEASURE, "测量说明", // WATCH_TEXT_ID_MEASURE_PROMPT, "开始校准", // WATCH_TEXT_ID_START_CALIBRATE, @@ -946,14 +947,15 @@ const void * lang_text_ch[] = { "校准失败", // WATCH_TEXT_ID_CALIBRATE_FAILED, "校准说明", // WATCH_TEXT_ID_CALIBRATE_PROMPT, "双脚着地,端坐在椅子上。双手手背朝上,手臂平放在桌子上", // WATCH_TEXT_ID_CALIBRATE_PROMPT_0, - "手表和手腕之间仅限一指距离,手表偏紧佩戴", // WATCH_TEXT_ID_CALIBRATE_PROMPT_1, - "1.建立血压模型需进行2次校准\n2.建议每个月进行重新校准\n3.校准过程和实际血压测量使用同一只手", // WATCH_TEXT_ID_CALIBRATE_PROMPT_2, - "请使用传统血压计测量手腕同一位置", // WATCH_TEXT_ID_CALIBRATE_PROMPT_3, + "手表和手腕之间仅限一指距离,偏紧佩戴手表", // WATCH_TEXT_ID_CALIBRATE_PROMPT_1, + "1.校准建立血压模型需进行两轮次\n2.建议每个月都重新校准\n3.校准过程和实际血压测量请使用同一只手", // WATCH_TEXT_ID_CALIBRATE_PROMPT_2, + "请使用传统血压计测量同一只手", // WATCH_TEXT_ID_CALIBRATE_PROMPT_3, "需用时约1分钟", // WATCH_TEXT_ID_NEED_ONE_MINUTE, - "首次校准中,请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST, - "再次校准中,请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND, + "首轮校准中,请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST, + "二轮校准中,请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND, + "我已测完", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_BTN, "测量中,请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT, - "请输入校准值", // WATCH_TEXT_ID_INPUT_CALIBRATE_VALUE, + "请输入血压计值", // WATCH_TEXT_ID_INPUT_CALIBRATE_VALUE, "血压正常", // WATCH_TEXT_ID_BLOOD_PRESSURE_NORMAL, "血压偏高", // WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH, "血压偏低", // WATCH_TEXT_ID_BLOOD_PRESSURE_LOW, diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c index 38421704..ab38a2ee 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c @@ -937,8 +937,9 @@ const void * lang_text_en[] = { "Calibration mode", // WATCH_TEXT_ID_BP_CALIBRATION_MODE, "Attempt mode", // WATCH_TEXT_ID_BP_ATTEMPT_MODE, "Wait result", // WATCH_TEXT_ID_WAIT_RESULT, - "Start test", // WATCH_TEXT_ID_START_MEASURE, - "Stop test", // WATCH_TEXT_ID_STOP_MEASURE, + "Start measure", // WATCH_TEXT_ID_START_MEASURE, + "Measuring" // WATCH_TEXT_ID_IN_MEASURING, + "Stop measure", // WATCH_TEXT_ID_STOP_MEASURE, "Measure prompt", // WATCH_TEXT_ID_MEASURE_PROMPT, "Start calibrate", // WATCH_TEXT_ID_START_CALIBRATE, "Calibrating", // WATCH_TEXT_ID_CALIBRATING, @@ -953,6 +954,7 @@ const void * lang_text_en[] = { "Takes about 1 minute", // WATCH_TEXT_ID_NEED_ONE_MINUTE, "Calibrating,keep still", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST, "Calibrating,keep still", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND, + "Measure done", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_BTN, "Measuring,keep still", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT, "Input calibrate value", // WATCH_TEXT_ID_INPUT_CALIBRATE_VALUE, "Blood pressure normal", // WATCH_TEXT_ID_BLOOD_PRESSURE_NORMAL, diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h index a3264a1c..e2a58408 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h @@ -454,12 +454,16 @@ typedef struct #endif #ifdef __MMI_CUSTOM_HENGAI_HEALTH__ +#define NV_HENGAI_HEALTH_REQ_CODE_LEN (128) +#define NV_HENGAI_HEALTH_ACT_CODE_LEN (128) +#define NV_HENGAI_HEALTH_TOKEN_LEN (64) + typedef struct { uint8_t is_activated; // 0-not activated; 1-activated - char req_code[128]; - char act_code[128]; - char token[64]; + char req_code[NV_HENGAI_HEALTH_REQ_CODE_LEN + 1]; + char act_code[NV_HENGAI_HEALTH_ACT_CODE_LEN + 1]; + char token[NV_HENGAI_HEALTH_TOKEN_LEN + 1]; uint8_t is_calibrated; // 0-not calibrated; 1-calibrated hal_rtc_t calibrate_time; } __packed nv_watch_hengai_health_data_t; diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h index 5640e330..f2c258b4 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -943,8 +943,9 @@ enum WATCH_TEXT_ID_BP_CALIBRATION_MODE, /* "校准模式" "Calibration mode" */ WATCH_TEXT_ID_BP_ATTEMPT_MODE, /* "体验模式" "Attempt mode" */ WATCH_TEXT_ID_WAIT_RESULT, /* "结果分析中" "Wait result" */ - WATCH_TEXT_ID_START_MEASURE, /* "开始测量" "Start test" */ - WATCH_TEXT_ID_STOP_MEASURE, /* "停止测量" "Stop test" */ + WATCH_TEXT_ID_START_MEASURE, /* "开始测量" "Start measure" */ + WATCH_TEXT_ID_IN_MEASURING, /* "正在测量" "Measuring"*/ + WATCH_TEXT_ID_STOP_MEASURE, /* "停止测量" "Stop measure" */ WATCH_TEXT_ID_MEASURE_PROMPT, /* "测量说明" "Measure prompt" */ WATCH_TEXT_ID_START_CALIBRATE, /* "开始校准" "Start calibrate" */ WATCH_TEXT_ID_CALIBRATING, /* "校准中" "Calibrating" */ @@ -953,15 +954,16 @@ enum WATCH_TEXT_ID_CALIBRATE_FAILED, /* "校准失败" "Calibrate failed" */ WATCH_TEXT_ID_CALIBRATE_PROMPT, /* "校准说明" "Calibrate prompt" */ WATCH_TEXT_ID_CALIBRATE_PROMPT_0, /* "双脚着地,端坐在椅子上。双手手背朝上,手臂平放在桌子上" "Calibrate prompt" */ - WATCH_TEXT_ID_CALIBRATE_PROMPT_1, /* "手表和手腕之间仅限一指距离,手表偏紧佩戴" "Calibrate prompt" */ - WATCH_TEXT_ID_CALIBRATE_PROMPT_2, /* "1.建立血压模型需进行2次校准\n2.建议每个月进行重新校准\n3.校准过程和实际血压测量使用同一只手" + WATCH_TEXT_ID_CALIBRATE_PROMPT_1, /* "手表和手腕之间仅限一指距离,偏紧佩戴手表" "Calibrate prompt" */ + WATCH_TEXT_ID_CALIBRATE_PROMPT_2, /* "1.校准建立血压模型需进行两轮次\n2.建议每个月都重新校准\n3.校准过程和实际血压测量请使用同一只手" "Calibrate prompt" */ - WATCH_TEXT_ID_CALIBRATE_PROMPT_3, /* "请使用传统血压计测量手腕同一位置" "Calibrate prompt" */ + WATCH_TEXT_ID_CALIBRATE_PROMPT_3, /* "请使用传统血压计测量同一只手" "Calibrate prompt" */ WATCH_TEXT_ID_NEED_ONE_MINUTE, /* "需用时约1分钟" "Takes about 1 minute" */ - WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST, /* "首次校准中,请保持静止" "Calibrating,keep still" */ - WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND, /* "再次校准中,请保持静止" "Calibrating,keep still" */ + WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST, /* "首轮校准中,请保持静止" "Calibrating,keep still" */ + WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND, /* "二轮校准中,请保持静止" "Calibrating,keep still" */ + WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_BTN, /* "我已测完" "Measure done" */ WATCH_TEXT_ID_IN_MEASURE_PROMPT, /* "测量中,请保持静止" "Measuring,keep still" */ - WATCH_TEXT_ID_INPUT_CALIBRATE_VALUE, /* "请输入校准值" "Input calibrate value" */ + WATCH_TEXT_ID_INPUT_CALIBRATE_VALUE, /* "请输入血压计值" "Input calibrate value" */ WATCH_TEXT_ID_BLOOD_PRESSURE_NORMAL, /* "血压正常" "Blood pressure normal" */ WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH, /* "血压偏高" "Blood pressure high" */ WATCH_TEXT_ID_BLOOD_PRESSURE_LOW, /* "血压偏低" "Blood pressure low" */ 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 fcec8ded..1d71487a 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 @@ -786,7 +786,7 @@ bool mmi_health_measure_timed_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_ty return false; #ifdef __MMI_CUSTOM_HENGAI_HEALTH__ - if(mmi_hengai_bp_is_measuring()) + if(mmi_hengai_bp_measuring_flag_get()) { return false; } @@ -829,7 +829,7 @@ void mmi_health_measure_app_measure_start(MMI_HEALTH_MEASURE_TYPE_E measure_type } #ifdef __MMI_CUSTOM_HENGAI_HEALTH__ - if(mmi_hengai_bp_is_measuring()) + if(mmi_hengai_bp_measuring_flag_get()) { return; } diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h index ee9b3411..57120a82 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h @@ -1017,6 +1017,7 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_HENGAI_BP_PROMPT_0 "R:/png/custom_function/ICON_HENGAI_BP_PROMPT_0.png" #define ICON_HENGAI_BP_PROMPT_1 "R:/png/custom_function/ICON_HENGAI_BP_PROMPT_1.png" +#define ICON_HENGAI_BP_PROMPT_2 "R:/png/custom_function/ICON_HENGAI_BP_PROMPT_2.png" #define ICON_HENGAI_BP_LEFT_ARROW "R:/png/custom_function/ICON_HENGAI_BP_LEFT_ARROW.png" #define ICON_HENGAI_BP_RIGHT_ARROW "R:/png/custom_function/ICON_HENGAI_BP_RIGHT_ARROW.png" diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c index 199d727b..7c2dcb83 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c @@ -311,6 +311,10 @@ void mmi_protocol_watch_heartbeat_action(void) bool mmi_protocol_watch_link_action(void) { +#ifdef __MMI_CUSTOM_HENGAI_HEALTH__ + mmi_hengai_algorithm_interface_login_action(); +#endif + return mmi_protocol_fzd_action_LINK(); }