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 634e6a6..72b3ecd 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
@@ -837,7 +837,7 @@ const void * lang_text_ch[] = {
     "已在手机端解绑 请重新绑定",
         
     //CHENG_MODIFY
-    "调试", // WATCH_TEXT_ID_DEBUG,
+    "调试项", // WATCH_TEXT_ID_FOR_DEBUG,
     "正在测量",
     "测量完成",
     "测量失败",
@@ -935,6 +935,10 @@ const void * lang_text_ch[] = {
     "精准模式", // WATCH_TEXT_ID_BP_MEASURE_MODE,
     "校准模式", // WATCH_TEXT_ID_BP_CALIBRATION_MODE,
     "体验模式", // WATCH_TEXT_ID_BP_ATTEMPT_MODE,
+    "校准记录", // WATCH_TEXT_ID_BP_CALIBRATION_RECORD,
+    "查看记录", // WATCH_TEXT_ID_BP_RECORD_CHECK,
+    "无校准记录", // WATCH_TEXT_ID_BP_NO_RECORD,
+    "最新校准时间", // WATCH_TEXT_ID_BP_LAST_CALIBRATION_RECORD,
     "结果分析中", // WATCH_TEXT_ID_WAIT_RESULT,
     "开始测量", // WATCH_TEXT_ID_START_MEASURE,
     "测量中", // WATCH_TEXT_ID_IN_MEASURING,

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 4487a68..c767dc7 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
@@ -838,7 +838,7 @@ const void * lang_text_en[] = {
     "Unbind on the mobile phone, please rebind",
 
     //CHENG_MODIFY
-    "Debug", // WATCH_TEXT_ID_DEBUG,
+    "FOR DEBUG", // WATCH_TEXT_ID_FOR_DEBUG,
     "Measuring",
     "Measure done",
     "Measure fail",
@@ -936,6 +936,10 @@ const void * lang_text_en[] = {
     "Measure mode", // WATCH_TEXT_ID_BP_MEASURE_MODE,
     "Calibration mode", // WATCH_TEXT_ID_BP_CALIBRATION_MODE,
     "Attempt mode", // WATCH_TEXT_ID_BP_ATTEMPT_MODE,
+    "Calibration record", // WATCH_TEXT_ID_BP_CALIBRATION_RECORD,
+    "View record", // WATCH_TEXT_ID_BP_RECORD_CHECK,
+    "No record", // WATCH_TEXT_ID_BP_NO_RECORD,
+    "The last record", // WATCH_TEXT_ID_BP_LAST_CALIBRATION_RECORD,
     "Wait result", // WATCH_TEXT_ID_WAIT_RESULT,
     "Start measure", // WATCH_TEXT_ID_START_MEASURE,
     "Measuring" // WATCH_TEXT_ID_IN_MEASURING,

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 51886f6..23867e2 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
@@ -217,7 +217,8 @@ enum
        ACT_ID_HENG_AI_BP,
        ACT_ID_HENG_AI_BP_MEASURE,
        ACT_ID_HENG_AI_BP_CALIBRATE,
-       ACT_ID_HENG_AI_BP_ATTEMPT,
+       //ACT_ID_HENG_AI_BP_ATTEMPT,
+       ACT_ID_HENG_AI_BP_RECORD,
 #endif
 #ifdef __MMI_CUSTOM_BEI_KE_RUI_SHENG__
        ACT_ID_AI_TALK,

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 c3ca4ac..ee29498 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -844,7 +844,7 @@ enum
     WATCH_TEXT_ID_ALIPAY_UNBIND_TIPS,               /* "已在手机端解绑 请重新绑定"                 "Unbind on the mobile phone, please rebind" */
 
     //CHENG_MODIFY
-    WATCH_TEXT_ID_DEBUG,                             /* "调试"           "Debug" */
+    WATCH_TEXT_ID_FOR_DEBUG,                         /* "调试项"           "FOR DEBUG" */
     WATCH_TEXT_ID_MEASURING,                         /*"正在测量"        "Measuring"*/
     WATCH_TEXT_ID_MEASURE_DONE,                      /*"测量完成"        "Measure done"*/
     WATCH_TEXT_ID_MEASURE_FAIL,                      /*"测量失败"        "Measure fail"*/
@@ -942,6 +942,10 @@ enum
     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_BP_CALIBRATION_RECORD,                /* "校准记录"                    "Calibration record" */
+    WATCH_TEXT_ID_BP_RECORD_CHECK,                      /* "查看记录"                    "View record" */
+    WATCH_TEXT_ID_BP_NO_RECORD,                         /* "无校准记录"                    "No record" */
+    WATCH_TEXT_ID_BP_LAST_CALIBRATION_RECORD,           /* "最新校准时间"                    "The last record" */
     WATCH_TEXT_ID_WAIT_RESULT,                          /* "结果分析中"                      "Wait result" */
     WATCH_TEXT_ID_START_MEASURE,                        /* "开始测量"                      "Start measure" */
     WATCH_TEXT_ID_IN_MEASURING,                         /* "测量中"                      "Measuring"*/

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
index ebb0b83..ca73770 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include "lv_watch.h"
 
-#if 1
+#if USE_LV_WATCH_ALARM_SET
 
 /*********************
  *      DEFINES
@@ -898,7 +898,7 @@ static lv_obj_t * alarm_edit_create(lv_obj_t * activity_obj)
     lv_obj_t * btn_del = lv_btn_create(obj, NULL);
     lv_obj_set_size(btn_del, LV_HOR_RES/5, LV_VER_RES/5);
     lv_obj_t * img_del = lv_img_create(btn_del, NULL);
-    lv_img_set_src(img_del, ICON_ALBUM_DELETE_BLUE); // ICON_IMGVIEWER_DELETE_BLUE);
+    lv_img_set_src(img_del, ICON_ALARM_DELETE_BLUE);
     lv_obj_add_style(btn_del, LV_BTN_PART_MAIN, &lv_style_transp_tight);
     if(LV_BIDI_DIR_RTL == lv_obj_get_base_dir(btn_del)) {
         lv_obj_align(btn_del, obj, LV_ALIGN_IN_TOP_LEFT, -15, 20);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c
index b4f59ec..fd25581 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.c
@@ -46,6 +46,7 @@ void health_heart_rate_display_update(void)
 
                case STATE_HEART_RATE_MEASURE_FAIL:
                        lv_img_set_src(ext->img, ICON_HEART_RATE_MEASURE_FAIL);
+                       lv_obj_align(ext->img, NULL, LV_ALIGN_IN_TOP_MID, 0, HEART_MEASURE_IMAGE_Y);
                        lv_obj_set_hidden(ext->img, FALSE);
 
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_FAIL);
@@ -60,6 +61,7 @@ void health_heart_rate_display_update(void)
 
                case STATE_HEART_RATE_MEASURE_DONE:
                        lv_img_set_src(ext->img, ICON_HEART_RATE_MEASURE_DONE);
+                       lv_obj_align(ext->img, NULL, LV_ALIGN_IN_TOP_MID, 0, HEART_MEASURE_IMAGE_Y);
                        lv_obj_set_hidden(ext->img, FALSE);
 
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_DONE);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
index 226c82c..e7063f2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c
@@ -48,6 +48,7 @@ void health_spo2_display_update(void)
 
                case STATE_SPO2_MEASURE_FAIL:
                        lv_img_set_src(ext->img, ICON_SPO2_MEASURE_FAIL);
+                       lv_obj_align(ext->img, NULL, LV_ALIGN_IN_TOP_MID, 0, SPO2_MEASURE_IMAGE_Y);
                        lv_obj_set_hidden(ext->img, FALSE);
 
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_FAIL);
@@ -62,6 +63,7 @@ void health_spo2_display_update(void)
 
                case STATE_SPO2_MEASURE_DONE:
                        lv_img_set_src(ext->img, ICON_SPO2_MEASURE_DONE);
+                       lv_obj_align(ext->img, NULL, LV_ALIGN_IN_TOP_MID, 0, SPO2_MEASURE_IMAGE_Y);
                        lv_obj_set_hidden(ext->img, FALSE);
 
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_DONE);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c
index 718f339..3bbaa54 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.c
@@ -48,6 +48,7 @@ void health_temperature_display_update(void)
 
                case STATE_TEMPERATURE_MEASURE_FAIL:
                        lv_img_set_src(ext->img, ICON_TEMPERATURE_MEASURE_FAIL);
+                       lv_obj_align(ext->img, NULL, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_MEASURE_IMAGE_Y);
                        lv_obj_set_hidden(ext->img, FALSE);
 
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_FAIL);
@@ -62,6 +63,7 @@ void health_temperature_display_update(void)
 
                case STATE_TEMPERATURE_MEASURE_DONE:
                        lv_img_set_src(ext->img, ICON_TEMPERATURE_MEASURE_DONE);
+                       lv_obj_align(ext->img, NULL, LV_ALIGN_IN_TOP_MID, 0, TEMPERATURE_MEASURE_IMAGE_Y);
                        lv_obj_set_hidden(ext->img, FALSE);
 
                        lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_MEASURE_DONE);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
index ad0e986..5bcb44d 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
@@ -181,7 +181,9 @@ void wechat_prepare_destory(lv_obj_t * activity_obj)
 
        if(WECHAT_CREATED_FROM_ALBUM == ext->from)
        {
+       #if USE_LV_WATCH_ALBUM
         album_photo_share_flag_reset();
+       #endif
        }
        else if(WECHAT_CREATED_FROM_IMGVIEWER == ext->from)
        {
@@ -1137,7 +1139,7 @@ void wechat_list_out_of_memory_create(lv_obj_t * obj)
        lv_obj_add_style(cont_bg, LV_CONT_PART_MAIN, &lv_watch_black_tight);
 
        lv_obj_t * img_mem = lv_img_create(cont_bg, NULL);
-       lv_img_set_src(img_mem, ICON_CAMERA_MEMORY);
+       lv_img_set_src(img_mem, ICON_WECHAT_MEMORY);
        lv_obj_align(img_mem, NULL, LV_ALIGN_IN_TOP_MID, 0, 40);
 
        lv_obj_t * label = lv_label_create(cont_bg, NULL);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
index aa2356a..d624054 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
@@ -181,7 +181,9 @@ void wechat_prepare_destory(lv_obj_t * activity_obj)
 
        if(WECHAT_CREATED_FROM_ALBUM == ext->from)
        {
+       #if USE_LV_WATCH_ALBUM
         album_photo_share_flag_reset();
+       #endif
        }
        else if(WECHAT_CREATED_FROM_IMGVIEWER == ext->from)
        {
@@ -1104,7 +1106,7 @@ void wechat_list_out_of_memory_create(lv_obj_t * obj)
        lv_obj_add_style(cont_bg, LV_CONT_PART_MAIN, &lv_watch_black_tight);
 
        lv_obj_t * img_mem = lv_img_create(cont_bg, NULL);
-       lv_img_set_src(img_mem, ICON_CAMERA_MEMORY);
+       lv_img_set_src(img_mem, ICON_WECHAT_MEMORY);
        lv_obj_align(img_mem, NULL, LV_ALIGN_IN_TOP_MID, 0, 40);
 
        lv_obj_t * label = lv_label_create(cont_bg, NULL);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
index 460e22d..28dd845 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu_data.c
@@ -10,7 +10,7 @@
 
 // custome debug version
 #ifdef __MMI_ZHSX_SUPPORT_CUSTOME_DEBUG_VERSION__
-#define WATCH_TEXT_ID_SETTINGS (WATCH_TEXT_ID_DEBUG)
+#define WATCH_TEXT_ID_SETTINGS (WATCH_TEXT_ID_FOR_DEBUG)
 #endif
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_common.c b/2.sdk/sdk/gui/lv_watch/lv_watch_common.c
index e9e4b95..0ca7cbf 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_common.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_common.c
@@ -526,7 +526,9 @@ void lv_watch_go_home(void)
 
         if(ext->actId > ACT_ID_ONE_LEVEL_MAX) {
             if(ext->actId == ACT_ID_ALBUM) {
+                       #if USE_LV_WATCH_ALBUM
                 album_destory(false);
+                       #endif
             } else if(NULL != ext->prepare_destory) {
                 ext->prepare_destory(obj);
             }

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 a1cfe3d..711bf8e 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -484,6 +484,10 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_ALBUM_SELECTED           "R:/png/album/icon_selected.png"
 #endif
 
+#if USE_LV_WATCH_ALARM_SET
+#define ICON_ALARM_DELETE_BLUE        "R:/png/album/icon_delete_blue.png"
+#endif
+
 //camera
 #if USE_LV_WATCH_CAMERA != 0
 #define ICON_CAMERA_SHOOT             "R:/png/camera/icon_camera_shoot.png"
@@ -924,6 +928,9 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_WECHAT_SENDING_FAILED                    "R:/png/wechat/ICON_WECHAT_SENDING_FAILED.png"
 #define ICON_WECHAT_SEND_EMO                            "R:/png/wechat/ICON_WECHAT_SEND_EMO.png"
 #define ICON_WECHAT_UNREAD_FLAG                              "R:/png/wechat/ICON_WECHAT_UNREAD_FLAG.png"
+
+#define ICON_WECHAT_MEMORY            "R:/png/camera/icon_memory.png"
+
 #endif
 
 //healthy measure
@@ -1016,7 +1023,8 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_HENGAI_BP_SUCCESS           "R:/png/custom_function/ICON_HENGAI_BP_SUCCESS.png"
 #define ICON_HENGAI_BP_MEASURE_MODE           "R:/png/custom_function/ICON_HENGAI_BP_MEASURE_MODE.png"
 #define ICON_HENGAI_BP_CALIBRATION_MODE           "R:/png/custom_function/ICON_HENGAI_BP_CALIBRATION_MODE.png"
-#define ICON_HENGAI_BP_ATTEMPT_MODE           "R:/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png"
+//#define ICON_HENGAI_BP_ATTEMPT_MODE           "R:/png/custom_function/ICON_HENGAI_BP_ATTEMPT_MODE.png"
+#define ICON_HENGAI_BP_CALIBRATION_RECORD           "R:/png/custom_function/ICON_HENGAI_BP_CALIBRATION_RECORD.png"
 
 #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"

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 7c2dcb8..471b35d 100644 (file)
--- 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
@@ -406,10 +406,12 @@ bool mmi_protocol_action_send_talk(char * data_buff, int data_buff_len)
 
 bool mmi_protocol_action_send_photo(uint8_t type, char * time_str, char * data_buff, int data_buff_len)
 {
+#if USE_LV_WATCH_CAMERA
        if(false == mmi_protocol_check_state_before_send_action())
                return false;
        
        return mmi_protocol_fzd_action_send_photo(type, time_str, data_buff, data_buff_len);
+#endif
 }
 
 bool mmi_protocol_action_send_location(MMI_WATCH_LOCATION_DATA_T * location_data)