Merge #15 into xts_origin from refs/changes/15/head 19/target/1
author邓雪英 <1731678236@qq.com>
Tue, 16 Apr 2024 13:13:05 +0000 (13:13 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 16 Apr 2024 13:13:05 +0000 (13:13 +0000)
commit278f97eb4dfc38e28f97002eff933f7cf03842ad
tree47ac83c818c4a2d01f76e953d6046cdda71b5499
parent22bcec87c6277ea959cb16c22d374c6e182185c7
Merge #15 into xts_origin from refs/changes/15/head

通讯录协议对接完成

* refs/changes/15/head: (3 commits squashed)

  - test

  - 1.通许录协议对接已完成
    2.更改时间 天气 训练目标解析返回值传参出错的问题

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

Signed-off-by: d15521469561 <1731678236@qq.com>
Commented-by: d15521469561 <1731678236@qq.com>
Commented-by: Caisking <3449750381@qq.com>
Commented-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/15
code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayHelp.cpp
code/sdk/application/wearable/fd230app/nativeui/phone/include/phoneaddressmodel.h
code/sdk/application/wearable/fd230app/nativeui/phone/src/phoneaddressmodel.cpp
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/ble_service/bleservice/bleEvent.h
code/sdk/application/wearable/service/ble_service/bleservice/bleService.c