From 810f32bac7d8eb1d2599ed603ad6815cbc878e73 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Mon, 19 May 2025 03:54:45 +0000 Subject: [PATCH] Merge #1757 into sdk650pathc0423 from refs/changes/1757/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1757/head: (5 commits squashed) - 合并蓝牙服务等待后续联调 - 屏蔽部分无法编译通过的代码 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0423 - 增加app应用接口 - 合并 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1757 --- .../services/ble_service/blemoder/bleInstruct.cpp | 11 +++++++++++ .../services/ble_service/blemoder/bleInstruct.h | 3 +++ code/sdk/zhihui/utils/custom_fileoperate_service.c | 14 +++++++------- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp index 35f21cc2f..2c8566872 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp +++ b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp @@ -1235,6 +1235,17 @@ void ble_bin_install(void) } +void ble_app_delete(char *data) +{ + return bleInstruct_t.ble_app_delete(data); +} + + +cJSON* ble_app_list(void) +{ + return bleInstruct_t.ble_app_list(); +} + #endif diff --git a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h index e60fcacad..986520236 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h +++ b/code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h @@ -633,6 +633,9 @@ typedef struct bleInstruct void (*ble_bin_install)(void); + void (*ble_app_delete)(char * data); + + cJSON* (*ble_app_list)(void); } bleInstruct_t_; diff --git a/code/sdk/zhihui/utils/custom_fileoperate_service.c b/code/sdk/zhihui/utils/custom_fileoperate_service.c index 7826623f7..9cb206785 100644 --- a/code/sdk/zhihui/utils/custom_fileoperate_service.c +++ b/code/sdk/zhihui/utils/custom_fileoperate_service.c @@ -172,10 +172,10 @@ static void custom_fileoperate_service_check_task(void const *arg) case CUSTOM_FILEOPERATE_MSG_TYPE_MESSAGEDATA_SAVE: break; case CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPDATA_SAVE: - cywee_custom_save_sleep_data(); + // cywee_custom_save_sleep_data(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_SAVE: - cywee_custom_save_nap_data(); + // cywee_custom_save_nap_data(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPDATA_READ: custom_read_sleep_data(); @@ -187,10 +187,10 @@ static void custom_fileoperate_service_check_task(void const *arg) custom_sleep_model_updata(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_SAVE: - mmc5603_savePara_infile(); + // mmc5603_savePara_infile(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_READ: - mmc5603_readPara_infile(); + // mmc5603_readPara_infile(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_MUSICNAME_READ: @@ -226,15 +226,15 @@ static void custom_fileoperate_service_check_task(void const *arg) break; case CUSTOM_FILEOPERATE_MSG_TYPE_WEAR_DATA_SAVE: - cywee_custom_save_wear_data(); + // cywee_custom_save_wear_data(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_BATTERY_DATA_READ: - battery_get_data(); + // battery_get_data(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_BATTERY_DATA_SAVE: - battery_save_data(); + // battery_save_data(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_MESSAGE_DATA_NOTIFY: -- 2.17.1