Merge #159 into xts_origin from refs/changes/159/head
author胡传军 <1224667075@qq.com>
Sat, 11 May 2024 07:39:51 +0000 (07:39 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 11 May 2024 07:39:51 +0000 (07:39 +0000)
commit8d53d389d5226463bf9bee03e673e5ef4ea85617
tree119b93850679014ce39933b6de1b3ba52708304c
parent21aaa696276351db8009e2031018e7e17a32478c
Merge #159 into xts_origin from refs/changes/159/head

Code review from 胡传军

* refs/changes/159/head: (8 commits squashed)

  - 喝水及睡眠协议对接

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

  - 合并冲突

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

  - ota升级

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

  - ota升级

  - 重构OTA升级

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/159
13 files changed:
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
code/sdk/application/wearable/fd230app/nativeui/system/include/Systemupgrade.h
code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp
code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
code/sdk/application/wearable/fd230app/nativeui/systemupdate/include/SystemUpdateModel.h
code/sdk/application/wearable/fd230app/nativeui/systemupdate/include/SystemUpdateView.h
code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp
code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
code/sdk/drivers/peripheral/slip/cat1Service/CMakeLists.txt
code/sdk/drivers/peripheral/slip/cat1Service/cat1_server_hal.cpp
code/sdk/drivers/peripheral/utils/custom_utils.c