From f1e0476c2dea6f3cf20b50f26ddc5a3b857c3cd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BD=AD=E7=A3=8A?= <1624952103@qq.com> Date: Sun, 20 Oct 2024 03:56:09 +0000 Subject: [PATCH] Merge #1218 into sdk602patch0911 from refs/changes/1218/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 彭磊 * refs/changes/1218/head: (4 commits squashed) - 优化睡眠状态下误判为未佩戴的情况。 修改小睡佩戴检测Timer为1分钟，优化小睡入睡时间计算。 添加tar文件内存管理。 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 修改开机动画图片路径到“user/res/ReBootAndShutDown” - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1218 --- .../nativeui/heartrate/src/HeartModel.cpp | 9 ++- .../res/RebootAndShutDown}/ReBoot/1.bin | 0 .../res/RebootAndShutDown}/ReBoot/10.bin | 0 .../res/RebootAndShutDown}/ReBoot/11.bin | 0 .../res/RebootAndShutDown}/ReBoot/12.bin | 0 .../res/RebootAndShutDown}/ReBoot/13.bin | 0 .../res/RebootAndShutDown}/ReBoot/14.bin | 0 .../res/RebootAndShutDown}/ReBoot/15.bin | 0 .../res/RebootAndShutDown}/ReBoot/16.bin | 0 .../res/RebootAndShutDown}/ReBoot/17.bin | 0 .../res/RebootAndShutDown}/ReBoot/18.bin | 0 .../res/RebootAndShutDown}/ReBoot/19.bin | 0 .../res/RebootAndShutDown}/ReBoot/2.bin | 0 .../res/RebootAndShutDown}/ReBoot/20.bin | 0 .../res/RebootAndShutDown}/ReBoot/21.bin | 0 .../res/RebootAndShutDown}/ReBoot/22.bin | 0 .../res/RebootAndShutDown}/ReBoot/23.bin | 0 .../res/RebootAndShutDown}/ReBoot/24.bin | 0 .../res/RebootAndShutDown}/ReBoot/25.bin | 0 .../res/RebootAndShutDown}/ReBoot/26.bin | 0 .../res/RebootAndShutDown}/ReBoot/27.bin | 0 .../res/RebootAndShutDown}/ReBoot/28.bin | 0 .../res/RebootAndShutDown}/ReBoot/29.bin | 0 .../res/RebootAndShutDown}/ReBoot/3.bin | 0 .../res/RebootAndShutDown}/ReBoot/30.bin | 0 .../res/RebootAndShutDown}/ReBoot/31.bin | 0 .../res/RebootAndShutDown}/ReBoot/32.bin | 0 .../res/RebootAndShutDown}/ReBoot/33.bin | 0 .../res/RebootAndShutDown}/ReBoot/34.bin | 0 .../res/RebootAndShutDown}/ReBoot/35.bin | 0 .../res/RebootAndShutDown}/ReBoot/36.bin | 0 .../res/RebootAndShutDown}/ReBoot/4.bin | 0 .../res/RebootAndShutDown}/ReBoot/5.bin | 0 .../res/RebootAndShutDown}/ReBoot/6.bin | 0 .../res/RebootAndShutDown}/ReBoot/7.bin | 0 .../res/RebootAndShutDown}/ReBoot/8.bin | 0 .../res/RebootAndShutDown}/ReBoot/9.bin | 0 .../peripheral/ppg/hx3695/tyhx_hrs_custom.h | 4 +- .../drivers/peripheral/utils/custom_utils.c | 66 ++++++++++++++----- .../service/src/graphic_service_wrapper.cpp | 4 +- 40 files changed, 63 insertions(+), 20 deletions(-) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/1.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/10.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/11.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/12.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/13.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/14.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/15.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/16.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/17.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/18.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/19.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/2.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/20.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/21.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/22.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/23.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/24.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/25.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/26.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/27.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/28.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/29.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/3.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/30.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/31.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/32.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/33.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/34.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/35.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/36.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/4.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/5.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/6.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/7.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/8.bin (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/{system => user/res/RebootAndShutDown}/ReBoot/9.bin (100%) diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp index 61d8ad161..bbdfd0ead 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -630,6 +630,8 @@ void HeartModel::UpHeartdata(uint16_t heart) { if (uapi_dev_runtime_get_train_status() == 1) return; + int max_valid_count = 0; + if (heart != 0) { if (display_counter_ >= DISPLAY_COUNT) { displayheart = heart; @@ -666,7 +668,12 @@ void HeartModel::UpHeartdata(uint16_t heart) { } // 检查无效计数器是否达标 - if (disvalid_counter_ >= MAX_DISVALID_HRS_COUNT) { + if(uapi_dev_runtime_get_sleep_monitoring_status()) //睡眠监测模式下，增加未佩戴个数最大值，避免误判 + max_valid_count = MAX_DISVALID_HRS_COUNT * 2; + else + max_valid_count = MAX_DISVALID_HRS_COUNT; + + if (disvalid_counter_ >= max_valid_count) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:无效数达标 disvalid_counter:%d", disvalid_counter_); SetResult(HeartResult::INVALID_DATA); // 标记为无效数据 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/1.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/1.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/1.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/10.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/10.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/10.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/10.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/11.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/11.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/11.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/11.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/12.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/12.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/12.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/12.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/13.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/13.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/13.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/13.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/14.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/14.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/14.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/14.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/15.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/15.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/15.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/15.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/16.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/16.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/16.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/16.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/17.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/17.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/17.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/17.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/18.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/18.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/18.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/18.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/19.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/19.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/19.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/19.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/2.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/2.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/2.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/20.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/20.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/20.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/20.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/21.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/21.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/21.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/21.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/22.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/22.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/22.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/22.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/23.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/23.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/23.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/23.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/24.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/24.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/24.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/24.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/25.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/25.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/25.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/25.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/26.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/26.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/26.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/26.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/27.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/27.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/27.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/27.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/28.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/28.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/28.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/28.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/29.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/29.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/29.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/29.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/3.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/3.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/3.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/3.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/30.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/30.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/30.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/31.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/31.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/31.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/31.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/32.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/32.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/32.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/32.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/33.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/33.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/33.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/33.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/34.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/34.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/34.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/34.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/35.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/35.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/35.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/35.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/36.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/36.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/36.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/36.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/4.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/4.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/4.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/4.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/5.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/5.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/5.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/5.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/6.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/6.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/7.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/7.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/7.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/7.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/8.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/8.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/8.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/8.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/9.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/9.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/9.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/RebootAndShutDown/ReBoot/9.bin diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h b/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h index 35bfef20d..b9f6bbd63 100644 --- a/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h +++ b/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h @@ -8,7 +8,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-03-26 20:29:58 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-09-05 19:04:40 + * @LastEditTime: 2024-10-19 18:54:33 * @FilePath: /FD230/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h * @Description: * @@ -77,7 +77,7 @@ uint32_t tyhx_read_regs( uint8_t reg_addr,uint8_t *readbuf,uint16_t readlen); #define TYHX_TIMER_40MS 40 #define TYHX_TIMER_320MS 320 -#define TYHX_TIMER_5000MS 1000 * 60 * 5 //纯佩戴修改为5分钟 +#define TYHX_TIMER_5000MS 1000 * 60 //纯佩戴修改为1分钟 优化小睡入睡时间计算 //#define TYHX_TIMER_5000MS 5000 bool tyhx_timer_start(uint32_t ms); diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index eacf76aab..9077ee8de 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -1893,6 +1893,53 @@ int uapi_delete_files(const char *file_path) } } + +void uapi_check_tar_file_count(char *folderpath) +{ + DIR *dir; + struct dirent *entry; + uint8_t count = 0; + uint32_t old_tm,new_tm; + char old_tm_str[11] = {0}; + char new_tm_str[11] = {0}; + char old_file_name[64] = {0}; + + dir = opendir(folderpath); + if (dir == NULL) + { + PRINT("open %s failed \n",folderpath); + return; + } + while ((entry = readdir(dir))!= NULL) //遍历tar文件找到时间戳最老的文件名 + { + if (strstr(entry->d_name, ".tar")!= NULL) + { + count++; + strncpy(new_tm_str, entry->d_name + strlen(entry->d_name) - 14, 10); + new_tm_str[10] = '\0'; + new_tm = (uint32_t)strtoul(new_tm_str, NULL, 10); + if (old_tm == 0 || old_tm > new_tm) + { + old_tm = new_tm; + memset(old_file_name,0,sizeof(old_file_name)); + memcpy_s(old_file_name,sizeof(old_file_name),entry->d_name,strlen(entry->d_name)); + } + } + } + + + closedir(dir); + if (count > 5) //文件数量超过5个则删掉最老的文件 + { + char filePath[256]; + snprintf(filePath, sizeof(filePath), "%s/%s", folderpath, old_file_name); + if (remove(filePath) == 0) + PRINT("delete %s succed\n", filePath); + else + PRINT("delete %s failed\n", filePath); + } +} + #define MAX_TAR_READ_BUF 1024 int uapi_tar_file(const char *src_path,const char *tar_path,char *tarfilename) { @@ -1996,6 +2043,10 @@ int uapi_tar_file(const char *src_path,const char *tar_path,char *tarfilename) remove(str); return -1; } + else + { + uapi_check_tar_file_count("/user/tar"); //有新的tar文件生成则检查tar文件数量 + } free(buffer); return ret; } @@ -3616,21 +3667,6 @@ void uapi_custom_set_uart_rx_enable_flag(bool enable_uart) } -#define SLEEP_FLAG_PATH "/user/userdata/sleep_flag.bin" - -void uapi_save_sleep_flag(uint8_t *data,uint16_t len) -{ - if(access(SLEEP_FLAG_PATH, F_OK) == -1) - uapi_save_file_data(SLEEP_FLAG_PATH,data,len,"wb"); - else - uapi_save_file_data(SLEEP_FLAG_PATH,data,len,"ab"); -} - -void uapi_clean_sleep_flag(void) -{ - uapi_delete_files(SLEEP_FLAG_PATH); -} - errcode_t touch_resume_in_cmd_queue(void) { diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp index 133454f75..87c6c6881 100755 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service_wrapper.cpp @@ -56,10 +56,10 @@ static OHOS::UIViewGroup* group=nullptr; static OHOS::UIViewGroup* boot_group=nullptr; static OHOS::UIImageAnimatorView* ReBootImageAnimatorView=nullptr; #ifdef CUSTOM_Z1 -static constexpr char *ReBootPaths = "/system/ReBoot/"; //开机图片路径 +static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // 图片帧数 #else -static constexpr char *ReBootPaths = "/system/ReBoot/"; //开机图片路径 +static constexpr char *ReBootPaths = "/user/res/RebootAndShutDown/ReBoot/"; //开机图片路径 static constexpr int16_t REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36; // 图片帧数 #endif static constexpr int16_t REBOOT_IMAGE_ANIMATOR_TIME = 150; // 图片更新间隔 -- 2.17.1