Merge #123 into xts_origin from refs/changes/123/head 124/target/1 126/target/1
author邓雪英 <1731678236@qq.com>
Mon, 6 May 2024 02:25:58 +0000 (02:25 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Mon, 6 May 2024 02:25:58 +0000 (02:25 +0000)
commit96f5e40f39888ecb5352339d2861f69f60b284fd
treee326be80cf0cbe864329ed8102aca547c3dea40b
parent52360c7cddbf93e945e177518445a77dc939ed49
Merge #123 into xts_origin from refs/changes/123/head

Code review from 邓雪英

* refs/changes/123/head: (6 commits squashed)

  -  解析协议相关内容

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

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

  - 查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成

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

  - 还原文件修改bug

Signed-off-by: d15521469561 <1731678236@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/123
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
code/sdk/application/wearable/service/broadcast/src/broadcast_implement.c
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp [changed mode: 0755->0644]
code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp