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 88c4600..ba8d2c0 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
@@ -853,7 +853,7 @@ const void * lang_text_ch[] = {
     "设备二维码", // WATCH_TEXT_ID_DEVICE_QRCODE
     "APP二维码", // WATCH_TEXT_ID_APP_QRCODE,
     "手机扫码下载APP", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT
-    "下载绑定码", // WATCH_TEXT_ID_APP_DEVICE_QRCODE,
+    "APP绑定码", // WATCH_TEXT_ID_APP_DEVICE_QRCODE,
     "未设置号码", // WATCH_TEXT_ID_NO_NUM
     "手机支付宝扫一扫", // WATCH_TEXT_ID_ZFB_BIND_PROMPT
     "收银员扫一扫完成付款", // WATCH_TEXT_ID_ZFB_PAY_PROMPT

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 67e3965..51398cc 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -860,7 +860,7 @@ enum
     WATCH_TEXT_ID_DEVICE_QRCODE,                        /* "设备二维码"       "Device qrcode" */
     WATCH_TEXT_ID_APP_QRCODE,                        /* "APP二维码"       "APP qrcode" */
     WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT,                  /* "手机扫码下载APP"       "Scan qrcode to download" */
-    WATCH_TEXT_ID_APP_DEVICE_QRCODE,                    /* "下载绑定码"       "Download & bind" */
+    WATCH_TEXT_ID_APP_DEVICE_QRCODE,                    /* "APP绑定码"       "Download & bind" */
     WATCH_TEXT_ID_NO_NUM,                               /* "未设置号码"       "No number" */
     WATCH_TEXT_ID_ZFB_BIND_PROMPT,                        /* "手机支付宝扫一扫"       "Scan with mobile Alipay" */
     WATCH_TEXT_ID_ZFB_PAY_PROMPT,                         /* "收银员扫一扫完成付款"       "Cashier scans to complete payment" */

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
index 53fa3d6..128edfe 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
@@ -249,11 +249,18 @@ static void factoryreset_yes_btn_event_cb(lv_obj_t * btn, lv_event_t e)
         lv_obj_t * par = lv_obj_get_parent(btn);
         lv_obj_clean(par);
         lv_obj_t * label = lv_label_create(par, NULL);
-        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+        //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       #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_label_set_text_id(label, WATCH_TEXT_ID_FACTORY_RESETING);
-        lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
-        lv_obj_set_width(label, LV_HOR_RES * 2 / 3);
-        lv_obj_align(label, par, LV_ALIGN_CENTER, 0, 0);
+        //lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
+        //lv_obj_set_width(label, LV_HOR_RES * 2 / 3);
+        //lv_obj_align(label, par, LV_ALIGN_CENTER, 0, 0);
+               lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+               lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10);
 
         // delay reset for 50ms to ensure text displaying
         lv_task_t *task_p = lv_task_create(factory_reset_handle, 50, LV_TASK_PRIO_HIGHEST, NULL);
@@ -317,7 +324,11 @@ void mmi_watch_reset(lv_obj_t * activity_obj)
        lv_obj_t * label_info = lv_label_create(cont, NULL);
     //lv_obj_set_size(label_info, LV_HOR_RES, 30);
        //lv_obj_set_width(label_info, LV_HOR_RES * 2 / 3);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
        lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
        lv_label_set_text_id(label_info, WATCH_TEXT_ID_FACTORY_RESETING);
        //lv_label_set_long_mode(label_info, LV_LABEL_LONG_BREAK);
     //lv_label_set_align(label_info, LV_LABEL_ALIGN_CENTER);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c
index 959d674..12e13a2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c
@@ -393,52 +393,109 @@ lv_obj_t * mmi_app_and_device_qrcode_create(lv_obj_t * activity_obj)
 
     lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE);
 
+#ifdef __MMI_APP_QRCODE_FROM_SERVER_SUPPORT__
+
        lv_obj_t * content = lv_cont_create(obj, NULL);
        lv_cont_set_fit(content, LV_FIT_NONE);
-       lv_obj_set_size(content, QRCODE_BG_WIDTH, QRCODE_BG_WIDTH);
+       lv_obj_set_size(content, LV_HOR_RES, LV_HOR_RES); // lv_obj_set_size(content, QRCODE_BG_WIDTH, QRCODE_BG_WIDTH);
        //lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_image);
-       lv_obj_set_style_local_bg_color(content, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+       //lv_obj_set_style_local_bg_color(content, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+       lv_obj_set_style_local_bg_color(content, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
        lv_cont_set_layout(content, LV_LAYOUT_OFF);
        lv_obj_set_click(content, false);
-       lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -20);
-
-       char imei[16] = {0};
-       app_adp_get_imei_req(imei);
+       lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, 0);
 
-#ifdef __MMI_APP_QRCODE_FROM_SERVER_SUPPORT__
        if(true == mmi_app_qrcode_refresh_prompt())
        {
                lv_obj_set_click(content, true);
                lv_obj_set_event_cb(content, mmi_app_qrcode_refresh_action);
                
                lv_obj_t * label = lv_label_create(content, NULL);
+       #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_label_set_text_id(label, WATCH_TEXT_ID_APP_QRCODE_REFRESH);
                lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
                lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10);
        }
        else
        {
-               // img
+               // img w=205, h=205
                lv_obj_t * img = lv_img_create(content, NULL);
                lv_img_set_src(img, mmi_app_qrcode_file_get());
        #ifdef USE_LV_WATCH_UI_CIRCLE
-       #ifdef USE_LV_WATCH_UI_466_466
-           lv_img_set_zoom(img, LV_IMG_ZOOM_NONE * 3 / 2);
-       #else
+               #ifdef USE_LV_WATCH_UI_466_466
+           lv_img_set_zoom(img, LV_IMG_ZOOM_NONE * 4 / 3);
+               lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, -30);
+               #elif defined(USE_LV_WATCH_UI_240_240)
+               lv_img_set_zoom(img, LV_IMG_ZOOM_NONE * 3 / 4);
+               lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, -15);
+               #else
                lv_img_set_zoom(img, LV_IMG_ZOOM_NONE * 3 / 4);
-       #endif
-       #endif
                lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, -10);
+               #endif
+       #else
+               #ifdef USE_LV_WATCH_UI_240_280
+               lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, -15);
+               #else
+               lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, -10);
+               #endif  
+       #endif
                lv_obj_set_click(img, false);
+
+               printf("[@CHENG_DEBUG][%s][%d]: w=%d,h=%d\n", __FUNCTION__, __LINE__, lv_obj_get_width(img), lv_obj_get_height(img));
        }
-#else  
+
+       lv_obj_t * label_imei = lv_label_create(content, NULL);
+
+       char imei[16] = {0};
+       app_adp_get_imei_req(imei);
+
+       lv_label_set_text(label_imei, imei);
+       lv_obj_set_click(label_imei, false);
+#if USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label_imei, LV_OBJ_PART_MAIN, &lv_watch_font40);
+       lv_obj_align(label_imei, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -70);
+       #elif defined(USE_LV_WATCH_UI_240_240)
+       lv_obj_add_style(label_imei, LV_OBJ_PART_MAIN, &lv_watch_font20);
+       lv_obj_align(label_imei, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -33);
+       #else
+       lv_obj_add_style(label_imei, LV_OBJ_PART_MAIN, &lv_watch_font20);
+       lv_obj_align(label_imei, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+       #endif
+#else
+       #ifdef USE_LV_WATCH_UI_240_280
+       lv_obj_add_style(label_imei, LV_OBJ_PART_MAIN, &lv_watch_font26);
+       lv_obj_align(label_imei, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+       #else
+       lv_obj_add_style(label_imei, LV_OBJ_PART_MAIN, &lv_watch_font26);
+       lv_obj_align(label_imei, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+       #endif
+#endif
+
+#else
+       
+       lv_obj_t * content = lv_cont_create(obj, NULL);
+       lv_cont_set_fit(content, LV_FIT_NONE);
+       lv_obj_set_size(content, QRCODE_BG_WIDTH, QRCODE_BG_WIDTH);
+       //lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_image);
+       lv_obj_set_style_local_bg_color(content, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+       lv_cont_set_layout(content, LV_LAYOUT_OFF);
+       lv_obj_set_click(content, false);
+       lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -20);
+
+       char imei[16] = {0};
+       app_adp_get_imei_req(imei);
+       
        char str_qrcode[256] = {0};
        sprintf(str_qrcode, "%s%s", MMI_QRCODE_CONTENT_PREFIX, imei);
 
        lv_obj_t * qrcode = qrcode_gen(content, str_qrcode, 0, 0, QRCODE_WIDTH);
        lv_obj_align(qrcode, content, LV_ALIGN_CENTER, 0, 0);
-#endif
+
 
        lv_obj_t * label = lv_label_create(obj, NULL);
 #if USE_LV_WATCH_UI_CIRCLE
@@ -454,6 +511,8 @@ lv_obj_t * mmi_app_and_device_qrcode_create(lv_obj_t * activity_obj)
        lv_obj_set_click(label, false);
        lv_obj_align(label, content, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
 
+#endif
+
     return obj;
 }