gengxin

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png
index 3329c79..19c4d50 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_BLACK.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png
index 81bc88e..063313e 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_COMMON_BG_WHITE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_ATTEMPT.gif b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_ATTEMPT.gif
new file mode 100644 (file)
index 0000000..1f07957
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_ATTEMPT.gif differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_CALIBRATE.gif b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_CALIBRATE.gif
new file mode 100644 (file)
index 0000000..45342dc
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_CALIBRATE.gif differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_MEASURE.gif b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_MEASURE.gif
new file mode 100644 (file)
index 0000000..7759a5f
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ANIM_HENGAI_BP_MEASURE.gif differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ALERT.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ALERT.png
new file mode 100644 (file)
index 0000000..238cae4
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ALERT.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png
new file mode 100644 (file)
index 0000000..0bd1f2d
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BOTTOM_BTN_BG.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BOTTOM_BTN_BG.png
new file mode 100644 (file)
index 0000000..45a3fa6
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BOTTOM_BTN_BG.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BTN_BG.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BTN_BG.png
new file mode 100644 (file)
index 0000000..8a97ae2
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_BTN_BG.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_MODE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_MODE.png
new file mode 100644 (file)
index 0000000..85c14e4
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_CALIBRATION_MODE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_MEASURE_MODE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_MEASURE_MODE.png
new file mode 100644 (file)
index 0000000..6f18871
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_MEASURE_MODE.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_0.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_0.png
new file mode 100644 (file)
index 0000000..6a83f41
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_0.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_1.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_1.png
new file mode 100644 (file)
index 0000000..a8c04ea
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_PROMPT_1.png differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_SUCCESS.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_SUCCESS.png
new file mode 100644 (file)
index 0000000..75334bf
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/custom_function/ICON_HENGAI_BP_SUCCESS.png differ

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 e7cfbc3..e85d039 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
@@ -873,6 +873,7 @@ const void * lang_text_ch[] = {
     "禁用时段", // WATCH_TEXT_ID_FORBIDDEN_PERIOD,
     "设备无网络", // WATCH_TEXT_ID_DEVICE_NO_NETWORK,
     "设备未绑定", // WATCH_TEXT_ID_DEVICE_NOT_BIND,
+    "设备未正确佩戴", // WATCH_TEXT_ID_DEVICE_NOT_WEAR,
     "拨号盘已关闭\n请在APP上打开", // WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT,
     "删除选中", // WATCH_TEXT_ID_DELETE_CURRENT_ITEM,
     "删除全部", // WATCH_TEXT_ID_DELETE_ALL_ITEM,
@@ -914,7 +915,31 @@ const void * lang_text_ch[] = {
     "您坐太久了", // WATCH_TEXT_ID_SEDENTARY_PROMPT,
     "大图标播报", // WATCH_TEXT_ID_PAGE_MAIN_MENU_TTS,
     "新信息静音", // WATCH_TEXT_ID_NEW_SMS_SILENT,
-
+    "精准模式", // WATCH_TEXT_ID_BP_MEASURE_MODE,
+    "校准模式", // WATCH_TEXT_ID_BP_CALIBRATION_MODE,
+    "体验模式", // WATCH_TEXT_ID_BP_ATTEMPT_MODE,
+    "开始测量", // WATCH_TEXT_ID_START_MEASURE,
+    "停止测量", // WATCH_TEXT_ID_STOP_MEASURE,
+    "测量说明", // WATCH_TEXT_ID_MEASURE_PROMPT,
+    "开始校准", // WATCH_TEXT_ID_START_CALIBRATE,
+    "停止校准", // WATCH_TEXT_ID_STOP_CALIBRATE,
+    "校准完成", // WATCH_TEXT_ID_CALIBRATE_SUCCESS,
+    "校准失败", // 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.高血压患者需要进行2轮校准\n3.建议每个月进行重新校准\n4.校准过程和实际血压测量使用同一只手", // WATCH_TEXT_ID_CALIBRATE_PROMPT_2,
+    "首次校准中，请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST,
+    "再次校准中，请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND,
+    "测量中，请保持静止", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT,
+    "请输入校准值", // WATCH_TEXT_ID_INPUT_CALIBRATE_VALUE,
+    "血压正常", // WATCH_TEXT_ID_BLOOD_PRESSURE_NORMAL,
+    "血压偏高", // WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH,
+    "血压偏低", // WATCH_TEXT_ID_BLOOD_PRESSURE_LOW,
+    "校准结果已上传，30天后可重新校准", // WATCH_TEXT_ID_BLOOD_PRESSURE_NORMAL_PROMPT,
+    "校准结果已上传，当前血压异常。建议吃降压药2小时后重新校准", // WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH_PROMPT,
+    "校准结果已上传，当前血压异常。建议休息后重新校准", // WATCH_TEXT_ID_BLOOD_PRESSURE_LOW_PROMPT,
+    "校准失败，请重新校准", // WATCH_TEXT_ID_BLOOD_PRESSURE_FAILED_PROMPT,
 
     //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 cee03d5..55757ef 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
@@ -874,6 +874,7 @@ const void * lang_text_en[] = {
     "Forbidden period", // WATCH_TEXT_ID_FORBIDDEN_PERIOD,
     "No network", // WATCH_TEXT_ID_DEVICE_NO_NETWORK,
     "Not bind", // WATCH_TEXT_ID_DEVICE_NOT_BIND,
+    "Not wear", // WATCH_TEXT_ID_DEVICE_NOT_WEAR,
     "Dial pad switch off", // WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT,
     "Delete current", // WATCH_TEXT_ID_DELETE_CURRENT_ITEM,
     "Delete all", // WATCH_TEXT_ID_DELETE_ALL_ITEM,
@@ -915,6 +916,31 @@ const void * lang_text_en[] = {
     "Sitting too long", // WATCH_TEXT_ID_SEDENTARY_PROMPT,
     "Big icon tts", // WATCH_TEXT_ID_PAGE_MAIN_MENU_TTS,
     "SMS silent", // WATCH_TEXT_ID_NEW_SMS_SILENT,
+    "Measure mode", // WATCH_TEXT_ID_BP_MEASURE_MODE,
+    "Calibration mode", // WATCH_TEXT_ID_BP_CALIBRATION_MODE,
+    "Attempt mode", // WATCH_TEXT_ID_BP_ATTEMPT_MODE,
+    "Start test", // WATCH_TEXT_ID_START_MEASURE,
+    "Stop test", // WATCH_TEXT_ID_STOP_MEASURE,
+    "Measure prompt", // WATCH_TEXT_ID_MEASURE_PROMPT,
+    "Start calibrate", // WATCH_TEXT_ID_START_CALIBRATE,
+    "Stop calibrate", // WATCH_TEXT_ID_STOP_CALIBRATE,
+    "Calibrate success", // WATCH_TEXT_ID_CALIBRATE_SUCCESS,
+    "Calibrate failed", // WATCH_TEXT_ID_CALIBRATE_FAILED,
+    "Calibrate prompt", // 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,
+    "Calibrating,keep still", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST,
+    "Calibrating,keep still", // WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND,
+    "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,
+    "Blood pressure high", // WATCH_TEXT_ID_BLOOD_PRESSURE_HIGH,
+    "Blood pressure low", // WATCH_TEXT_ID_BLOOD_PRESSURE_LOW,
+    "Blood pressure normal prompt", // WATCH_TEXT_ID_BLOOD_PRESSURE_NORMAL_PROMPT,
+    "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

diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h
index e9cbd23..508c9db 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h
@@ -213,6 +213,12 @@ enum
 #ifdef __MMI_CUSTOM_HENG_AI__
        ACT_ID_HENG_AI_WARNING,
 #endif
+#ifdef __MMI_CUSTOM_HENG_AI_BLOOD_PRESSURE__
+       ACT_ID_HENG_AI_BP,
+       ACT_ID_HENG_AI_BP_MEASURE,
+       ACT_ID_HENG_AI_BP_CALIBRATE,
+       ACT_ID_HENG_AI_BP_ATTEMPT,
+#endif
 #ifdef __MMI_CUSTOM_BEI_KE_RUI_SHENG__
        ACT_ID_AI_TALK,
        ACT_ID_AI_TALK_RECORDING,

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 52e6b76..823cc3a 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -880,6 +880,7 @@ enum
     WATCH_TEXT_ID_FORBIDDEN_PERIOD,                     /* "禁用时段"                    "Forbidden period" */
     WATCH_TEXT_ID_DEVICE_NO_NETWORK,                    /* "设备无网络"                "No network" */
     WATCH_TEXT_ID_DEVICE_NOT_BIND,                      /* "设备未绑定"                "Not bind" */
+    WATCH_TEXT_ID_DEVICE_NOT_WEAR,                      /* "设备未正确佩戴"                "Not wear" */
     WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT,               /* "拨号盘已关闭\n请在APP上打开"           "Dial pad switch off" */
     WATCH_TEXT_ID_DELETE_CURRENT_ITEM,                  /* "删除选中"                    "Delete current" */
     WATCH_TEXT_ID_DELETE_ALL_ITEM,                      /* "删除全部"                    "Delete all" */
@@ -921,6 +922,33 @@ enum
     WATCH_TEXT_ID_SEDENTARY_PROMPT,                     /* "您坐太久了"                    "Sitting too long" */
     WATCH_TEXT_ID_PAGE_MAIN_MENU_TTS,                   /* "大图标播报"                    "Big icon tts" */
     WATCH_TEXT_ID_NEW_SMS_SILENT,                       /* "新信息静音"                    "SMS silent" */
+    WATCH_TEXT_ID_BP_MEASURE_MODE,                      /* "精准模式"                    "Measure mode" */
+    WATCH_TEXT_ID_BP_CALIBRATION_MODE,                  /* "校准模式"                    "Calibration mode" */
+    WATCH_TEXT_ID_BP_ATTEMPT_MODE,                      /* "体验模式"                    "Attempt mode" */
+    WATCH_TEXT_ID_START_MEASURE,                        /* "开始测量"                      "Start test" */
+    WATCH_TEXT_ID_STOP_MEASURE,                         /* "停止测量"                      "Stop test" */
+    WATCH_TEXT_ID_MEASURE_PROMPT,                       /* "测量说明"                      "Measure prompt" */
+    WATCH_TEXT_ID_START_CALIBRATE,                      /* "开始校准"                      "Start calibrate" */
+    WATCH_TEXT_ID_STOP_CALIBRATE,                       /* "停止校准"                      "Stop calibrate" */
+    WATCH_TEXT_ID_CALIBRATE_SUCCESS,                    /* "校准完成"                      "Calibrate success" */
+    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.高血压患者需要进行2轮校准\n3.建议每个月进行重新校准\n4.校准过程和实际血压测量使用同一只手"
+                                                          "Calibrate prompt" */
+    WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_FIRST,            /* "首次校准中，请保持静止"                      "Calibrating,keep still" */
+    WATCH_TEXT_ID_IN_CALIBRATE_PROMPT_SECOND,           /* "再次校准中，请保持静止"                      "Calibrating,keep still" */
+    WATCH_TEXT_ID_IN_MEASURE_PROMPT,                    /* "测量中，请保持静止"                      "Measuring,keep still" */
+    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" */
+    WATCH_TEXT_ID_BLOOD_PRESSURE_NORMAL_PROMPT,         /* "校准结果已上传，30天后可重新校准"                      "Blood pressure normal prompt" */
+    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