From 15f81fcaa8547488ea8c30f48aa3fa5b6f41d0f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Sun, 29 Sep 2024 02:56:20 +0000 Subject: [PATCH] Merge #1051 into sdk602patch0626 from refs/changes/1051/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/1051/head: (10 commits squashed) - 室外跑步，走路。统一使用室内算法 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - 修改遥控拍照Slice析构 - 增加topic发送错误的错误打印 - 增加判断文件是否存在的统一接口 - 增加训练的配速表，心率表相关接口 - 修改卡片list为不循环 - 修改消息Slice的显示以及读取 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - 修改默认表盘Id Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1051 --- .../wearable/fd230app/nativeui/set_dial/include/SetDialModel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h index 7c7a395a8..a1f17db62 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h @@ -86,7 +86,7 @@ namespace OHOS virtual ~SetDialModel(); int32_t ParseDialHeader(int type, const std::string &dialFileName, SetDialInfo &dialInfo); std::vector dialInfoList; - uint16_t currentDialID = 1028; // 设置表盘默认值 + uint16_t currentDialID = 114; // 设置表盘默认值 }; } -- 2.17.1