Z5_HA_K18_DRIVER

diff --git a/2.sdk/project/Z5_HA_K18_DRIVER/gui/lv_watch/resource/png/setting/icon_device_qrcode.png b/2.sdk/project/Z5_HA_K18_DRIVER/gui/lv_watch/resource/png/setting/icon_device_qrcode.png
new file mode 100644 (file)
index 0000000..883ffde
Binary files /dev/null and b/2.sdk/project/Z5_HA_K18_DRIVER/gui/lv_watch/resource/png/setting/icon_device_qrcode.png differ

diff --git a/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index c4a4f04..c158f7d 100644 (file)
--- a/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18_DRIVER/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -158,6 +158,7 @@
 
 // project mmi
 #define MMI_PROJECT_Z5_HA_K18
+#define MMI_PROJECT_Z5_HA_K18_DRIVER
 
 
 #if 0 != USE_LV_WATCH_ALIPAY

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 7628a66..8e8f1b6 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
@@ -855,6 +855,7 @@ const void * lang_text_ch[] = {
     "手机扫码下载APP", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT
     "APP绑定码", // WATCH_TEXT_ID_APP_DEVICE_QRCODE,
     "APP下载/绑定码", // WATCH_TEXT_ID_APP_DL_BIND_QRCODE,
+    "设备IMEI二维码", // WATCH_TEXT_ID_DEVICE_IMEI_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/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
index 74a32c5..81ab246 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
@@ -856,6 +856,7 @@ const void * lang_text_en[] = {
     "Scan qrcode to download", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT
     "Download & bind", // WATCH_TEXT_ID_APP_DEVICE_QRCODE,
     "APP Download & bind", // WATCH_TEXT_ID_APP_DL_BIND_QRCODE,
+    "IMEI qrcode", // WATCH_TEXT_ID_DEVICE_IMEI_QRCODE,
     "No number", // WATCH_TEXT_ID_NO_NUM
     "Scan with mobile Alipay", // WATCH_TEXT_ID_ZFB_BIND_PROMPT,
     "Cashier scans to complete payment", // 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 74dc582..b9be0ba 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -862,6 +862,7 @@ enum
     WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT,                  /* "手机扫码下载APP"       "Scan qrcode to download" */
     WATCH_TEXT_ID_APP_DEVICE_QRCODE,                    /* "APP绑定码"       "Download & bind" */
     WATCH_TEXT_ID_APP_DL_BIND_QRCODE,                    /* "APP下载/绑定码"       "APP Download & bind" */
+    WATCH_TEXT_ID_DEVICE_IMEI_QRCODE,                   /* "设备IMEI二维码"       "IMEI qrcode" */
     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/custom_function/heng_ai_blood_pressure.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
index e5735d2..f787672 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_blood_pressure.c
@@ -2757,6 +2757,10 @@ lv_obj_t * mmi_heng_ai_bp_screen_create(lv_obj_t * activity_obj)
                mmi_heng_ai_bp_tileview_led(tileview);
        }
 
+#ifdef __MMI_CUSTOM_HENGAI_HEALTH_UPLOAD_USE_TCP__
+       mmi_hengai_tcp_algorithm_login_msg_send();
+#endif
+
        return watch_obj;
 }
 

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 12e13a2..a6ef09c 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
@@ -527,5 +527,73 @@ void mmi_app_and_device_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event)
 }
 #endif
 
+#ifdef MMI_PROJECT_Z5_HA_K18_DRIVER
+static void mmi_device_imei_qrcode_prepare_destory(lv_obj_t * activity_obj)
+{
+       lv_watch_png_cache_all_free();
+}
+
+static lv_obj_t * mmi_device_imei_qrcode_create(lv_obj_t * activity_obj)
+{
+       if(activity_obj == NULL) 
+       {
+               lv_watch_activity_ext_t activity_ext;
+               memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t));
+               activity_ext.actId = ACT_ID_QRCODE;
+               activity_ext.create = mmi_device_imei_qrcode_create;
+               activity_ext.prepare_destory = mmi_device_imei_qrcode_prepare_destory;
+               activity_obj = lv_watch_creat_activity_obj(&activity_ext);
+               LV_ASSERT_MEM(activity_obj);
+               if(activity_obj == NULL)
+                       return NULL;
+       }
+
+       lv_obj_t * obj = lv_watch_obj_create(activity_obj);
+       LV_ASSERT_MEM(obj);
+       if(obj == NULL) 
+               return NULL;
+
+       lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE);
+
+       // imei
+       char imei[16] = {0};
+       app_adp_get_imei_req(imei);
+
+       // imei qrcode
+       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_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 str_qrcode[256] = {0};
+       sprintf(str_qrcode, "%s", imei);
+       lv_obj_t * qrcode = qrcode_gen(content, str_qrcode, 0, 0, QRCODE_WIDTH);
+       lv_obj_align(qrcode, content, LV_ALIGN_CENTER, 0, 0);
+       
+       // imei str
+       lv_obj_t * label_imei = lv_label_create(obj, NULL);
+       lv_label_set_text(label_imei, imei);
+       lv_obj_set_click(label_imei, false);
+       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, -65);
+
+       return obj;
+}
+
+void mmi_device_imei_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event)
+{
+       if(LV_EVENT_CLICKED != event)
+               return;
+       
+       lv_watch_png_cache_all_free();
+       lv_obj_t * obj = mmi_device_imei_qrcode_create(NULL);
+       LV_ASSERT_MEM(obj);
+}
+#endif
 
 #endif /*USE_LV_WATCH_QRCODE*/

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h
index 06004ce..9c4d663 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.h
@@ -64,6 +64,9 @@ void app_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event);
 void mmi_app_and_device_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event);
 #endif
 
+#ifdef MMI_PROJECT_Z5_HA_K18_DRIVER
+void mmi_device_imei_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event);
+#endif
 
 /**********************
  *      MACROS

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
index 6d3cfb3..8d58285 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting.c
@@ -29,6 +29,9 @@ static mmi_watch_list_item_t settingList[] =
 {
 #ifdef __MMI_ZHSX_SUPPORT__
 
+#ifdef MMI_PROJECT_Z5_HA_K18_DRIVER
+       { ICON_DEVICE_IMEI_QRCODE, WATCH_TEXT_ID_DEVICE_QRCODE/*WATCH_TEXT_ID_DEVICE_IMEI_QRCODE*/, mmi_device_imei_qrcode_create_event_cb },
+#endif
     //{ ICON_SETTING_LANGUAGE, WATCH_TEXT_ID_LANGUAGE_SWITCH, language_create_btn_action },
 #if USE_LV_WATCH_DIAL_SWITCH != 0
     { ICON_SETTING_DAIL_FORMAT_SWITCH, WATCH_TEXT_ID_DAIL_REPLACE, dial_switch_create_btn_action },

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 d70b729..fb8003f 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -386,6 +386,9 @@ LV_IMG_DECLARE(img_poweron_logo);
 #define ICON_SETTING_TAB_UP               "R:/png/setting/icon_setting_tab_up.png"
 #define ICON_SETTING_TAB_UP_GRAY          "R:/png/setting/icon_setting_tab_up_gray.png"
 #endif
+#ifdef MMI_PROJECT_Z5_HA_K18_DRIVER
+#define ICON_DEVICE_IMEI_QRCODE           "R:/png/setting/icon_device_qrcode.png"
+#endif
 //#define ICON_NO_MESSAGE                   "R:/png/setting/icon_message.png"
 
 //#if USE_POWER_OFF_GIF