gengxin

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 2d234f1..68c0c9e 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
@@ -130,7 +130,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
     lv_obj_t * list = lv_list_create(obj, NULL);
 #ifdef USE_LV_WATCH_UI_CIRCLE
        #ifdef USE_LV_WATCH_UI_466_466
-    lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES*4/5 - 60);
+    lv_obj_set_size(list, LV_HOR_RES - 150, LV_VER_RES - lv_obj_get_y(title) - lv_obj_get_height(title) - 60);
        #else
     lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES*4/5 - 30);
        #endif
@@ -325,6 +325,8 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u
     uint8_t pad_w = w - lv_obj_get_style_pad_left(list, LV_LIST_PART_SCROLLABLE);
 #if USE_LV_WATCH_UI_240_320
        lv_obj_set_size(btn, pad_w, LV_VER_RES / 8 + LV_VER_RES / 8);
+#elif defined(USE_LV_WATCH_UI_466_466)
+       lv_obj_set_size(btn, w, 102);
 #elif defined(USE_LV_WATCH_UI_CIRCLE)
        lv_obj_set_size(btn, pad_w, 56 + 4);
 #else
@@ -340,8 +342,12 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u
     /*time*/
     lv_obj_t * label_time = lv_label_create(cont, NULL);
     lv_label_set_long_mode(label_time, LV_LABEL_LONG_SROLL);
-    lv_obj_set_size(label_time, w * 2 / 5, LV_VER_RES / 8);
+    lv_obj_set_size(label_time, w * 3 / 5, LV_VER_RES / 8);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label_time, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
     lv_obj_add_style(label_time, LV_LABEL_PART_MAIN, &lv_watch_font20);
+#endif
     lv_obj_set_click(label_time, false);
     memset(str, 0, 64);
     snprintf(str, 64, "%02d:%02d", alarm[index].hour, alarm[index].min);
@@ -349,7 +355,11 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u
 
     /*repeat*/
     lv_obj_t * label_repeat = lv_label_create(cont, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label_repeat, LV_LABEL_PART_MAIN,  &lv_watch_font26);
+#else
     lv_obj_add_style(label_repeat, LV_LABEL_PART_MAIN,  &lv_watch_font14);
+#endif
     lv_obj_set_click(label_repeat, false);
     alarm_list_get_repeat_str(alarm[index].repeat_bitmap, str, 64);
     lv_label_set_text(label_repeat, str);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c b/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c
index 4bf5a99..3b64964 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/call_log/call_log.c
@@ -483,7 +483,11 @@ static void call_log_update_call_log_ll(uint8_t call_log_num, nv_watch_call_log_
 static lv_obj_t * call_log_no_log_info_create(lv_obj_t * obj)
 {
     lv_obj_t * label = lv_label_create(obj, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
+#else
     lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); //&lv_watch_font20);
+#endif
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
     lv_label_set_text_id(label, WATCH_TEXT_ID_NO_CALL_LOG_INFO);
@@ -494,6 +498,24 @@ static lv_obj_t * call_log_no_log_info_create(lv_obj_t * obj)
 
 static lv_obj_t * call_log_list_create(lv_obj_t * obj)
 {
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_t * title = lv_label_create(obj, NULL);
+    lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+    lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+    lv_obj_set_click(title, false);
+    lv_label_set_text_id(title, WATCH_TEXT_ID_CALL_LOG);
+    lv_obj_align(title, obj, LV_ALIGN_IN_TOP_MID, 0, 20);
+
+    lv_obj_t * list = lv_list_create(obj, NULL);
+    lv_page_set_edge_flash(list, true);
+    lv_obj_add_style(list, LV_LIST_PART_EDGE_FLASH, &lv_watch_cont_opa1);
+    lv_obj_add_style(list, LV_LIST_PART_BG, &lv_watch_style_transp);   
+       lv_list_set_scrollbar_mode(list, LV_SCROLLBAR_MODE_OFF);
+       lv_obj_set_size(list, LV_HOR_RES - 100, LV_VER_RES - lv_obj_get_y(title) - lv_obj_get_height(title) - 60);
+    lv_obj_align(list, title, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); // 0);
+    lv_watch_obj_add_element(list);
+
+#else
     lv_obj_t * title = lv_label_create(obj, NULL);
     lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
     lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
@@ -513,6 +535,7 @@ static lv_obj_t * call_log_list_create(lv_obj_t * obj)
 #endif
     lv_obj_align(list, title, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); // 0);
     lv_watch_obj_add_element(list);
+#endif
 
     return list;
 }
@@ -660,6 +683,14 @@ static void call_log_content_create(lv_obj_t * list, uint8_t call_log_num, nv_wa
                lv_btn_set_layout(btn[i], LV_LAYOUT_ROW_MID);
                //lv_obj_set_event_cb(btn[i], call_log_log_btn_event_cb);
                //lv_watch_set_free_num(btn[i], i);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_style_local_pad_inner(btn[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 5);
+               lv_obj_set_style_local_pad_left(btn[i],  LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 5);
+               lv_obj_set_style_local_pad_right(btn[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 5);
+               lv_obj_set_style_local_pad_top(btn[i],  LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 5);
+               lv_obj_set_style_local_pad_bottom(btn[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 5);
+               lv_obj_set_style_local_outline_width(btn[i], LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+       #endif
 
         info = &call_log_list->info[i];
         tmp_num = (char *)lv_mem_alloc(NV_CONTACTS_MAX_NUMBER_LEN);
@@ -671,7 +702,11 @@ static void call_log_content_create(lv_obj_t * list, uint8_t call_log_num, nv_wa
                lv_obj_t * cont = lv_cont_create(btn[i], NULL);
                lv_cont_set_layout(cont, LV_LAYOUT_OFF);
                lv_obj_set_width(cont, lv_obj_get_width(btn[i]));
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_height(cont, 102);
+       #else
                lv_obj_set_height(cont, 70); //lv_obj_get_height(btn[i]));
+       #endif
                lv_obj_add_style(cont, LV_CONT_PART_MAIN, &lv_style_transp);
                lv_page_glue_obj(cont, true);
                lv_watch_obj_add_element(cont);
@@ -680,17 +715,27 @@ static void call_log_content_create(lv_obj_t * list, uint8_t call_log_num, nv_wa
                lv_watch_set_free_num(cont, i);
 
                label_number = lv_label_create(cont, NULL);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label_number, LV_OBJ_PART_MAIN, &lv_watch_font40);
+       #else
                lv_obj_add_style(label_number, LV_OBJ_PART_MAIN, &lv_watch_font24);
-               lv_label_set_text(label_number, info->number);
-               lv_label_set_long_mode(label_number, LV_LABEL_LONG_SROLL_CIRC);
-               lv_obj_set_width(label_number, lv_obj_get_width(btn[i]) - 40);
+       #endif
+
                if(contact_info) 
                {
                        if(contact_info->contact_name)
                                lv_label_set_text(label_number, contact_info->contact_name);
+                       else
+                               lv_label_set_text(label_number, info->number);
                        lv_mem_free(contact_info);
                        contact_info = NULL;
                }
+               else
+               {
+                       lv_label_set_text(label_number, info->number);
+               }
+               lv_label_set_long_mode(label_number, LV_LABEL_LONG_SROLL_CIRC);
+               lv_obj_set_width(label_number, lv_obj_get_width(btn[i]) - 40);
 
                lv_obj_t * cont_status_time =  lv_cont_create(cont, NULL);
                lv_cont_set_layout(cont_status_time, LV_LAYOUT_ROW_MID);
@@ -716,6 +761,9 @@ static void call_log_content_create(lv_obj_t * list, uint8_t call_log_num, nv_wa
                        snprintf(time_str, 10, "%02d/%02d", info->month, info->day);
                }
                label_time = lv_label_create(cont_status_time, NULL);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label_time, LV_OBJ_PART_MAIN, &lv_watch_font30);
+       #endif
                lv_label_set_text(label_time, time_str);
                lv_obj_set_base_dir(label_time, LV_BIDI_DIR_LTR);
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c
index 18b705d..fd88e78 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_http_protocol.c
@@ -214,10 +214,16 @@ void mmi_hengai_bp_measure_raw_data_send(void)
        char * post_data = cJSON_Print(json_send);
        cJSON_Delete(json_send);
        json_send = NULL;
+
+       char url[256] = {0};
+       char * url_suffix = "/health/bp/measurement";
+       sprintf(url, "%s%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, url_suffix);
+       int ret = mmi_hengai_http_post_data(url, post_data, token);
+       cJSON_free(post_data);  
 #else
 
        int temp_len = 0;
-       int post_data_len = MMI_HENGAI_BP_RAW_DATA_LEN * 9 + 256;
+       int post_data_len = MMI_HENGAI_BP_RAW_DATA_LEN * 11 + 256;
        char * post_data = lv_mem_alloc(post_data_len);
        if(NULL == post_data)
                return ;
@@ -250,7 +256,6 @@ void mmi_hengai_bp_measure_raw_data_send(void)
        temp_len += sprintf(post_data + temp_len, "\"sample_rate\":%d}", MMI_HENGAI_BP_RAW_DATA_SAMPLE_RATE);
 
        HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len);
-#endif 
 
        char url[256] = {0};
        char * url_suffix = "/health/bp/measurement";
@@ -262,6 +267,7 @@ void mmi_hengai_bp_measure_raw_data_send(void)
                lv_mem_free(post_data);
                post_data = NULL;
        }
+#endif 
        
        if(0 == ret)
        {
@@ -333,14 +339,7 @@ void mmi_hengai_bp_calibrate_model_send(void)
        char * url_suffix = "/health/bp/model";
        sprintf(url, "%s%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, url_suffix);
        int ret = mmi_hengai_http_post_data(url, post_data, token);
-
-/*
-       if(NULL != post_data)
-       {
-               lv_mem_free(post_data);
-               post_data = NULL;
-       }
-*/
+       cJSON_free(post_data);
        
        if(0 == ret)
        {
@@ -402,9 +401,16 @@ void mmi_hengai_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t bp_
        char * post_data = cJSON_Print(json_send);
        cJSON_Delete(json_send);
        json_send = NULL;
+
+       char url[256] = {0};
+       char * url_suffix = "/health/bp/calibration";
+       sprintf(url, "%s%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, url_suffix);
+       int ret = mmi_hengai_http_post_data(url, post_data, token);
+       cJSON_free(post_data);  
+
 #else
        int temp_len = 0;
-       int post_data_len = MMI_HENGAI_BP_RAW_DATA_LEN * 9 + 256;
+       int post_data_len = MMI_HENGAI_BP_RAW_DATA_LEN * 11 + 256;
        char * post_data = lv_mem_alloc(post_data_len);
        if(NULL == post_data)
                return ;
@@ -443,7 +449,6 @@ void mmi_hengai_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t bp_
        temp_len += sprintf(post_data + temp_len, "\"category\":%d}", calibrate_times);
 
        HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len);
-#endif
 
        char url[256] = {0};
        char * url_suffix = "/health/bp/calibration";
@@ -455,6 +460,7 @@ void mmi_hengai_bp_calibrate_raw_data_send(uint8_t calibrate_times, uint16_t bp_
                lv_mem_free(post_data);
                post_data = NULL;
        }
+#endif
        
        if(0 == ret)
        {
@@ -523,15 +529,7 @@ void mmi_hengai_health_lib_activation_feedback(void)
        char * url_suffix = "/sinklib/activation/feedback";
        sprintf(url, "%s%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, url_suffix);
        int ret = mmi_hengai_http_post_data(url, post_data, NULL);
-
-/*
-       if(NULL != post_data)
-       {
-               lv_mem_free(post_data);
-               post_data = NULL;
-       }
-*/
-       
+       cJSON_free(post_data);  
        if(0 == ret)
        {
                cJSON * json_recv = NULL;
@@ -603,6 +601,12 @@ void mmi_hengai_health_lib_activation_check_action(void)
                cJSON_Delete(json_send);
                json_send = NULL;
 
+               char url[256] = {0};
+               char * url_suffix = "/sinklib/activation";
+               sprintf(url, "%s%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, url_suffix);
+               int ret = mmi_hengai_http_post_data(url, post_data, NULL);
+               cJSON_free(post_data);
+
        #else
                int temp_len = 0;
                int post_data_len = 512;
@@ -631,7 +635,6 @@ void mmi_hengai_health_lib_activation_check_action(void)
                temp_len += sprintf(post_data + temp_len, "\"request_code\":\"%s\"}", req_code);
        
                HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, temp_len);
-       #endif
 
                char url[256] = {0};
                char * url_suffix = "/sinklib/activation";
@@ -643,6 +646,7 @@ void mmi_hengai_health_lib_activation_check_action(void)
                        lv_mem_free(post_data);
                        post_data = NULL;
                }
+       #endif
                
                if(0 == ret)
                {
@@ -715,15 +719,7 @@ void mmi_hengai_algorithm_interface_login_action(void)
                char * url_suffix = "/entrance/user/login";
                sprintf(url, "%s%s", HENGAI_HTTP_POST_URL_COMMON_PREFIX, url_suffix);
                int ret = mmi_hengai_http_post_data(url, post_data, NULL);
-               
-       /*
-               if(NULL != post_data)
-               {
-                       lv_mem_free(post_data);
-                       post_data = NULL;
-               }
-       */
-               
+               cJSON_free(post_data);          
                if(0 == ret)
                {
                        HENGAI_HEALTH_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, strlen(s_hengai_http_revceive_buf));

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c
index 25df25c..43caa51 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c
@@ -14,6 +14,17 @@
 /*********************
  *      DEFINES
  *********************/
+#ifdef USE_LV_WATCH_UI_466_466
+#define DIAL_PAD_TA_W    (LV_HOR_RES - 82)
+#define DIAL_PAD_TA_H    60
+#define DIAL_PAD_X_NUM  3
+#define DIAL_PAD_Y_NUM  4
+#define DIAL_PAD_NUM  (DIAL_PAD_X_NUM * DIAL_PAD_Y_NUM)
+#define DIAL_PAD_CONT_W  DIAL_PAD_TA_W
+#define DIAL_PAD_CONT_H  (LV_VER_RES - DIAL_PAD_TA_H - 40 - 50)
+
+#else
+
 #define DIAL_PAD_TA_W    (LV_HOR_RES - 30)
 #define DIAL_PAD_TA_H    35
 #define DIAL_PAD_X_NUM  3
@@ -25,6 +36,7 @@
 #else
 #define DIAL_PAD_CONT_H  (LV_VER_RES - DIAL_PAD_TA_H - 25)
 #endif
+#endif
 
 #define DIAL_PAD_TEST  0    //for test code
 
@@ -90,7 +102,11 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj)
                lv_obj_t * label = lv_label_create(obj, NULL);
                lv_label_set_text_id(label, WATCH_TEXT_ID_DIAL_PAD_SWITCH_PROMPT);
                lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+       #else
                lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+       #endif
                lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10);
                
                return obj;
@@ -106,6 +122,26 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj)
     lv_textarea_set_text_align(ext->ta, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_size(ext->ta, DIAL_PAD_TA_W, DIAL_PAD_TA_H);
 #ifdef USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_style_local_bg_opa(ext->ta, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_obj_add_style(ext->ta, LV_TEXTAREA_PART_BG,&lv_watch_font36);
+    lv_obj_align(ext->ta, NULL, LV_ALIGN_IN_TOP_MID, 0, 50);
+    lv_obj_set_base_dir(ext->ta, LV_BIDI_DIR_LTR);
+    lv_watch_obj_add_element(ext->ta);
+
+    static lv_point_t s_line_points[2] = {0};
+       lv_obj_t * line = lv_line_create(obj, NULL);
+       lv_obj_set_style_local_line_color(line, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+       lv_obj_set_style_local_line_opa(line, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_50);
+       lv_obj_set_style_local_line_width(line, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1);
+       s_line_points[0].x = 10;
+       s_line_points[0].y = lv_obj_get_y(ext->ta) + lv_obj_get_height(ext->ta) + 3;
+       s_line_points[1].x = lv_obj_get_width(obj) - s_line_points[0].x;
+       s_line_points[1].y = s_line_points[0].y;
+       lv_line_set_points(line, s_line_points, 2);
+       lv_obj_set_x(line, 0);
+
+       #else
        lv_obj_set_style_local_bg_opa(ext->ta, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
     lv_obj_align(ext->ta, NULL, LV_ALIGN_IN_TOP_MID, 0, 10 + 5);
     lv_obj_set_base_dir(ext->ta, LV_BIDI_DIR_LTR);
@@ -122,6 +158,7 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj)
        s_line_points[1].y = s_line_points[0].y;
        lv_line_set_points(line, s_line_points, 2);
        lv_obj_set_x(line, 0);
+       #endif
        
 #else
     lv_obj_align(ext->ta, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
@@ -132,7 +169,11 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj)
     //circle
     ext->cont_circle = lv_cont_create(obj, NULL);
 #ifdef USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(ext->cont_circle, 120, 80);
+       #else
     lv_obj_set_size(ext->cont_circle, 50, 50 - 10);
+       #endif
 #else
     lv_obj_set_size(ext->cont_circle, 50, 50);
 #endif
@@ -270,7 +311,11 @@ static lv_res_t dialpad_btn_press_action(lv_obj_t * btn)
         //show circle
         lv_obj_set_hidden(ext->cont_circle, false);
        #ifdef USE_LV_WATCH_UI_CIRCLE
+               #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_pos(ext->cont_circle, lv_obj_get_x(btn) + 45, lv_obj_get_y(btn) + 108);
+               #else
                lv_obj_set_pos(ext->cont_circle, lv_obj_get_x(btn) + 19, lv_obj_get_y(btn) + 48 + 5);
+               #endif
        #else
         lv_obj_set_pos(ext->cont_circle, lv_obj_get_x(btn) + 19, lv_obj_get_y(btn) + 48);
        #endif

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 db6ae23..9a093a3 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
@@ -508,7 +508,11 @@ void wechat_msg_item_delete_ok_btn_event_cb(lv_obj_t * obj, lv_event_t e)
                        lv_obj_clean(ext->delete_bg);
 
                        lv_obj_t * label_prompt = lv_label_create(ext->delete_bg, NULL);
+               #ifdef USE_LV_WATCH_UI_466_466
+                       lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &lv_watch_font40_black);
+               #else
                        lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+               #endif
                        lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_DEL_SUCCESS);
                        lv_obj_align(label_prompt, ext->delete_bg, LV_ALIGN_CENTER, 0, -10);
                        
@@ -652,7 +656,7 @@ void wechat_chat_list_msg_item_delete_create(void)
            lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, lv_color_make(0x47, 0xA6, 0xFF));
            lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
        #ifdef USE_LV_WATCH_UI_466_466
-               lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 60, -50);
+               lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 70, -60);
        #else
            lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 10, -20);
        #endif
@@ -671,7 +675,7 @@ void wechat_chat_list_msg_item_delete_create(void)
            lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_make(0xFF, 0x6F, 0x91));
            lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, lv_color_make(0xFF, 0x6F, 0x91));
        #ifdef USE_LV_WATCH_UI_466_466
-               lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -60, -50);
+               lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -70, -60);
        #else
            lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -10, -20);
        #endif

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
index 864e322..bcd74e4 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
@@ -1573,6 +1573,15 @@ static void mmi_phonebook_contacts_list_create(lv_obj_t * obj, nv_watch_phoneboo
     if(NULL == ext)
                return;
 
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_t * label_title = lv_label_create(obj, NULL);
+       //lv_obj_set_size(label_title, LV_HOR_RES, 40);
+       lv_obj_add_style(label_title, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+       lv_label_set_align(label_title, LV_LABEL_ALIGN_CENTER);
+       lv_label_set_text_id(label_title, WATCH_TEXT_ID_PHONEBOOK);
+       lv_obj_align(label_title, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
+       lv_obj_set_click(label_title, false);
+#else
        lv_obj_t * label_title = lv_label_create(obj, NULL);
        lv_obj_set_size(label_title, LV_HOR_RES, 40);
        lv_obj_add_style(label_title, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
@@ -1580,14 +1589,20 @@ static void mmi_phonebook_contacts_list_create(lv_obj_t * obj, nv_watch_phoneboo
        lv_label_set_text_id(label_title, WATCH_TEXT_ID_PHONEBOOK);
        lv_obj_align(label_title, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
        lv_obj_set_click(label_title, false);
+#endif
        
     lv_obj_t * list = lv_list_create(obj, NULL);
     lv_page_set_edge_flash(list, true);
     lv_obj_add_style(list, LV_LIST_PART_EDGE_FLASH, &lv_watch_cont_opa1);
     lv_obj_add_style(list, LV_LIST_PART_BG, &lv_watch_style_transp);
 #ifdef USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(list, LV_HOR_RES - 100, LV_VER_RES- lv_obj_get_y(label_title) - lv_obj_get_height(label_title) - 60);
+    lv_obj_align(list, label_title, LV_ALIGN_OUT_BOTTOM_MID, 0, 5);
+       #else
     lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES - 40 - 20);
     lv_obj_align(list, label_title, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); // 0);
+       #endif
 #else
     lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES - 40);
     lv_obj_align(list, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
@@ -1622,7 +1637,11 @@ static void mmi_phonebook_contacts_list_create(lv_obj_t * obj, nv_watch_phoneboo
                lv_obj_t * cont = lv_cont_create(btn, NULL);
                lv_cont_set_layout(cont, LV_LAYOUT_OFF);
                lv_obj_set_width(cont, lv_obj_get_width(btn));
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_height(cont, 70);
+       #else
                lv_obj_set_height(cont, 56); // LV_VER_RES / 5); // LV_VER_RES / 4); //lv_obj_get_height(btn));
+       #endif
                lv_obj_add_style(cont, LV_CONT_PART_MAIN, &lv_style_transp);
                lv_page_glue_obj(cont, true);
                lv_watch_obj_add_element(cont);
@@ -1631,7 +1650,11 @@ static void mmi_phonebook_contacts_list_create(lv_obj_t * obj, nv_watch_phoneboo
                lv_watch_set_free_num(cont, i);
 
                label = lv_label_create(cont, NULL);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
+       #else
                lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+       #endif
                lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL);
                lv_obj_set_width(label, lv_obj_get_width(cont) - 40);
                if('\0' != contact_info->name[0])
@@ -1648,7 +1671,11 @@ static void mmi_phonebook_contacts_list_create(lv_obj_t * obj, nv_watch_phoneboo
 static void mmi_phonebook_no_contacts_create(lv_obj_t * obj)
 {
     lv_obj_t * label = lv_label_create(obj, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
+#else
     lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
+#endif
 
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
@@ -1661,7 +1688,11 @@ static void mmi_phonebook_no_contacts_create(lv_obj_t * obj)
 static void mmi_phonebook_no_sim_create(lv_obj_t * obj)
 {
     lv_obj_t * label = lv_label_create(obj, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
+#else
     lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
+#endif
 
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);

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 28dd845..330c979 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
@@ -85,10 +85,9 @@ static mmi_page_main_menu_info_t s_main_menu_one_page[] =
 #ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__
        {{ ICON_CALLLOG_ONE_PAGE, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb}, AUDIO_MAIN_MENU_CALL_LOG},
 #endif
-       //²âÊÔsos_create_event_cb
-
+#ifdef MMI_PROJECT_Z5_DS_Z12_COMMON
        {{ ICON_SOS_ONE_PAGE, WATCH_TEXT_ID_SOS, sos_create_event_cb}, AUDIO_MAIN_MENU_CALL_LOG},
-
+#endif
 #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
        {{ ICON_HEART_RATE_ONE_PAGE, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb}, AUDIO_MAIN_MENU_HEART_RATE},
 #endif
@@ -144,10 +143,9 @@ static watch_app_info_t s_main_menu_list[] =
 #ifndef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__
        { ICON_CALLLOG_LIST, WATCH_TEXT_ID_CALL_LOG, call_log_create_event_cb },
 #endif
-       //²âÊÔsos_create_event_cb
+#ifdef MMI_PROJECT_Z5_DS_Z12_COMMON
        { ICON_SOS_LIST, WATCH_TEXT_ID_SOS, sos_create_event_cb},
-
-
+#endif
 #ifdef __MMI_HEALTH_MEASURE_HEART_SUPPORT__
        { ICON_HEART_RATE_LIST, WATCH_TEXT_ID_HEART_RATE, health_heart_rate_create_event_cb},
 #endif

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c
index a0bbd07..ba66fa1 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sos/sos.c
@@ -74,6 +74,27 @@ static void set_sos_status(uint8_t state)
     s_sos_state = state;
 }
 
+static void mmi_sos_sms_send_action(char * number)
+{
+       if(NULL == number)
+       {
+               printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+               return ;
+       }
+       
+       char * sms_number = (char *)lv_mem_alloc(NV_CONTACTS_MAX_NUMBER_LEN);
+       _lv_memset_00(sms_number, NV_CONTACTS_MAX_NUMBER_LEN);
+       _lv_memcpy(sms_number, number, NV_CONTACTS_MAX_NUMBER_LEN);
+
+       char * sms_data = (char *)lv_mem_alloc(256);
+       _lv_memset_00(sms_data, 256);
+       //sprintf(sms_data, "%s", lv_lang_get_text(WATCH_TEXT_ID_SOS_SMS_CONTENT));
+
+       uint8_t sms_data_len = strlen(sms_data);
+       
+       app_adaptor_sms_send_req(sms_number, sms_data, sms_data_len, NULL, NULL);
+}
+
 void sos_destory(void)
 {
        lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_SOS);
@@ -111,6 +132,7 @@ static void sos_do_dailing_next(void)
                if(NULL != number)
                {
                        _lv_memcpy(number, s_sos_number.number[s_sos_dial_index % NV_WATCH_SOS_NUMBER_MAX], NV_CONTACTS_MAX_NUMBER_LEN);
+                       mmi_sos_sms_send_action(number);
                phone_voice_call_req(number);
        }
        }
@@ -161,6 +183,7 @@ static void sos_task(lv_task_t * task)
                if(NULL != number)
                {
                        _lv_memcpy(number, s_sos_number.number[s_sos_dial_index], NV_CONTACTS_MAX_NUMBER_LEN);
+                       mmi_sos_sms_send_action(number);
                phone_voice_call_req(number);
        }
     }
@@ -192,7 +215,11 @@ static lv_obj_t * sos_no_contacts_create(lv_obj_t * activity_obj)
         return NULL;
 
     lv_obj_t * label = lv_label_create(obj, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font40);
+#else
     lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+#endif
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
     lv_label_set_text_id(label, WATCH_TEXT_ID_NO_NUM);