gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
index d5a0368..f51d258 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
@@ -200,6 +200,7 @@ typedef struct
 } __packed nv_watch_health_measure_timed_t;
 #endif
 
+#define NV_WATCH_HOST_NAME_LEN_MIN             (7) // 0.0.0.0
 #define NV_WATCH_HOST_NAME_LEN_MAX             (128 - 32)
 #define NV_PROTOCOL_MD5_KEY_LEN_MAX            (64)
 #define NV_PROTOCOL_DEVICE_NAME_LEN_MAX                (32)

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h
index 08b2306..52a633e 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h
@@ -32,6 +32,19 @@ extern "C" {
 #define MMI_HEALTH_MEASURE_CYCLE_DURATION      (1 * 1000) // ms
 
 #define MMI_HEART_RATE_VALUE_MIN       (45)
+#define MMI_HEART_RATE_VALUE_MAX       (220)
+
+#define DEFAULT_BP_HIGH_VALUE_MAX      (180)
+#define DEFAULT_BP_HIGH_VALUE_MIN      (95)
+#define DEFAULT_BP_LOW_VALUE_MAX       (95)
+#define DEFAULT_BP_LOW_VALUE_MIN       (60)
+
+#define DEFAULT_SPO2_VALUE_MAX (100)
+#define DEFAULT_SPO2_VALUE_MIN (95)
+
+#define DEFAULT_BLOOD_GLUCOSE_VALUE_MAX        (10.0)
+#define DEFAULT_BLOOD_GLUCOSE_VALUE_MIN        (3.9)
+
 
 
 typedef enum

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_default.h b/2.sdk/sdk/gui/lv_watch/mmi_default.h
index 77c1f84..fab979d 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_default.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_default.h
@@ -373,7 +373,42 @@ extern "C"
 #define MMI_USER_PROFILE_INDEX_3_VOLUME_REMIND_DEFAULT         (0) // 0-10
 #endif
 
+// schedule power on/off
+#ifdef MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH
+#define MMI_SCHEDULE_POWER_ON_SWITCH_DEFAULT           MMI_CUSTOMER_SCHEDULE_POWER_ON_SWITCH
+#else
+#define MMI_SCHEDULE_POWER_ON_SWITCH_DEFAULT           (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open
+#endif
+
+#ifdef MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR
+#define MMI_SCHEDULE_POWER_ON_HOUR_DEFAULT             MMI_CUSTOMER_SCHEDULE_POWER_ON_HOUR
+#else
+#define MMI_SCHEDULE_POWER_ON_HOUR_DEFAULT             (6) // 0-23
+#endif
+
+#ifdef MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE
+#define MMI_SCHEDULE_POWER_ON_MINUTE_DEFAULT           MMI_CUSTOMER_SCHEDULE_POWER_ON_MINUTE
+#else
+#define MMI_SCHEDULE_POWER_ON_MINUTE_DEFAULT           (0) // 0-59
+#endif
 
+#ifdef MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH
+#define MMI_SCHEDULE_POWER_OFF_SWITCH_DEFAULT          MMI_CUSTOMER_SCHEDULE_POWER_OFF_SWITCH
+#else
+#define MMI_SCHEDULE_POWER_OFF_SWITCH_DEFAULT          (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open
+#endif
+
+#ifdef MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR
+#define MMI_SCHEDULE_POWER_OFF_HOUR_DEFAULT            MMI_CUSTOMER_SCHEDULE_POWER_OFF_HOUR
+#else
+#define MMI_SCHEDULE_POWER_OFF_HOUR_DEFAULT            (23) // 0-23
+#endif
+
+#ifdef MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE
+#define MMI_SCHEDULE_POWER_OFF_MINUTE_DEFAULT          MMI_CUSTOMER_SCHEDULE_POWER_OFF_MINUTE
+#else
+#define MMI_SCHEDULE_POWER_OFF_MINUTE_DEFAULT          (59) // 0-59
+#endif
 
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h
index 844d939..4fb5276 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.h
@@ -31,8 +31,8 @@ extern "C"
 #define PROTOCOL_TIMING_TIMER_INTERVAL (20 * 1000) // ms
 
 #define PROTOCOL_TIMING_TASK_PRIORITY 220
-#define PROTOCOL_TIMING_TASK_STACK_SIZE (1 * 1024)
-#define PROTOCOL_TIMING_MSG_QUEUE_SIZE (16)
+#define PROTOCOL_TIMING_TASK_STACK_SIZE (10 * 1024)
+#define PROTOCOL_TIMING_MSG_QUEUE_SIZE (64)
 
 
 typedef enum
@@ -93,11 +93,8 @@ void mmi_protocol_timing_mission_stop(void);
 bool mmi_protocol_watch_link_action(void);
 
 bool mmi_protocol_action_send_temperature(float temp_value);
-
 bool mmi_protocol_action_send_heart(uint16_t heart_value);
-
 bool mmi_protocol_action_send_blood(uint16_t blood_high_value, uint16_t blood_low_value);
-
 bool mmi_protocol_action_send_spo2(uint16_t spo2_value);
 
 bool mmi_protocol_action_send_talk(char * data_buff, int data_buff_len);

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
index 095f279..9da41cd 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
@@ -608,10 +608,6 @@ bool mmi_protocol_fzd_action_HEARTBEAT(void)
 
 bool mmi_protocol_fzd_parse_HEARTBEAT(unsigned char * next_buff, unsigned int next_buff_len)
 {
-       //if(true != mmi_protocol_watch_bind_state_get())
-       //{
-       //      mmi_protocol_fzd_action_bind();
-       //}
        if(0 == s_fzd_time_data_flag)
        {
                mmi_protocol_fzd_action_get_time();

diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.h b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.h
index 638cbd0..3bc4031 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.h
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.h
@@ -86,6 +86,10 @@ void launcher_tcp_connect(FUNC_CB tcp_callback);
 void shutdownc_tcp_connect(FUNC_CB tcp_callback);
 void send_tcp_cmdmsg(int cmd_type,void* cmd_param);
 
+#ifdef __MMI_ZHSX_SUPPORT__
+void mmi_launcher_tcp_first_connect(uint32_t para);
+#endif
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif //__cplusplus