From: CCC <2393524978@qq.com>
Date: Mon, 4 Sep 2023 11:24:34 +0000 (+0800)
Subject: K6
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3fb2598429347333c6cbb8bce3d45399f1c0365a;p=mirrors%2FASR3603_Z5.git

K6
---

diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_K6/gui/lv_watch/mmi_default_CUSTOM.h
index e0cbc150..a618729f 100644
--- a/2.sdk/project/Z5_K6/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_K6/gui/lv_watch/mmi_default_CUSTOM.h
@@ -6,16 +6,26 @@
 
 
 //server ip
-#define MMI_CUSTOMER_IP_ADDRESS		"api.xcloudtech.com"
+// fzd debug-lab.xcloudtech.com:9000; fzd-api.xcloudtech.com:9000
+// wulian-8.134.110.49:30346
+// tongxin debug-tcptest.tx.kidxin.com:20500; tongxin-tcp.tx.kidxin.com:20500
+#define MMI_CUSTOMER_IP_ADDRESS		"api.xcloudtech.com" // "8.134.110.49" // "lab.xcloudtech.com"
 
-#define MMI_CUSTOMER_IP_PORT		(9000)
+#define MMI_CUSTOMER_IP_PORT		(9000) // (30346) // (9000)
 
+// fzd-"bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"; wulian-"g3HOqJwHUhhA1myJnuur"
+#define MMI_CUSTOMER_PROTOCOL_MD5_KEY		"bZld0ALsZTt15tKEZhOlLPgbsO75BLTP" // "3JyCjsw4ryXKzjzudayY"
 
-#define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL		(60 * 5) // unit:s
+// fzd-"SZKW"; wulian-"eaMXSiDH2uVmna42"
+#define MMI_CUSTOMER_PROTOCOL_DEVICE_NAME		"SZKW" // "qAELPTKmFanR4RHe"
 
-#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL		(60 * 20) // unit:s
 
-#define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL		(60 * 60 * 6) // unit:s
+//
+#define MMI_CUSTOMER_HEARTBEAT_ACTION_INTERVAL		(5 * 60) // unit:s
+
+#define MMI_CUSTOMER_LOCATION_UPLOAD_INTERVAL		(30 * 60) // unit:s
+
+#define MMI_CUSTOMER_WEATHER_UPDATE_INTERVAL		(6 * 60 * 60) // unit:s
 
 
 //health measure process
@@ -31,19 +41,19 @@
 //health measure timed
 #define MMI_CUSTOMER_HEART_TIMED_FLAG		false
 
-#define MMI_CUSTOMER_HEART_TIMED_INTERVAL		(10 * 60) // unit:s
+#define MMI_CUSTOMER_HEART_TIMED_INTERVAL		(20 * 60) // unit:s
 
 #define MMI_CUSTOMER_TEMPERATURE_TIMED_FLAG		false
 
-#define MMI_CUSTOMER_TEMPERATURE_TIMED_INTERVAL		(10 * 60) // unit:s
+#define MMI_CUSTOMER_TEMPERATURE_TIMED_INTERVAL		(20 * 60) // unit:s
 
 #define MMI_CUSTOMER_BLOOD_TIMED_FLAG		false
 
-#define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL		(10 * 60) // unit:s
+#define MMI_CUSTOMER_BLOOD_TIMED_INTERVAL		(20 * 60) // unit:s
 
 #define MMI_CUSTOMER_SPO2_TIMED_FLAG		false
 
-#define MMI_CUSTOMER_SPO2_TIMED_INTERVAL		(10 * 60) // unit:s
+#define MMI_CUSTOMER_SPO2_TIMED_INTERVAL		(20 * 60) // unit:s
 
 
 //default language
@@ -66,7 +76,8 @@
 
 #define MMI_CUSTOMER_STEP_GOAL		(10000)
 
-
+// dial pad
+#define MMI_CUSTOMER_DIAL_PAD_SWITCH		(1)
 
 
 
diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/0.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/0.png
new file mode 100644
index 00000000..5700a244
Binary files /dev/null and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/0.png differ
diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/1.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/1.png
new file mode 100644
index 00000000..fd6498ce
Binary files /dev/null and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/1.png differ
diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/ICON_CHARGE_CONNECTED.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/ICON_CHARGE_CONNECTED.png
new file mode 100644
index 00000000..a582f829
Binary files /dev/null and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/ICON_CHARGE_CONNECTED.png differ
diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/ICON_CHARGE_REMOVED.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/ICON_CHARGE_REMOVED.png
new file mode 100644
index 00000000..f0345edc
Binary files /dev/null and b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/charge/ICON_CHARGE_REMOVED.png differ
diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/common/watch_simulator.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/common/watch_simulator.png
deleted file mode 100644
index c78510c0..00000000
Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/common/watch_simulator.png and /dev/null differ
diff --git a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/common/watch_simulator_360.png b/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/common/watch_simulator_360.png
deleted file mode 100644
index a9a33b57..00000000
Binary files a/2.sdk/project/Z5_K6/gui/lv_watch/resource/png/common/watch_simulator_360.png and /dev/null differ
diff --git a/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 598e24cb..5f8afa50 100644
--- a/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -16,7 +16,7 @@
 #define USE_LV_WATCH_WEATHER 1
 #define USE_LV_WATCH_PEDOMETER 1
 #define USE_LV_WATCH_BODYINFO  1
-#define USE_LV_WATCH_RECORD    0 //1
+#define USE_LV_WATCH_RECORD    0 // 1
 #define USE_LV_WATCH_PHONEBOOK 1
 #define USE_LV_WATCH_PHONE 1
 #define USE_LV_WATCH_SETTING 1
@@ -138,7 +138,7 @@
 
 #define USE_LV_WATCH_SMS_MSG 1
 
-#define USE_LV_WATCH_UPGRADE 1
+#define USE_LV_WATCH_UPGRADE 0 // 1
 #define USE_LV_WATCH_UPGRADE_RS 0
 
 #define USE_LV_WATCH_WAKE_UP_SHORT_TIME 1