From: hcj <1224667075@qq.com> Date: Mon, 19 May 2025 09:39:04 +0000 (+0800) Subject: 增加alarm ble部分代码 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~298^2~1^2^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=589171cdc0093627fced3b26405690040e6bf25e;p=mirrors%2FFD230.git 增加alarm ble部分代码 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h index 4b56be534..1702f5692 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h @@ -17,10 +17,28 @@ #include "audio_base_type.h" #include "ChangeSliceListener.h" #include "msg_center.h" - +#include "gfx_utils/list.h" constexpr uint32_t LIST_ALARM_CLOCK_MAX = 20; constexpr uint32_t ALARM_DEC_NUM_256 = 256; +#ifdef BLE_INSTRUCT +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + + +void ble_alarm_init(void); +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif + + namespace OHOS { using OHOS::Media::Player; using OHOS::Media::Source; @@ -32,9 +50,6 @@ struct AlarmPlayerCaseInfo { char sliceId[ALARM_DEC_NUM_256]; int16_t index; }; -#ifdef BLE_INSTRUCT -void ble_alarm_init(void); -#endif // 播放器 class AlarmPlayerListener : public InterruptListener { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp index a5b21c016..9794490df 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp @@ -977,6 +977,13 @@ void PushAlarmClockDataToModel(AlarmClockQueueMsg alarmClockMsg) #ifdef BLE_INSTRUCT +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + + #include "bleEvent.h" #include "bleInstruct.h" @@ -1140,6 +1147,14 @@ void ble_alarm_init() bleInstruct_t.struct_to_json_buf_malloc_Alarm =struct_to_json_buf_malloc_Alarm_; } +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + + + #endif diff --git a/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt b/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt index 13f422c75..18af463ad 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt +++ b/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt @@ -44,6 +44,8 @@ set(PRIVATE_HEADER ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/bluetooth/include ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits ${ROOT_DIR}/application/wearable/nativeapp/nativeui/alipay/include + ${ROOT_DIR}/middleware/services/media/foundation/player/interfaces/kits + ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits # /home/hcj/FD230/code/sdk/middleware/services/gui/uikit/ui/interfaces/innerkits/engines/gfx/gfx_engine_manager.h ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/alipay/include # /home/hcj/FD230/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayModel.h diff --git a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp index 351ec7b46..5ee5aece9 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp +++ b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp @@ -6,7 +6,7 @@ #include "MusicPlayerModel.h" #include "phoneaddressmodel.h" #include "TraingModel.h" -// #include "AlarmClockModel.h" +#include "AlarmClockModel.h" // #include "SetDialModel.h" #include "SleepModel.h" // #include "PlayersModel.h" @@ -16,7 +16,7 @@ void ble_instruct_init(void) { ble_dial_init(); - // OHOS::ble_alarm_init(); + ble_alarm_init(); ble_mp3_init(); diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c index 4c98bb9c0..e963ea57b 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c @@ -7958,9 +7958,10 @@ void decode_file_checksum_2AE6(ble_read_data *buffer_handle) case 4://dial TRANSMIT_DATA=TRANS_BIN_SUCC; CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); - + if( ble_bin_install(app_name)) ble_reply_cmd(FILE_SUCC_TRANSFER,1); - ble_bin_install(app_name); + else + ble_reply_cmd(FILE_SUCC_TRANSFER,0); // ble_mp3_list_update();