From: Caisking Date: Mon, 28 Apr 2025 10:02:00 +0000 (+0800) Subject: 屏蔽部分重复定义 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~327 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1738%2Fhead;p=mirrors%2FFD230.git 屏蔽部分重复定义 --- diff --git a/code/sdk/zhihui/utils/custom_fileoperate_service.c b/code/sdk/zhihui/utils/custom_fileoperate_service.c index 374f8ca9f..96e2f7882 100644 --- a/code/sdk/zhihui/utils/custom_fileoperate_service.c +++ b/code/sdk/zhihui/utils/custom_fileoperate_service.c @@ -71,10 +71,10 @@ void custom_save_nap_data(void){} // void factorytest_stop_aging_test(void){} #endif -void stopPlayingMusic(void){} -void custom_setUpListCase(void){} -bool canSyncMusic(uint32_t songSize){return true;} -bool stopPhonePlayingMusic(void){return true;} +// void stopPlayingMusic(void){} +// void custom_setUpListCase(void){} +// bool canSyncMusic(uint32_t songSize){return true;} +// bool stopPhonePlayingMusic(void){return true;} #ifdef __cplusplus } #endif diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c index 014e20efd..de7cad87b 100644 --- a/code/sdk/zhihui/utils/custom_utils.c +++ b/code/sdk/zhihui/utils/custom_utils.c @@ -49,15 +49,15 @@ void ble_SOS_data_init(void){} uint8_t read_jsonHistory_weather(void){return 0;} void ota_updata_init(void){} -void start_report_log(void){} -void stop_report_log(void){} -void resume_report_log(void){} -void update_version_report_log(void){} -void start_report_nextday_log_start(void){} -void start_report_nextday_log_end(void){} -void nextday_clear_popup_windows_log(void){} -void save_popup_windows_log_c(int type){} -void system_init_uart(void){} +// void start_report_log(void){} +// void stop_report_log(void){} +// void resume_report_log(void){} +// void update_version_report_log(void){} +// void start_report_nextday_log_start(void){} +// void start_report_nextday_log_end(void){} +// void nextday_clear_popup_windows_log(void){} +// void save_popup_windows_log_c(int type){} +// void system_init_uart(void){} #endif #include #include @@ -2877,7 +2877,9 @@ void uapi_cywee_get_chipinfo(char *databuf,uint8_t len) void uapi_cywee_get_version(char *databuf,uint8_t len) { + #ifdef FD230_650 cywee_get_version(databuf,len); + #endif } #ifdef SUPPORT_ALIPAY_SEC