gengxin

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
index b7be1ad..9d52ee0 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/gui/lv_watch/mmi_default_CUSTOM.h
@@ -69,11 +69,7 @@
 #define MMI_CUSTOMER_BACKLIGHT_TIMEOUT         (15) // unit:s
 
 
-//pedometer body info
-#define MMI_CUSTOMER_BODY_HEIGHT               (170)
-
-#define MMI_CUSTOMER_BODY_WEIGHT               (60)
-
+//pedometer goal
 #define MMI_CUSTOMER_STEP_GOAL         (10000)
 
 // dial pad

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_alarm.gif b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_alarm.gif
index 95dbfc5..5794b48 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_alarm.gif and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_alarm.gif differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_heart_rate_measuring.gif b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_heart_rate_measuring.gif
index 5b3cb0a..789e884 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_heart_rate_measuring.gif and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_heart_rate_measuring.gif differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_spo2_measuring.gif b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_spo2_measuring.gif
index 727917f..2950f14 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_spo2_measuring.gif and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_spo2_measuring.gif differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_temperature_measuring.gif b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_temperature_measuring.gif
index 88cbec2..390160b 100644 (file)
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_temperature_measuring.gif and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/gif/anim_temperature_measuring.gif differ

diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png
deleted file mode 100644 (file)
index 4c94fc8..0000000
Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index afbad53..8ff00bd 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -184,6 +184,7 @@
 #define __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
 
 //#define __MMI_APP_QRCODE_MENU_SUPPORT__
+#define __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
 
 #define __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
 
@@ -200,6 +201,7 @@
 #define __MMI_WEATHER_MENU_NOT_DISPLAY_TEMPERATURE_RANGE__
 #endif
 
+#define __MMI_PEDOMETER_STEP_AND_GOAL_STYLE__
 
 #define __MMI_CUSTOM_HENGAI_HEALTH__
 

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 08714aa..5035577 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
@@ -228,4 +228,79 @@ void app_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event)
 #endif
 
 
+#ifdef __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
+static void mmi_app_and_device_qrcode_prepare_destory(lv_obj_t * activity_obj)
+{
+    lv_watch_png_cache_all_free();
+}
+
+lv_obj_t * mmi_app_and_device_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_APP_QRCODE;
+        activity_ext.create = mmi_app_and_device_qrcode_create;
+        activity_ext.prepare_destory = mmi_app_and_device_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);
+
+       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);
+
+       lv_obj_t * label = lv_label_create(obj, NULL);
+#if USE_LV_WATCH_UI_CIRCLE
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font36);
+#else
+       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20);
+#endif
+#else
+       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+#endif
+       lv_label_set_text(label, imei);
+       lv_obj_set_click(label, false);
+       lv_obj_align(label, content, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+
+    return obj;
+}
+
+void mmi_app_and_device_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_app_and_device_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 ef4caca..e66b7ca 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
@@ -44,6 +44,19 @@ void qrcode_create_tab(lv_obj_t * par);
 void app_qrcode_create_event_cb(lv_obj_t * btn, lv_event_t event);
 #endif
 
+
+#ifdef __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
+
+#ifdef MMI_PROJECT_Z5_HA_K18
+#define MMI_QRCODE_CONTENT_PREFIX      "https://app.thisiot.com/app/download/cn/1747546271749566466?deviceId="
+#else
+#define MMI_QRCODE_CONTENT_PREFIX      ""
+#endif
+
+void mmi_app_and_device_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 671ac9e..6676c3b 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
@@ -61,8 +61,12 @@ static mmi_watch_list_item_t settingList[] =
        { ICON_SETTING_APP_QRCODE, WATCH_TEXT_ID_APP_QRCODE, app_qrcode_create_event_cb },
 #endif
 #if USE_LV_WATCH_QRCODE != 0
+#ifdef __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
+       { ICON_SETTING_QRCODE, WATCH_TEXT_ID_APP_DEVICE_QRCODE, mmi_app_and_device_qrcode_create_event_cb },
+#else
     { ICON_SETTING_QRCODE, WATCH_TEXT_ID_DEVICE_QRCODE, qrcode_create_event_cb },
 #endif
+#endif
 #if USE_LV_WATCH_RESTART_AND_RESET != 0
     { ICON_SETTING_RESET, WATCH_TEXT_ID_RESTART_AND_RESET, restart_and_reset_create_btn_action },
 #endif