From 4a2d79b7156c324e909d2ff52247c413d7307706 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Wed, 25 Sep 2024 14:07:35 +0000 Subject: [PATCH] Merge #1017 into sdk602patch0626 from refs/changes/1017/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/1017/head: (29 commits squashed) - 修改心率曲线图Y轴数字 - #144 手表,心率测量开始测量的时候显示的心率值太大,需要优化开始显示的心率值 - #678 心率初始出值不稳定,偏差太大。 - #560 运动,徒步运动设置目标1KM,实际放桌子上未动,提示我目标达成 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #446 运动界面,上下滑,下界面是覆盖式的,优化为U6那种滑动式界面 - #667 运动结束界面,数据不完整,数据内容不丰富,没有设置目标也会显示目标完成度 - #700 运动时间显示花屏,显示逻辑不对(两台测试样机都有) - #687 省电模式-有长按不起反应现象 - #819 手表,表盘步数显示-31441,实际步数99631 - 修改表盘距离数据为uint32_t - #448 运动结束训练记录滑动会遮挡,并且运动结束会显示训练历史记录 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - 修改运动获取实时数据traningauto为1 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #314 手表,消息通知,长消息超出框外显示 - 移除训练的uapi_add_sport_vote()修改运动结束逻辑 - 增加新表盘原文件 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #592 APP iOS 自定义表盘不能删除 - #624 短信消息推送有显示空白现象(使用的是IOS手机) - #605 APP iOS/安卓 手表切换表盘,APP上不同步 - #343 APP安卓4.5.8 手表端切换表盘,APP设备界面的手表显示的表盘不会变,一直都是默认的表盘 - 增加消息json解析的错误预防处理 - 增加心率血氧json解析的错误预防处理 - 增加训练记录json解析错误预防 - 修改默认表盘配置;具体方案还需要商讨 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/1017 --- .../nativeui/heart_blood/health_service/health_service.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp index d7c2b775f..ebe6d2205 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp @@ -86,8 +86,9 @@ bool HealthService::CreateHealthFolder() { } } - return true; -} + /* --------------------------------- json操作 --------------------------------- */ + static constexpr const char *HEART_JSON_PATH = "/user/userdata/health/heart.json"; + static constexpr const char *BLOOD_JSON_PATH = "/user/userdata/health/blood.json"; // 读取血氧数据 BloodOxygenData *HealthService::ReadBloodOxygenData() -- 2.17.1