Merge #119 into xts_origin from refs/changes/119/head 122/target/1 123/target/1
author胡传军 <1224667075@qq.com>
Thu, 2 May 2024 16:19:39 +0000 (16:19 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Thu, 2 May 2024 16:19:39 +0000 (16:19 +0000)
commit3b26867c7cfc4f73de43147878d1937e0b40d6b6
tree588a7cf51eb8c32c5803bfd3d3a65ecf92215088
parent6d3431ee00a1c98ef6f251d2b5da9e60f8c9d61e
Merge #119 into xts_origin from refs/changes/119/head

Code review from 胡传军

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

  - 将strtok改为strtok_r

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

  - 基础训练记录同步

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/119
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp