Merge #1051 into sdk602patch0626 from refs/changes/1051/head 1053/target/1 1054/target/1
author袁清梦 <3449750381@qq.com>
Sun, 29 Sep 2024 02:56:20 +0000 (02:56 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sun, 29 Sep 2024 02:56:20 +0000 (02:56 +0000)
Code review from 袁清梦

* refs/changes/1051/head: (10 commits squashed)

  - 室外跑步,走路。统一使用室内算法

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

  - 修改遥控拍照Slice析构

  - 增加topic发送错误的错误打印

  - 增加判断文件是否存在的统一接口

  - 增加训练的配速表,心率表相关接口

  - 修改卡片list为不循环

  - 修改消息Slice的显示以及读取

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

  - 修改默认表盘Id

Signed-off-by: Caisking <3449750381@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/1051
code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h

index 7c7a395..a1f17db 100644 (file)
@@ -86,7 +86,7 @@ namespace OHOS
         virtual ~SetDialModel();
         int32_t ParseDialHeader(int type, const std::string &dialFileName, SetDialInfo &dialInfo);
         std::vector<SetDialInfo> dialInfoList;
-        uint16_t currentDialID = 1028; // 设置表盘默认值
+        uint16_t currentDialID = 114; // 设置表盘默认值
     };
 }