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 493d8f5..faf283a 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
@@ -852,6 +852,11 @@ const void * lang_text_ch[] = {
     "收银员扫一扫完成付款", // WATCH_TEXT_ID_ZFB_PAY_PROMPT
     "请对方使用支付宝扫码", // WATCH_TEXT_ID_ZFB_COLLECT_PROMPT,
     "完成", // WATCH_TEXT_ID_ZFB_FINISH
+    "视频呼出中", // WATCH_TEXT_ID_VIDEO_CALL_DAILING,
+    "视频呼入中", // WATCH_TEXT_ID_VIDEO_CALL_RINGING,
+    "语音呼出中", // WATCH_TEXT_ID_VOICE_CALL_DAILING,
+    "语音呼入中", // WATCH_TEXT_ID_VOICE_CALL_RINGING,
+
 
     //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 e27d74e..1afc63b 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
@@ -852,6 +852,11 @@ const void * lang_text_en[] = {
     "Cashier scans to complete payment", // WATCH_TEXT_ID_ZFB_PAY_PROMPT, 
     "Please use Alipay to scan the code", // WATCH_TEXT_ID_ZFB_COLLECT_PROMPT,
     "Finish", // WATCH_TEXT_ID_ZFB_FINISH
+    "Dailing", // WATCH_TEXT_ID_VIDEO_CALL_DAILING, 
+    "Ringing", // WATCH_TEXT_ID_VIDEO_CALL_RINGING, 
+    "Dailing", // WATCH_TEXT_ID_VOICE_CALL_DAILING, 
+    "Ringing", // WATCH_TEXT_ID_VOICE_CALL_RINGING, 
+
 
     //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 0590e92..1929aab 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -859,6 +859,11 @@ enum
     WATCH_TEXT_ID_ZFB_PAY_PROMPT,                         /* "收银员扫一扫完成付款"       "Cashier scans to complete payment" */
     WATCH_TEXT_ID_ZFB_COLLECT_PROMPT,                     /* "请对方使用支付宝扫码"       "Please use Alipay to scan the code" */
     WATCH_TEXT_ID_ZFB_FINISH,                             /* "完成"                  "Finish"*/
+    WATCH_TEXT_ID_VIDEO_CALL_DAILING,                            /* "视频呼出中"     "Dailing"  */
+    WATCH_TEXT_ID_VIDEO_CALL_RINGING,                            /* "视频呼入中"     "Ringing"  */
+    WATCH_TEXT_ID_VOICE_CALL_DAILING,                            /* "语音呼出中"     "Dailing"  */
+    WATCH_TEXT_ID_VOICE_CALL_RINGING,                            /* "语音呼入中"     "Ringing"  */
+
 
     //CHENG_MODIFY
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c
index fdf336f..7c729c2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c
@@ -541,7 +541,13 @@ void wechat_msg_sending_result_screen_timeout(void *para)
        }
 
        //delete sending screen
-       lv_watch_del_interface(ACT_ID_WECHAT_SENDING);
+       //lv_watch_del_interface(ACT_ID_WECHAT_SENDING);
+    lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_SENDING);
+    if(NULL == activity_obj)
+       {
+        lv_obj_del(activity_obj);
+    }
+       
        //return main list screen
        wechat_main_screen_refresh();
 }

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c
index 1b96c9a..c69d605 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c
@@ -316,7 +316,7 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id)
 
        /* content */
        lv_obj_t * content = lv_cont_create(obj, NULL);
-       lv_obj_set_size(content, lv_obj_get_width(obj), lv_obj_get_height(obj) - 20);
+       lv_obj_set_size(content, lv_obj_get_width(obj), lv_obj_get_height(obj));
        //lv_cont_set_layout(content, LV_LAYOUT_COLUMN_MID);
        LV_ASSERT_MEM(content);
        if(content == NULL) 
@@ -324,7 +324,7 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id)
        lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_style_transp);
        /* must click false */
        lv_obj_set_click(content, false);
-       lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, 20);
+       lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, 0);
 
        if(ext->phone_ui_id == PHONE_UI_DIALING) {
                phone_dialing(content);