Merge #816 into sdk602patch0626 from refs/changes/816/head
author胡传军 <1224667075@qq.com>
Thu, 29 Aug 2024 02:14:34 +0000 (02:14 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Thu, 29 Aug 2024 02:14:34 +0000 (02:14 +0000)
commit7eaab849bf1cd76fbce1dadcdd0fd25116521672
tree3183eb4b19f8ee4e5fbbabe6ced0ac5925066c39
parentbde8b851c2cbaed64748ba54d761d1068cbd42a5
Merge #816 into sdk602patch0626 from refs/changes/816/head

Code review from 胡传军

* refs/changes/816/head: (2 commits squashed)

  - 增加AI对话取消对话在蓝牙层级保护,避免出现误取消,以及未结束继续对话的情况

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/816
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h