Z5_K7

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png
index 14e9dc0..e5a6cc3 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/ext/png/poweron/img_poweron_logo.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_off.gif b/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_off.gif
index 8bb85b3..b8e5f10 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_off.gif and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_off.gif differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_on.gif b/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_on.gif
index 401c404..395a876 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_on.gif and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/gif/anim_power_on.gif differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_barcode.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_barcode.png
index f63288c..b394dd7 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_barcode.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_barcode.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png
index a8c2565..d9629ec 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_collect_qrcode.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_qrcode.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_qrcode.png
index 5bcf8c4..ddf9a9e 100644 (file)
Binary files a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_qrcode.png and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/upay/upay_qrcode.png differ

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
index bd48849..dd3f2b5 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
@@ -59,10 +59,44 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj);
  *  STATIC VARIABLES
  **********************/
 #ifdef __MMI_ZHSX_SUPPORT_ALIPAY__
+
+#if USE_LV_WATCH_UI_240_320
+#define QRCODE_WIDTH 150
+#define PARENT_CTRL_QRCODE_WIDTH 150
+#define BIND_QRCODE_WIDTH 150
+#define COLLECT_QRCODE_WIDTH 150
+
+
+#define MMI_ALIPAY_BIND_PROMPT_Y       (15 + 40)
+#define MMI_ALIPAY_BIND_QRCODE_BG_Y    (15)
+
+#define MMI_ALIPAY_COLLECT_QRCODE_Y    (-10)
+
+#elif USE_LV_WATCH_UI_240_280
 #define QRCODE_WIDTH 150
 #define PARENT_CTRL_QRCODE_WIDTH 150
 #define BIND_QRCODE_WIDTH 150
 #define COLLECT_QRCODE_WIDTH 150
+
+
+#define MMI_ALIPAY_BIND_PROMPT_Y       (15 + 15)
+#define MMI_ALIPAY_BIND_QRCODE_BG_Y    (15)
+
+#define MMI_ALIPAY_COLLECT_QRCODE_Y    (0)
+
+#else
+#define QRCODE_WIDTH 150
+#define PARENT_CTRL_QRCODE_WIDTH 150
+#define BIND_QRCODE_WIDTH 150
+#define COLLECT_QRCODE_WIDTH 150
+
+
+#define MMI_ALIPAY_BIND_PROMPT_Y       (15 + 40)
+#define MMI_ALIPAY_BIND_QRCODE_BG_Y    (15)
+
+#define MMI_ALIPAY_COLLECT_QRCODE_Y    (-10)
+#endif
+
 #else
 #define QRCODE_WIDTH 125
 #define PARENT_CTRL_QRCODE_WIDTH 150
@@ -782,7 +816,7 @@ void upay_show_bind_qrcode(lv_obj_t * obj, char *bind_code)
        lv_obj_t * label = lv_label_create(content, NULL);
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
        lv_label_set_text_id(label, WATCH_TEXT_ID_ZFB_BIND_PROMPT);
-       lv_obj_align(label, content, LV_ALIGN_IN_TOP_MID, 0, 15 + 40);
+       lv_obj_align(label, content, LV_ALIGN_IN_TOP_MID, 0, MMI_ALIPAY_BIND_PROMPT_Y);
 
        lv_obj_t * cont = lv_cont_create(content, NULL);
        lv_cont_set_fit(cont, LV_FIT_NONE);
@@ -790,7 +824,7 @@ void upay_show_bind_qrcode(lv_obj_t * obj, char *bind_code)
        lv_obj_set_style_local_bg_color(cont, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
        lv_cont_set_layout(cont, LV_LAYOUT_OFF);
        lv_obj_set_click(cont, false);
-       lv_obj_align(cont, content, LV_ALIGN_CENTER, 0, 15);
+       lv_obj_align(cont, content, LV_ALIGN_CENTER, 0, MMI_ALIPAY_BIND_QRCODE_BG_Y);
 
        lv_obj_t * qrcode = qrcode_gen(cont, bind_code, 0, 0, BIND_QRCODE_WIDTH);
        lv_obj_align(qrcode, cont, LV_ALIGN_CENTER, 0, 0); // 15);
@@ -1959,7 +1993,7 @@ lv_obj_t * upay_show_collect_qrcode_create(lv_obj_t * activity_obj, char *result
        lv_label_set_text_id(btn_label, WATCH_TEXT_ID_BACK);
 
        lv_obj_t * qrcode = qrcode_gen(img, result, 0, 0, COLLECT_QRCODE_WIDTH);
-       lv_obj_align(qrcode, img, LV_ALIGN_CENTER, 0, -10);
+       lv_obj_align(qrcode, img, LV_ALIGN_CENTER, 0, MMI_ALIPAY_COLLECT_QRCODE_Y);
 
 #else
        

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
index ca95d3c..dfe5153 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
@@ -172,6 +172,9 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
 #if USE_LV_WATCH_UI_240_320
        lv_obj_set_pos(pedometer, LV_HOR_RES / 2 - lv_obj_get_width(pedometer) / 2, 
                                120 + 100 - lv_obj_get_height(pedometer) / 2);
+#elif USE_LV_WATCH_UI_240_280
+       lv_obj_set_pos(pedometer, LV_HOR_RES / 2 - lv_obj_get_width(pedometer) / 2,
+                          221 - lv_obj_get_height(pedometer) / 2);
 #else
     lv_obj_set_pos(pedometer, LV_HOR_RES / 2 - lv_obj_get_width(pedometer) / 2,
                    LV_VER_RES / 2 + 100 - lv_obj_get_height(pedometer) / 2);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c
index 22f1258..82cf08b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c
@@ -179,6 +179,9 @@ void watch_power_on_req(void)
        mmi_wechat_msg_info_init();
 #endif
        mmi_sos_number_nv_read();
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
+       mmi_video_call_jrtc_config_init_00();
+#endif
 
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c b/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c
index 9d8ac92..d7ecc80 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/modem_adp.c
@@ -134,6 +134,8 @@ void watch_modem_power_off_req(void)
 
 void watch_modem_get_imei_req(char * imei)
 {
+    //static char tmp_imei[16] = "867387060319199";
+    //memcpy(imei, tmp_imei, 16);
     MMI_Modem_Query_Imei_Req(modem_sim_id, imei);
 }