From: @CHENG <2393524978@qq.com> Date: Thu, 4 Jan 2024 11:44:48 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=f024708e0c4c0f71dcc4cae675f4c2e627ec924d;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 ae10d55d..634e6a6b 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,7 +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_IN_MEASURING, "停止测量", // WATCH_TEXT_ID_STOP_MEASURE, "测量说明", // WATCH_TEXT_ID_MEASURE_PROMPT, "开始校准", // WATCH_TEXT_ID_START_CALIBRATE, @@ -948,7 +948,7 @@ const void * lang_text_ch[] = { "校准说明", // WATCH_TEXT_ID_CALIBRATE_PROMPT, "双脚着地，端坐在椅子上。双手手背朝上，手臂平放在桌子上", // WATCH_TEXT_ID_CALIBRATE_PROMPT_0, "手表和手腕之间仅限一指距离，偏紧佩戴手表", // WATCH_TEXT_ID_CALIBRATE_PROMPT_1, - "1.校准建立血压模型需进行两轮次\n2.建议每个月都重新校准\n3.校准过程和实际血压测量请使用同一只手", // WATCH_TEXT_ID_CALIBRATE_PROMPT_2, + "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, @@ -963,9 +963,10 @@ const void * lang_text_ch[] = { "校准结果已上传，当前血压异常。建议吃降压药2小时后重新校准", // WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH_PROMPT, "校准结果已上传，当前血压异常。建议休息后重新校准", // WATCH_TEXT_ID_BLOOD_PRESSURE_LOW_PROMPT, "校准失败，请重新校准", // WATCH_TEXT_ID_BLOOD_PRESSURE_FAILED_PROMPT, + //CHENG_MODIFY "确认是否跌倒?", // WATCH_TEXT_ID_falldown, "确认是否删除", - //CHENG_MODIFY + }; 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 ab38a2ee..4487a685 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 @@ -964,9 +964,10 @@ const void * lang_text_en[] = { "Blood pressure high prompt", // WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH_PROMPT, "Blood pressure low prompt", // WATCH_TEXT_ID_BLOOD_PRESSURE_LOW_PROMPT, "Blood pressure failed prompt", // WATCH_TEXT_ID_BLOOD_PRESSURE_FAILED_PROMPT, + //CHENG_MODIFY "Confirm a fall", "Confirm deletion", - //CHENG_MODIFY + }; 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 f2c258b4..c3ca4ac1 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -944,7 +944,7 @@ enum WATCH_TEXT_ID_BP_ATTEMPT_MODE, /* "体验模式" "Attempt mode" */ WATCH_TEXT_ID_WAIT_RESULT, /* "结果分析中" "Wait result" */ WATCH_TEXT_ID_START_MEASURE, /* "开始测量" "Start measure" */ - WATCH_TEXT_ID_IN_MEASURING, /* "正在测量" "Measuring"*/ + 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" */ @@ -955,7 +955,7 @@ enum 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.校准建立血压模型需进行两轮次\n2.建议每个月都重新校准\n3.校准过程和实际血压测量请使用同一只手" + WATCH_TEXT_ID_CALIBRATE_PROMPT_2, /* "1.建立血压模型需进行两个轮次校准\n2.建议每个月都重新校准\n3.校准过程和实际血压测量请使用同一只手" "Calibrate prompt" */ WATCH_TEXT_ID_CALIBRATE_PROMPT_3, /* "请使用传统血压计测量同一只手" "Calibrate prompt" */ WATCH_TEXT_ID_NEED_ONE_MINUTE, /* "需用时约1分钟" "Takes about 1 minute" */ @@ -971,10 +971,11 @@ enum WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH_PROMPT, /* "校准结果已上传，当前血压异常。建议吃降压药2小时后重新校准" "Blood pressure high prompt" */ WATCH_TEXT_ID_BLOOD_PRESSURE_LOW_PROMPT, /* "校准结果已上传，当前血压异常。建议休息后重新校准" "Blood pressure low prompt" */ WATCH_TEXT_ID_BLOOD_PRESSURE_FAILED_PROMPT, /* "校准失败，请重新校准" "Blood pressure failed prompt" */ + //CHENG_MODIFY WATCH_TEXT_ID_FALLDWON, /*确认是否跌倒*/ WATCH_TEXT_ID_CONFIRM_DELETE, /*确认是否删除*/ - //CHENG_MODIFY + WATCH_TEXT_ID_MAX }; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h index d42966a6..8dd20c0c 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.h @@ -81,7 +81,10 @@ typedef struct -uint8_t mmi_hengai_bp_is_measuring(void); +bool mmi_hengai_bp_measuring_flag_get(void); + +void mmi_hengai_bp_measure_update_result(bool state, uint16_t bp_value_high, uint16_t bp_value_low, char * description); +void mmi_hengai_bp_calibrate_update_result(bool is_success); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h index 40f1be47..4e3b9ee5 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.h @@ -18,6 +18,7 @@ extern "C" { #ifdef __MMI_CUSTOM_HENGAI_HEALTH__ +// #include "../../../../product/craneg_modem/cust/fit/inc/sdknet.h" // ½Ó¿Úǰ׺£º // Õýʽǰ׺£ºhttp://api.aicaring.com/api/v0 @@ -25,11 +26,9 @@ extern "C" { // ²âÊÔǰ׺£ºhttp://test.aicaring.com/api/v0 // ²âÊÔapp_key£º5d3ef21f0cbf966505c3d5137740be77 +#define HENGAI_HTTP_TEST - -// #include "../../../../product/craneg_modem/cust/fit/inc/sdknet.h" - -#if 0 +#ifndef HENGAI_HTTP_TEST #define HENGAI_HTTP_POST_URL_COMMON_PREFIX ("http://api.aicaring.com/api/v0") #define HENGAI_HTTP_POST_APP_KEY ("5d3ef21f0cbf966505c3d5137740be77") #else @@ -43,6 +42,7 @@ extern "C" { +void mmi_hengai_algorithm_interface_login_action(void); void mmi_hengai_health_data_nv_read(void);