增加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 4b56be5..1702f56 100644 (file)
--- 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"\r
 #include "ChangeSliceListener.h"\r
 #include "msg_center.h"\r
-\r
+#include "gfx_utils/list.h"\r
 constexpr uint32_t LIST_ALARM_CLOCK_MAX = 20;\r
 constexpr uint32_t ALARM_DEC_NUM_256 = 256;\r
 \r
+#ifdef BLE_INSTRUCT\r
+#ifdef __cplusplus\r
+#if __cplusplus\r
+extern "C" {\r
+#endif /* __cplusplus */\r
+#endif /* __cplusplus */\r
+\r
+\r
+void ble_alarm_init(void);\r
+#ifdef __cplusplus\r
+#if __cplusplus\r
+}\r
+#endif /* __cplusplus */\r
+#endif /* __cplusplus */\r
+\r
+#endif\r
+\r
+\r
 namespace OHOS {\r
 using OHOS::Media::Player;\r
 using OHOS::Media::Source;\r
@@ -32,9 +50,6 @@ struct AlarmPlayerCaseInfo {
     char sliceId[ALARM_DEC_NUM_256];\r
     int16_t index;\r
 };\r
-#ifdef BLE_INSTRUCT\r
-void ble_alarm_init(void);\r
-#endif\r
 \r
 // 播放器\r
 class AlarmPlayerListener : public InterruptListener {\r

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 a5b21c0..9794490 100644 (file)
--- 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 13f422c..18af463 100644 (file)
--- 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 351ec7b..5ee5aec 100644 (file)
--- 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 4c98bb9..e963ea5 100644 (file)
--- 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\r
                      TRANSMIT_DATA=TRANS_BIN_SUCC;\r
                     CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1);\r
-                    \r
+                    if( ble_bin_install(app_name))\r
                     ble_reply_cmd(FILE_SUCC_TRANSFER,1);\r
-                    ble_bin_install(app_name);\r
+                    else\r
+                    ble_reply_cmd(FILE_SUCC_TRANSFER,0);\r
 \r
                     // ble_mp3_list_update();\r
 \r