From f1deab51da1b28bca265e650263d25ae8a2aaab7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Thu, 10 Oct 2024 14:00:06 +0000 Subject: [PATCH] Merge #1146 into sdk602patch0626 from refs/changes/1146/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1146/head: (8 commits squashed) - 计算器修改，解决double计算精度不够，导致计算出现多余小数位，#963 - sos增加适配HFP呼叫,呼叫备注显示#933 #932 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626 - 计算器修改，改为删除仅删除一位 #905 目标同步修改 #921 - 计算器修改 #962 - 合并 - 小睡数据修复 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1146 --- .../fd230app/nativeui/sleep/include/SleepModel.h | 12 ++++++------ .../fd230app/nativeui/sleep/src/SleepModel.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h index ea96a5c7f..b1d4b598b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h @@ -14,17 +14,17 @@ #define NAPTEST -#define SLEEP_TIME_PATH "user/userdata/sleep/%s/sleep_time.bin" -#define SLEEP_STATUS_PATH "user/userdata/sleep/%s/sleep_status.bin" +#define SLEEP_TIME_PATH "/user/userdata/sleep/%s/sleep_time.bin" +#define SLEEP_STATUS_PATH "/user/userdata/sleep/%s/sleep_status.bin" #ifndef NAPTEST -#define NAP_PATH "user/userdata/sleep/%s/nap_%d.bin" +#define NAP_PATH "/user/userdata/sleep/%s/nap_%d.bin" #else -#define NAP_PATH "user/userdata/sleep/%s/nap.bin" +#define NAP_PATH "/user/userdata/sleep/%s/nap.bin" #endif -#define SLEEP_DIR_PATH "user/userdata/sleep/%s" +#define SLEEP_DIR_PATH "/user/userdata/sleep/%s" -#define SLEEP_DATA_DIR "user/userdata/sleep/" +#define SLEEP_DATA_DIR "/user/userdata/sleep/" #define SLEEP_STATUS_LENGTH 80 diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp index 00ae31755..d12bd6626 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp @@ -170,9 +170,9 @@ namespace OHOS return false; } - uint8_t id=size/14; + uint8_t id=size/14+1; - uint8_t nap_size=12; + uint16_t nap_size=12; fwrite(&nap_size, 1, 2, fp); fwrite(&id, 1, 1, fp); -- 2.17.1