From: Caisking <3449750381@qq.com> Date: Wed, 3 Jul 2024 03:05:33 +0000 (+0800) Subject: 修复睡眠数据提交 X-Git-Tag: release_V1.2.70_20241020_135402~885^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ef2c859fee59231373dc9445bed55adf4c5fc2dd;p=mirrors%2FFD230.git 修复睡眠数据提交 (cherry picked from commit 15144367) --- 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 843d782e9..5628619fa 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp @@ -87,7 +87,12 @@ namespace OHOS fwrite(&wake_up_timestamp, 1, 4, fp); uint16_t total_time = data->total_time; - fwrite(&total_time, 1, 2, fp); + + uint8_t total_time_hour = (total_time / 60); + fwrite(&total_time_hour, 1, 1, fp); + + uint8_t total_time_minute = (total_time % 60); + fwrite(&total_time_minute, 1, 1, fp); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "save_nap_sleep_data succ"); @@ -156,26 +161,47 @@ namespace OHOS fwrite(&wake_up_timestamp, 1, 4, fp); uint16_t total_time = data->total_time; - fwrite(&total_time, 1, 2, fp); + + uint8_t total_time_hour = (total_time / 60); + fwrite(&total_time_hour, 1, 1, fp); + + uint8_t total_time_minute = (total_time % 60); + fwrite(&total_time_minute, 1, 1, fp); uint16_t total_deep_sleep_time = data->total_deep_sleep_time; - fwrite(&total_deep_sleep_time, 1, 2, fp); + + total_time_hour = (total_deep_sleep_time / 60); + fwrite(&total_time_hour, 1, 1, fp); + + total_time_minute = (total_deep_sleep_time % 60); + fwrite(&total_time_minute, 1, 1, fp); uint16_t total_mild_sleep_time = data->total_mild_sleep_time; - fwrite(&total_mild_sleep_time, 1, 2, fp); + total_time_hour = (total_mild_sleep_time / 60); + fwrite(&total_time_hour, 1, 1, fp); + + total_time_minute = (total_mild_sleep_time % 60); + fwrite(&total_time_minute, 1, 1, fp); uint16_t total_rem_sleep_time = data->total_rem_sleep_time; - fwrite(&total_rem_sleep_time, 1, 2, fp); + total_time_hour = (total_rem_sleep_time / 60); + fwrite(&total_time_hour, 1, 1, fp); + + total_time_minute = (total_rem_sleep_time % 60); + fwrite(&total_time_minute, 1, 1, fp); uint16_t total_wake_time = data->total_wake_time; - fwrite(&total_wake_time, 1, 2, fp); + total_time_hour = (total_wake_time / 60); + fwrite(&total_time_hour, 1, 1, fp); + + total_time_minute = (total_wake_time % 60); + fwrite(&total_time_minute, 1, 1, fp); fwrite(data->sleep_status, sizeof(SLEEP_STATE_T), data->status_num, fp); fclose(fp); return true; } - void set_sleep_data(SLEEP_T *data) { memset(&sleep_data, 0, sizeof(SLEEP_T)); @@ -184,6 +210,7 @@ namespace OHOS // 刷新model里面的数据 SleepModel::GetInstance().update_sleep(&sleep_data); } + /* -------------------------------------------------------------------------- */ SleepModel::SleepModel() { set_sleep_goal();