gengxin

diff --git a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index dfbb1d4..23cc847 100644 (file)
--- a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -193,6 +193,7 @@
 #define __MMI_CUSTOM_HENG_AI__
 #ifdef __MMI_CUSTOM_HENG_AI__
 #define __MMI_REMIND_WAKE_UP_SUPPORT__
+#define __MMI_SLEEP_FUNCTION_SUPPORT__
 #endif
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
index 05cc676..049cea1 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
@@ -42,8 +42,9 @@ static void timing_timer_callback(uint32_t param)
                mmi_remind_mission_check(cur_time);
 
                // check sleep time
+       #ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
                mmi_watch_sleep_time_mission_check();
-
+       #endif
 
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
index eb796bd..d10b1a5 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
@@ -104,7 +104,7 @@ void watch_ui_message_handle(uint16_t msgid, void * msg)
         case MMI_MODEM_OPERATOR_IND:
 #if USE_LV_WATCH_ALIPAY != 0
             //int32_t rst = aos_start_simcard_identify();
-            printf("aos_start_simcard_identify rst=%d\n", aos_start_simcard_identify());
+            //printf("aos_start_simcard_identify rst=%d\n", aos_start_simcard_identify());
 #endif
             watch_modem_operator_ind(((mmi_msg_operator_ind_t *)msg)->rat);
             lv_mem_free(((mmi_msg_operator_ind_t *)msg)->Operator);

diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
index 05152e4..b3222f2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
+++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
@@ -51,7 +51,9 @@ extern "C" {
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
 #define NV_SECTION_UI_DO_NOT_DISTURB_LEN                       (sizeof(nv_watch_do_not_disturb_t))
 #endif
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
 #define NV_SECTION_UI_SLEEP_TIME_DATA_LEN                      (sizeof(nv_watch_sleep_time_t))
+#endif
 #define NV_SECTION_UI_DIAL_PAD_SWITCH_LEN                      (sizeof(nv_watch_switch_t))
 #define NV_SECTION_UI_WHITE_LIST_SWITCH_LEN                    (sizeof(nv_watch_switch_t))
 #define NV_SECTION_UI_MAIN_MENU_STYLE_LEN                      (sizeof(nv_watch_main_menu_style_t))
@@ -164,7 +166,9 @@ typedef lv_fs_dir_t  ui_dir_t;
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
 #define NV_SECTION_UI_DO_NOT_DISTURB_FILE                      "ui_do_not_disturb.nv"
 #endif
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
 #define NV_SECTION_UI_SLEEP_TIME_DATA_FILE                     "ui_sleep_time_data.nv"
+#endif
 #define NV_SECTION_UI_DIAL_PAD_SWITCH_FILE                     "ui_dial_pad_switch.nv"
 #define NV_SECTION_UI_WHITE_LIST_SWITCH_FILE           "ui_white_list_switch.nv"
 #define NV_SECTION_UI_MAIN_MENU_STYLE_FILE                     "ui_main_menu_style.nv"

diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
index 66e469b..8a08fe2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
@@ -96,8 +96,10 @@ uint32_t UI_NV_Get_Section_Len(NV_UI_SECTION_ID SectionId)
                case NV_SECTION_UI_DO_NOT_DISTURB:
                        return (NV_SECTION_LEN(NV_SECTION_UI_DO_NOT_DISTURB));
        #endif
+       #ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
                case NV_SECTION_UI_SLEEP_TIME_DATA:
                        return (NV_SECTION_LEN(NV_SECTION_UI_SLEEP_TIME_DATA));
+       #endif
                case NV_SECTION_UI_DIAL_PAD_SWITCH:
                        return (NV_SECTION_LEN(NV_SECTION_UI_DIAL_PAD_SWITCH));
                case NV_SECTION_UI_WHITE_LIST_SWITCH:
@@ -219,8 +221,10 @@ char * UI_NV_Get_Section_path(NV_UI_SECTION_ID SectionId)
                case NV_SECTION_UI_DO_NOT_DISTURB:
                        return (NV_SECTION_FILE_PATH(NV_SECTION_UI_DO_NOT_DISTURB));
        #endif
+       #ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
                case NV_SECTION_UI_SLEEP_TIME_DATA:
                        return (NV_SECTION_FILE_PATH(NV_SECTION_UI_SLEEP_TIME_DATA));
+       #endif
                case NV_SECTION_UI_DIAL_PAD_SWITCH:
                        return (NV_SECTION_FILE_PATH(NV_SECTION_UI_DIAL_PAD_SWITCH));
                case NV_SECTION_UI_WHITE_LIST_SWITCH:
@@ -302,7 +306,9 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
        nv_watch_do_not_disturb_t * do_not_disturb;
 #endif
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
        nv_watch_sleep_time_t * sleep_time_data;
+#endif
        nv_watch_switch_t * mmi_switch_data;
        nv_watch_main_menu_style_t * main_menu_style;
 #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
@@ -526,11 +532,13 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
                        break;
        #endif
 
+       #ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
                case NV_SECTION_UI_SLEEP_TIME_DATA:
                        sleep_time_data = lv_mem_alloc(SectionLen);
                        memset(sleep_time_data, 0x0, SectionLen);
                        TempData = (char *)sleep_time_data;
                        break;
+       #endif
                        
                case NV_SECTION_UI_DIAL_PAD_SWITCH:
                        mmi_switch_data = lv_mem_alloc(SectionLen);

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 439e048..647a797 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
@@ -278,6 +278,7 @@ typedef struct
 } __packed nv_watch_do_not_disturb_t;
 #endif
 
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
 typedef struct
 {
     uint8_t on_off;                                               // 1: on, 0: off
@@ -286,6 +287,7 @@ typedef struct
     uint8_t end_hour;                                             // [0, 23]
     uint8_t end_min;                                              // [0, 59]
 } __packed nv_watch_sleep_time_t;
+#endif
 
 typedef struct
 {
@@ -518,7 +520,9 @@ enum
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
        NV_SECTION_UI_DO_NOT_DISTURB,                                   // nv_watch_do_not_disturb_t
 #endif
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
        NV_SECTION_UI_SLEEP_TIME_DATA,                                  // nv_watch_sleep_time_t
+#endif
        NV_SECTION_UI_DIAL_PAD_SWITCH,                                  // nv_watch_switch_t
        NV_SECTION_UI_WHITE_LIST_SWITCH,                                // nv_watch_switch_t
        NV_SECTION_UI_MAIN_MENU_STYLE,                                  // nv_watch_main_menu_style_t

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c
index 7b82221..b13d3a6 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_autotest.c
@@ -765,7 +765,7 @@ static void micphone_record_task_cb(lv_task_t * task)
         case MCI_EVENT_EOS:
             lv_label_set_text_id(ext_fac->label_key_state, WATCH_TEXT_ID_MICPHONE_RECORD_CHECK);
             Hal_Record_Buffer_Stop_Req(&ext_fac->buffer_size, &duration_ms);
-            Hal_Tone_Play_Onetime((uint32_t *)ext_fac->buffer, ext_fac->buffer_size, query_current_volume(), micphone_record_play_over_cb, ext_fac);
+            Hal_Tone_Play_Onetime((uint32_t *)ext_fac->buffer, ext_fac->buffer_size, HAL_AUDIO_SPK_LEVEL_MAX/*query_current_volume()*/, micphone_record_play_over_cb, ext_fac);
             break;
         case MCI_EVENT_ERROR:
             /*recoder stop if value is - 996*/
@@ -1286,7 +1286,7 @@ static void autotest_starttest_btn_event_cb(lv_obj_t * btn, lv_event_t e)
         } else if(num == AUTOTEST_SPEAKER) {
             lv_obj_t * label_tip  = lv_obj_get_child(btn, NULL);
             // play tone
-            Hal_NFFS_File_Play_Onetime(AUDIO_INCOMING_CALL, query_current_volume(), NULL, NULL);
+            Hal_NFFS_File_Play_Onetime(AUDIO_INCOMING_CALL, HAL_AUDIO_SPK_LEVEL_MAX/*query_current_volume()*/, NULL, NULL);
             lv_label_set_text_id(label_tip, WATCH_TEXT_ID_STOP_TEST);
             lv_obj_set_event_cb(btn, autotest_stoptest_btn_event_cb);
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
index 2b19dd8..5b477d5 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
@@ -2606,7 +2606,7 @@ static void mmi_factorymode_agetest_select_event_cb(lv_obj_t * btn, lv_event_t e
        }
        
        //watch_set_suspend_enable(false, ACT_ID_FACTORY_MODE_TEST, 0);
-       Hal_NFFS_File_Play_Repeat(AUDIO_INCOMING_CALL, HAL_AUDIO_SPK_LEVEL_9/*query_current_volume()*/);
+       Hal_NFFS_File_Play_Repeat(AUDIO_INCOMING_CALL, HAL_AUDIO_SPK_LEVEL_MAX/*query_current_volume()*/);
        factorymode_agetest_create(NULL);
 }
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
index 52a7b7f..88341aa 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h
@@ -80,11 +80,11 @@ extern "C" {
 
 #elif USE_LV_WATCH_UI_240_240_CIRCLE
 #define MMI_VC_RING_OFF_BTN_Y_OFFSET (-15)
-#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20)
-#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20)
+#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20+20)
+#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20-20)
 
-#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20)
-#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20)
+#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20-20)
+#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20+20)
 
 #else
 #define MMI_VC_RING_OFF_BTN_Y_OFFSET (-30)

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c
index ea597b2..1b27b6e 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c
@@ -117,7 +117,9 @@ static void mmi_data_init_after_watch_create(void)
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
        mmi_watch_do_not_disturb_mission_check();
 #endif
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
        mmi_watch_sleep_time_nv_read();
+#endif
        mmi_dial_pad_switch_nv_read();
        mmi_white_list_switch_nv_read();
 #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__

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 1129bea..ffa78e2 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
@@ -2704,6 +2704,7 @@ bool mmi_protocol_fzd_parse_SERVER_SET_NOT_DISTURB(unsigned char * next_buff, un
 }
 #endif
 
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
 // [*SLEEPTIME,21:30-6:10] [*SLEEPTIME,]
 bool mmi_protocol_fzd_parse_SERVER_SET_SLEEPTIME(unsigned char * next_buff, unsigned int next_buff_len)
 {
@@ -2740,6 +2741,7 @@ bool mmi_protocol_fzd_parse_SERVER_SET_SLEEPTIME(unsigned char * next_buff, unsi
 
        return result;
 }
+#endif
 
 bool mmi_protocol_fzd_parse_SERVER_SET_DIAL_PAD_SWITCH(unsigned char * next_buff, unsigned int next_buff_len)
 {

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
index 25b3467..994eccb 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
@@ -149,7 +149,9 @@ typedef enum
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
        MMI_FZD_SERVER_SET_NOT_DISTURB, 
 #endif
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
        MMI_FZD_SERVER_SET_SLEEPTIME,
+#endif
        MMI_FZD_SERVER_SET_DIAL_PAD_SWITCH, 
        MMI_FZD_SERVER_SET_WHITE_LIST_SWITCH, 
 #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c
index 161b35a..d9a6e11 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c
@@ -81,7 +81,9 @@ static unsigned char * mmi_protocol_fzd_action_string_get(MMI_PROTOCOL_FZD_ACTIO
                #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
                        {MMI_FZD_SERVER_SET_NOT_DISTURB, "SILENCETIME2"},
                #endif
+               #ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
                        {MMI_FZD_SERVER_SET_SLEEPTIME, "SLEEPTIME"},
+               #endif
                        {MMI_FZD_SERVER_SET_DIAL_PAD_SWITCH, "KEYBRD"},
                        {MMI_FZD_SERVER_SET_WHITE_LIST_SWITCH, "WLKEY"}, 
                #ifdef __MMI_REMIND_WAKE_UP_SUPPORT__
@@ -302,9 +304,11 @@ static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned
                        break;
        #endif
 
+       #ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
                case MMI_FZD_SERVER_SET_SLEEPTIME:
                        mmi_protocol_fzd_parse_SERVER_SET_SLEEPTIME(next_buff, next_buff_len);
                        break;
+       #endif
                        
                case MMI_FZD_SERVER_SET_DIAL_PAD_SWITCH:
                        mmi_protocol_fzd_parse_SERVER_SET_DIAL_PAD_SWITCH(next_buff, next_buff_len);

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
index 1211351..b9863af 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -943,6 +943,7 @@ void mmi_watch_do_not_disturb_mission_check(void)
 #endif
 
 
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
 static nv_watch_sleep_time_t s_sleep_time_data = {0};
 static uint8_t s_sleep_mission_in_progress = 0;
 
@@ -1044,6 +1045,7 @@ void mmi_watch_sleep_time_mission_check(void)
                }
        }
 }
+#endif
 
 
 #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
index 95852db..b1bca97 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
@@ -91,9 +91,11 @@ void mmi_ui_msg_update_do_not_disturb(uint8_t flag);
 void mmi_watch_do_not_disturb_mission_check(void);
 #endif
 
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
 void mmi_watch_sleep_time_nv_read(void);
 void mmi_watch_sleep_time_data_set(nv_watch_sleep_time_t * data);
 void mmi_watch_sleep_time_mission_check(void);
+#endif
 
 #ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__
 void mmi_watch_sim_unbind_switch_nv_read(void);