From: CCC <2393524978@qq.com> Date: Tue, 10 Oct 2023 09:34:50 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6398fade91788938d74840c8058d5f1bbd7d0940;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index bf62a452..b62cd5c2 100644 --- a/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_D12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -153,7 +153,9 @@ #define __MMI_ZHSX_SUPPORT_SMS__ +#if 1 == USE_LV_WATCH_ALIPAY #define __MMI_ZHSX_SUPPORT_ALIPAY__ +#endif #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__ //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ diff --git a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 373d207a..759646fb 100644 --- a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -153,7 +153,9 @@ #define __MMI_ZHSX_SUPPORT_SMS__ +#if 1 == USE_LV_WATCH_ALIPAY #define __MMI_ZHSX_SUPPORT_ALIPAY__ +#endif #define __MMI_ZHSX_SUPPORT_VIDEO_CALL__ //#define __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ @@ -170,7 +172,7 @@ #define __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__ -#define __MMI_APP_QRCODE_MENU_SUPPORT__ +//#define __MMI_APP_QRCODE_MENU_SUPPORT__ #define __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__ diff --git a/2.sdk/sdk/gui/lv_watch/CMakeLists.txt b/2.sdk/sdk/gui/lv_watch/CMakeLists.txt index 36833c39..b43bad3c 100644 --- a/2.sdk/sdk/gui/lv_watch/CMakeLists.txt +++ b/2.sdk/sdk/gui/lv_watch/CMakeLists.txt @@ -218,6 +218,7 @@ set(lv_watch_sources lv_apps/health_measure/health_spo2.c lv_apps/health_measure/health_temperature.c lv_apps/setting/setting_main_menu_switch.c + lv_apps/tool/tool.c ) set(lv_watch_font_sources diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c index cabf919e..2b4b065d 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c @@ -26,7 +26,7 @@ const void * lang_text_ch[] = { "微聊", "电话", "录音机", - "拍照", + "相机", "相册", "交友", "拨号盘", @@ -43,7 +43,7 @@ const void * lang_text_ch[] = { "语音问答", "图库", "闹钟", - "计时器", + "倒计时", "锻练", "活动记录", "支付宝", @@ -876,6 +876,7 @@ const void * lang_text_ch[] = { "主题切换", // WATCH_TEXT_ID_MAIN_MENU_SWITCH, "大图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE, "小图标", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, + "工具箱", // WATCH_TEXT_ID_TOOL, //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c index 8c118a0a..0592a362 100644 --- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c +++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c @@ -876,6 +876,7 @@ const void * lang_text_en[] = { "Theme switch", // WATCH_TEXT_ID_MAIN_MENU_SWITCH, "Big icon", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE, "Small icon", // WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, + "Tool", // WATCH_TEXT_ID_TOOL, //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h index d9f5af06..3b8f6ad4 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h @@ -201,6 +201,9 @@ enum #ifdef __MMI_MAIN_MENU_SWITCH_MENU__ ACT_ID_SETTING_MAIN_MENU_SWITCH, #endif +#ifdef __MMI_TOOL_MENU_SUPPORT__ + ACT_ID_TOOL_MENU, +#endif ACT_ID_MAX, 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 ae91c2d5..e9b8834f 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h @@ -14,7 +14,15 @@ extern "C" { #ifndef __packed #define __packed __attribute__((packed)) #endif -#include "../../lvgl/lvgl.h" + +#ifdef LV_CONF_INCLUDE_SIMPLE +#include "lvgl/lvgl.h" +#include "lv_watch_conf.h" +#else +#include "../../../lvgl/lvgl.h" +#include "../../../lv_watch_conf.h" +#endif +//#include "../../lvgl/lvgl.h" #include "../../lvgl/hal/hal.h" #define NV_MAX_APN_INFO_LEN (99+1) @@ -143,8 +151,9 @@ typedef struct } __packed nv_watch_voice_msg_t; -//#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_WECHAT_SUPPORT__ #define NV_WATCH_WECHAT_NUM_MAX (20) #define NV_WATCH_WECHAT_DATA_FILE_NAME_MAX (64) // (LV_FS_MAX_PATH_LENGTH / 2) @@ -173,6 +182,8 @@ typedef struct uint8_t msg_count; nv_watch_wechat_msg_item_info_t msg_item[NV_WATCH_WECHAT_NUM_MAX]; } __packed nv_watch_wechat_msg_info_t; +#endif + typedef struct { @@ -224,6 +235,7 @@ typedef struct } __packed nv_watch_center_number_t; +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ #define NV_WATCH_VC_CONTACT_TOTAL (50) #define NV_WATCH_VC_CONTACT_NAME_LEN (32+1) #define NV_WATCH_VC_CONTACT_NUMBER_LEN (64+1) @@ -234,8 +246,10 @@ typedef struct char name[NV_WATCH_VC_CONTACT_TOTAL][NV_WATCH_VC_CONTACT_NAME_LEN]; // ::string char number[NV_WATCH_VC_CONTACT_TOTAL][NV_WATCH_VC_CONTACT_NUMBER_LEN]; // ::string } __packed nv_watch_vc_contact_t; +#endif +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ #define NV_WATCH_DO_NOT_DISTURB_ITEM_MAX (3) typedef struct @@ -252,6 +266,7 @@ typedef struct { nv_watch_do_not_disturb_item_t item_info[NV_WATCH_DO_NOT_DISTURB_ITEM_MAX]; } __packed nv_watch_do_not_disturb_t; +#endif typedef struct @@ -265,9 +280,17 @@ typedef struct } __packed nv_watch_main_menu_style_t; +#ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ +#define NV_WATCH_SIM_ICCID_DATA_LEN (20) +typedef struct +{ + char data[NV_WATCH_SIM_ICCID_DATA_LEN]; // ::string +} __packed nv_watch_sim_iccid_t; +#endif -//#endif + +#endif @@ -446,21 +469,32 @@ enum NV_SECTION_UI_AGNSS, // nv_watch_agnss_t NV_SECTION_UI_SMSMSG, // nv_watch_sms_msg_t NV_SECTION_UI_GPS_AIDPOS, // nv_watch_gps_aidpos_t -//#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_ZHSX_SUPPORT__ +#ifdef __MMI_WECHAT_SUPPORT__ NV_SECTION_UI_WEHAT_MSG, // nv_watch_wechat_msg_info_t +#endif NV_SECTION_UI_HEALTH_MEASURE, // nv_watch_health_measure_timed_t NV_SECTION_UI_PROTOCOL_DATA, // nv_watch_protocol_data_t NV_SECTION_UI_HEALTH_INFO, // nv_watch_health_info_t NV_SECTION_UI_SOS_NUMBER, // nv_watch_sos_number_t NV_SECTION_UI_CENTER_NUMBER, // nv_watch_center_number_t +#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ NV_SECTION_UI_VC_CONTACT, // nv_watch_vc_contact_t +#endif +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ NV_SECTION_UI_DO_NOT_DISTURB, // nv_watch_do_not_disturb_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 +#ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ + NV_SECTION_UI_SIM_UNBIND_SWITCH, // nv_watch_switch_t + NV_SECTION_UI_SIM_ICCID_DATA, // nv_watch_sim_iccid_t +#endif -//#endif +#endif + NV_SECTION_UI_MAX_NUM }; typedef uint8_t NV_UI_SECTION_ID; diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h index 74b93e92..3377f276 100644 --- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h +++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h @@ -28,7 +28,7 @@ enum WATCH_TEXT_ID_WECHAT, /* "微聊" "Wechat" */ WATCH_TEXT_ID_TELEPHONE, /* "电话" "Telephone" */ WATCH_TEXT_ID_RECODER, /* "录音机" "Recorder" */ - WATCH_TEXT_ID_CAMERA, /* "拍照" "Camera" */ + WATCH_TEXT_ID_CAMERA, /* "相机" "Camera" */ WATCH_TEXT_ID_ALBUM, /* "相册" "Album" */ WATCH_TEXT_ID_MAKEFRIENDS, /* "交友" "Makefriends" */ WATCH_TEXT_ID_DIALPAD, /* "拨号盘" "Dialpad" */ @@ -45,7 +45,7 @@ enum WATCH_TEXT_ID_SPEECH_RECOG, /* "语音问答" "Speech recognition" */ WATCH_TEXT_ID_IMGVIEWER, /* "图库" "Imgviewer" */ WATCH_TEXT_ID_ALARM, /* "闹钟" "Alarm" */ - WATCH_TEXT_ID_TIMER, /* "计时器" "Timer" */ + WATCH_TEXT_ID_TIMER, /* "倒计时" "Timer" */ WATCH_TEXT_ID_EXERCISE, /* "锻练" "Exercise" */ WATCH_TEXT_ID_ACTIVITY, /* "活动记录" "Activity" */ WATCH_TEXT_ID_ALIPAY, /* "支付宝" "Alipay" */ @@ -883,7 +883,7 @@ enum WATCH_TEXT_ID_MAIN_MENU_SWITCH, /* "主题切换" "Theme switch" */ WATCH_TEXT_ID_MAIN_MENU_SWITCH_ONE_PAGE, /* "大图标" "Big icon" */ WATCH_TEXT_ID_MAIN_MENU_SWITCH_LIST, /* "小图标" "Small icon" */ - + WATCH_TEXT_ID_TOOL, /* "工具箱" "Tool" */ //CHENG_MODIFY diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c index 019566a9..d3083760 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c @@ -188,6 +188,7 @@ void watch_power_on_req(void) mmi_watch_do_not_disturb_nv_read(); #endif + #endif if((HAL_POWERUP_ONKEY == reason) || (HAL_POWERUP_REBOOT == reason)) { @@ -514,6 +515,15 @@ static lv_obj_t * watch_create(bool silentReset) #ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__ mmi_watch_no_sim_power_off_check_mission(); #endif +#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__ + mmi_watch_do_not_disturb_mission_check(); +#endif + mmi_dial_pad_switch_nv_read(); + mmi_white_list_switch_nv_read(); +#ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ + mmi_watch_sim_unbind_switch_nv_read(); +#endif + #endif @@ -902,15 +912,7 @@ static void watch_start_sd_mount_task(void) uint8_t voip_get_call_volume(void) { #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ return (mmi_vc_get_call_volume()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__ - return (mmi_vc_get_call_volume_fzd()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__ - return (mmi_vc_get_call_volume_tongxin()); -#endif #endif return 0; @@ -919,15 +921,7 @@ uint8_t voip_get_call_volume(void) bool watch_voip_suspend_check(void) { #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ return (mmi_vc_watch_suspend_check()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__ - return (mmi_vc_watch_suspend_check_fzd()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__ - return (mmi_vc_watch_suspend_check_tongxin()); -#endif #endif return true; @@ -936,15 +930,7 @@ bool watch_voip_suspend_check(void) bool voip_connect_check_req(void) { #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ return (mmi_vc_connect_check_req()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__ - return (mmi_vc_connect_check_req_fzd()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__ - return (mmi_vc_connect_check_req_tongxin()); -#endif #endif return false; @@ -953,15 +939,7 @@ bool voip_connect_check_req(void) void voip_activity_destroy_req(void) { #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__ -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_WULIAN__ - (mmi_vc_activity_destroy_req()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_FZD__ - (mmi_vc_activity_destroy_req_fzd()); -#endif -#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL_TONGXIN__ - return (mmi_vc_activity_destroy_req_tongxin()); -#endif + mmi_vc_activity_destroy_req(); #endif } diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h index 6e4a5da9..9711a58e 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h +++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h @@ -10,7 +10,7 @@ extern "C" { #endif -//******** audio resource ******** +//******** audio resource begin ******** #define AUDIO_POWER_ON "R:/audio/audio_power_on.mid" @@ -29,9 +29,11 @@ extern "C" { #define AUDIO_WATCH_SEARCH "R:/audio/audio_watch_search.mp3" +//******** audio resource end ******** -//******** image resource ******** + +//******** image resource begin ******** //#define ICON_POWERON_LOGO "R:/png/poweron/img_poweron_logo.png" /* Since partition_ops() limit, spi driver probe after ui_phase2, so ui_phase1 png use C file */ @@ -126,7 +128,7 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_SMS_MSG_ONE_PAGE "R:/png/primary_function/one_page/icon_sms.png" #endif #define ICON_DIALPAD_ONE_PAGE "R:/png/primary_function/one_page/icon_dialpad.png" -//#define ICON_CALLLOG_ONE_PAGE "R:/png/primary_function/one_page/ICON_CALLLOG.png" +#define ICON_CALLLOG_ONE_PAGE "R:/png/primary_function/one_page/ICON_CALLLOG.png" #define ICON_HEART_RATE_ONE_PAGE "R:/png/primary_function/one_page/icon_heart_rate.png" #define ICON_SPO2_ONE_PAGE "R:/png/primary_function/one_page/ICON_SPO2.png" @@ -138,12 +140,9 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_ALIPAY_ONE_PAGE "R:/png/primary_function/one_page/icon_alipay.png" #define ICON_VIDEOCALL_ONE_PAGE "R:/png/primary_function/one_page/icon_videocall.png" -//#define ICON_ALARM_ONE_PAGE "R:/png/primary_function/one_page/icon_alarm.png" -//#define ICON_TIMER_ONE_PAGE "R:/png/primary_function/one_page/icon_timer.png" -//#define ICON_STOPWATCH_ONE_PAGE "R:/png/primary_function/one_page/icon_stopwatch.png" -//#define ICON_CALCULATOR_ONE_PAGE "R:/png/primary_function/one_page/icon_calculator.png" -//#define ICON_CALENDAR_ONE_PAGE "R:/png/primary_function/one_page/icon_calendar.png" - +#ifdef __MMI_TOOL_MENU_SUPPORT__ +#define ICON_TOOL_ONE_PAGE "R:/png/primary_function/one_page/ICON_TOOL.png" +#endif #define ICON_SETTING_ONE_PAGE "R:/png/primary_function/one_page/icon_settings.png" #endif @@ -154,7 +153,7 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_SMS_MSG_LIST "R:/png/primary_function/list/icon_sms.png" #endif #define ICON_DIALPAD_LIST "R:/png/primary_function/list/icon_dialpad.png" -//#define ICON_CALLLOG_LIST "R:/png/primary_function/list/ICON_CALLLOG.png" +#define ICON_CALLLOG_LIST "R:/png/primary_function/list/ICON_CALLLOG.png" #define ICON_HEART_RATE_LIST "R:/png/primary_function/list/icon_heart_rate.png" #define ICON_SPO2_LIST "R:/png/primary_function/list/ICON_SPO2.png" @@ -833,11 +832,22 @@ LV_IMG_DECLARE(img_poweron_logo); #define ICON_CHARGE_CONNECTED "R:/png/charge/ICON_CHARGE_CONNECTED.png" #define ICON_CHARGE_REMOVED "R:/png/charge/ICON_CHARGE_REMOVED.png" +#define ICON_ALARM_ON "R:/png/alarm/ICON_ALARM_ON.png" +#define ICON_ALARM_OFF "R:/png/alarm/ICON_ALARM_OFF.png" + +#ifdef __MMI_TOOL_MENU_SUPPORT__ +#define ICON_TOOL_ALARM "R:/png/tool/ICON_TOOL_ALARM.png" +#define ICON_TOOL_STOPWATCH "R:/png/tool/ICON_TOOL_STOPWATCH.png" +#define ICON_TOOL_TIMER "R:/png/tool/ICON_TOOL_TIMER.png" +#endif #endif +//******** image resource end ******** + + //font #ifdef USE_FONT_TTF diff --git a/2.sdk/sdk/gui/lv_watch/mmi_default.h b/2.sdk/sdk/gui/lv_watch/mmi_default.h index 7f06768a..0fc44f9a 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_default.h +++ b/2.sdk/sdk/gui/lv_watch/mmi_default.h @@ -179,13 +179,13 @@ extern "C" #ifdef MMI_CUSTOMER_BODY_HEIGHT #define MMI_PEDOMETER_BODY_HEIGHT_DEFAULT MMI_CUSTOMER_BODY_HEIGHT #else -#define MMI_PEDOMETER_BODY_HEIGHT_DEFAULT (170) +#define MMI_PEDOMETER_BODY_HEIGHT_DEFAULT (170) // unit:cm #endif #ifdef MMI_CUSTOMER_BODY_WEIGHT #define MMI_PEDOMETER_BODY_WEIGHT_DEFAULT MMI_CUSTOMER_BODY_WEIGHT #else -#define MMI_PEDOMETER_BODY_WEIGHT_DEFAULT (60) +#define MMI_PEDOMETER_BODY_WEIGHT_DEFAULT (60) // unit:kg #endif #ifdef MMI_CUSTOMER_STEP_GOAL @@ -198,14 +198,14 @@ extern "C" #ifdef MMI_CUSTOMER_DIAL_PAD_SWITCH #define MMI_DIAL_PAD_SWITCH_DEFAULT MMI_CUSTOMER_DIAL_PAD_SWITCH #else -#define MMI_DIAL_PAD_SWITCH_DEFAULT (1) // 0-close; 1-open +#define MMI_DIAL_PAD_SWITCH_DEFAULT (MMI_WATCH_SWITCH_ON) // 0-close; 1-open #endif // white list #ifdef MMI_CUSTOMER_WHITE_LIST_SWITCH #define MMI_WHITE_LIST_SWITCH_DEFAULT MMI_CUSTOMER_WHITE_LIST_SWITCH #else -#define MMI_WHITE_LIST_SWITCH_DEFAULT (0) // 0-close; 1-open +#define MMI_WHITE_LIST_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open #endif @@ -216,6 +216,12 @@ extern "C" #define MMI_MAIN_MENU_STYLE_DEFAULT (MMI_MAIN_MENU_STYLE_FOUR_GRID) #endif +// sim unbind switch +#ifdef MMI_CUSTOMER_SIM_UNBIND_SWITCH +#define MMI_SIM_UNBIND_SWITCH_DEFAULT MMI_CUSTOMER_SIM_UNBIND_SWITCH +#else +#define MMI_SIM_UNBIND_SWITCH_DEFAULT (MMI_WATCH_SWITCH_OFF) // 0-close; 1-open +#endif #endif 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 8873fc80..0ef467f5 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h +++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h @@ -32,6 +32,14 @@ bool mmi_active_screen_is_prohibit_interrupted(void); void mmi_watch_wake_up(void); +typedef enum +{ + MMI_WATCH_SWITCH_OFF = 0, + MMI_WATCH_SWITCH_ON, + MMI_WATCH_SWITCH_MAX +}MMI_WATCH_SWITCH_E; + + void mmi_ui_msg_update_watch_factory(void); void mmi_watch_factory_aciton(void); void mmi_ui_msg_update_watch_power_off(void); @@ -73,7 +81,6 @@ typedef struct lv_watch_obj_ext_t old_ext; lv_obj_t * cont; - lv_task_t * refresh_task; } lv_do_not_disturb_ext_t; @@ -81,10 +88,20 @@ void mmi_watch_do_not_disturb_nv_read(void); void mmi_watch_do_not_disturb_data_set(nv_watch_do_not_disturb_t * data); bool mmi_watch_is_in_do_not_disturb_time(void); void mmi_ui_msg_update_do_not_disturb(uint8_t flag); -void mmi_watch_do_not_disturb_screen_check(int32_t tm_min); +void mmi_watch_do_not_disturb_mission_check(void); +#endif + + +#ifdef __MMI_ZHSX_SUPPORT_CHECK_SIM_UNBIND__ +void mmi_watch_sim_unbind_switch_nv_read(void); +void mmi_watch_sim_unbind_switch_nv_default(nv_watch_switch_t * data); +void mmi_watch_sim_unbind_switch_set(uint8_t value); +void mmi_watch_sim_unbind_check(void); #endif + + #endif