Merge #1756 into sdk650pathc0423 from refs/changes/1756/head 1752/target/2 1757/target/1
author胡传军 <1224667075@qq.com>
Mon, 19 May 2025 02:01:48 +0000 (02:01 +0000)
committer袁清梦 <3449750381@qq.com>
Mon, 19 May 2025 02:01:48 +0000 (02:01 +0000)
commit60123dcd388f1728787284ab37e7372ecbabae8c
tree67f99c8240e2bc50d0a3a0d5d950ee251d930bf2
parent4d6681ea000295bfbdebc18ee38e22e7cec96619
Merge #1756 into sdk650pathc0423 from refs/changes/1756/head

合并蓝牙服务等待后续联调

* refs/changes/1756/head: (1 commits squashed)

  - 合并蓝牙服务等待后续联调

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1756
54 files changed:
code/sdk/application/brandy/brandy_standard/thread_pri_init.c
code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothWrapper.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhoneModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhoneView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/health_service.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallingView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/WaitingHintsView.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/include/MusicPlayerModel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/phoneaddressmodel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/phoneaddressmodel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersModel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/include/SleepModel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingModel.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp
code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h
code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/include/WeatherModel.h
code/sdk/application/wearable/fd230/service/broadcast/src/broadcast_implement.c
code/sdk/application/wearable/fd230/service/msg_center/CMakeLists.txt
code/sdk/application/wearable/fd230/service/msg_center/include/notify/pairing_notification.h [new file with mode: 0644]
code/sdk/application/wearable/fd230/service/msg_center/include/notify/transmitting.h [new file with mode: 0644]
code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp
code/sdk/application/wearable/fd230/service/msg_center/src/notify/pairing_notification.cpp [new file with mode: 0644]
code/sdk/application/wearable/fd230/service/msg_center/src/notify/transmitting.cpp [new file with mode: 0644]
code/sdk/application/wearable/service/broadcast/include/broadcast_feature.h
code/sdk/application/wearable/service/msg_center/CMakeLists.txt
code/sdk/application/wearable/service/msg_center/include/notify/transmitting.h [new file with mode: 0644]
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp [new file with mode: 0644]
code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/config.py
code/sdk/zhihui/config/src/ConfigModel.cpp
code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt
code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.cpp
code/sdk/zhihui/services/ble_service/blemoder/bleInstruct.h
code/sdk/zhihui/services/ble_service/blemoder/ble_congfig_adapt.cpp
code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp [new file with mode: 0644]
code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
code/sdk/zhihui/services/ble_service/bleservice/bleEvent.h
code/sdk/zhihui/services/ble_service/bleservice/bleService.c
code/sdk/zhihui/utils/custom_utils.c
code/sdk/zhihui/utilscpp/custom_utilscpp.cpp