gengxin

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h
index 96dd38f..a128e46 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/gui/lv_watch/mmi_default_CUSTOM.h
@@ -22,7 +22,7 @@
 //
 #define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (7 * 60) // (5 * 60) // unit:s
 
-#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (30 * 60) // unit:s
+#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (2 * 60 * 60) // unit:s
 
 #define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL           (6 * 60 * 60) // unit:s
 

diff --git a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 4b634b1..90764c3 100644 (file)
--- a/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/C55_DS_D11G_DT_HZCH/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -181,8 +181,8 @@
 #define __MMI_HEALTH_MEASURE_ATRIAL_FIBRILLATION_SUPPORT__
 
 //#define __MMI_APP_QRCODE_MENU_SUPPORT__
-#define __MMI_APP_QRCODE_FROM_SERVER_SUPPORT__
-#define __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
+//#define __MMI_APP_QRCODE_FROM_SERVER_SUPPORT__
+//#define __MMI_APP_QRCODE_AND_DEVICE_QRCODE_IN_ONE_SUPPORT__
 
 #define __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
 

diff --git a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
index 705603a..f91eb59 100644 (file)
--- a/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z11XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
@@ -22,7 +22,7 @@
 //
 #define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (7 * 60) // (5 * 60) // unit:s
 
-#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (30 * 60) // unit:s
+#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (2 * 60 * 60) // unit:s
 
 #define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL           (6 * 60 * 60) // unit:s
 

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
index 4a61959..7032b50 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
@@ -22,7 +22,7 @@
 //
 #define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (7 * 60) // (5 * 60) // unit:s
 
-#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (30 * 60) // unit:s
+#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (2 * 60 * 60) // unit:s
 
 #define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL           (6 * 60 * 60) // unit:s
 
@@ -74,11 +74,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
 #define MMI_CUSTOMER_STEP_GOAL         (10000)
 
 // dial pad

diff --git a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h
index 4a61959..7032b50 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12G_DTM_LZGDZ/gui/lv_watch/mmi_default_CUSTOM.h
@@ -22,7 +22,7 @@
 //
 #define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (7 * 60) // (5 * 60) // unit:s
 
-#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (30 * 60) // unit:s
+#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (2 * 60 * 60) // unit:s
 
 #define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL           (6 * 60 * 60) // unit:s
 
@@ -74,11 +74,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
 #define MMI_CUSTOMER_STEP_GOAL         (10000)
 
 // dial pad

diff --git a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
index 4a61959..7032b50 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_DTM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
@@ -22,7 +22,7 @@
 //
 #define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (7 * 60) // (5 * 60) // unit:s
 
-#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (30 * 60) // unit:s
+#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (2 * 60 * 60) // unit:s
 
 #define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL           (6 * 60 * 60) // unit:s
 
@@ -74,11 +74,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
 #define MMI_CUSTOMER_STEP_GOAL         (10000)
 
 // dial pad

diff --git a/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
index 4a61959..7032b50 100644 (file)
--- a/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_DS_Z12XG_QCBM_FZD/gui/lv_watch/mmi_default_CUSTOM.h
@@ -22,7 +22,7 @@
 //
 #define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL         (7 * 60) // (5 * 60) // unit:s
 
-#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (30 * 60) // unit:s
+#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL          (2 * 60 * 60) // unit:s
 
 #define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL           (6 * 60 * 60) // unit:s
 
@@ -74,11 +74,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
 #define MMI_CUSTOMER_STEP_GOAL         (10000)
 
 // dial pad

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 af7ca06..bff2d67 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
@@ -31,12 +31,8 @@ static mmi_watch_list_item_t settingList[] =
 
 #if defined(MMI_PROJECT_C55_DS_D11G_DT_HZCH)
        #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_SETTING_VOLUME != 0
     { ICON_SETTING_VOLUME, WATCH_TEXT_ID_VOLUME_ADJUST, setting_volume_create_btn_action },
        #endif