From: penglei <1624952103@qq.com> Date: Fri, 17 Oct 2025 06:58:20 +0000 (+0800) Subject: 优化佩戴信息UI显示 X-Git-Tag: V1.0.9_20251128_194606_LN~215^2~1 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e152ab0cf1c091ec11027cb2335e72fdfca985d5;p=mirrors%2FFD230.git 优化佩戴信息UI显示 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp index 22db1f507..9aa0e9c27 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: SLEPPNOTIFY24-06-26 19:36:48 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-08-06 10:42:09 + * @LastEditTime: 2025-10-17 14:49:37 * @FilePath: * /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp * @Description: @@ -70,7 +70,7 @@ namespace OHOS { - OHOS::WEAR_STAT_T *wear_stat = NULL; + static OHOS::WEAR_STAT_T *wear_stat = NULL; void SleepModel::clean_sleep_data(void) { @@ -320,7 +320,7 @@ namespace OHOS return; if(wear_stat == NULL) - wear_stat = (OHOS :: WEAR_STAT_T*)malloc(len); + wear_stat = (OHOS :: WEAR_STAT_T*)malloc(len); if(wear_stat == NULL) { @@ -328,7 +328,7 @@ namespace OHOS return; } - FILE *fp = fopen("user/userdata/wear.bin", "rb"); + FILE *fp = fopen("user/userdata/wear.bin", "r"); if (fp == NULL) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "wear file open failed"); diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/sleep/include/SleepModel.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/sleep/include/SleepModel.h index 988742b16..0c1427f76 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/sleep/include/SleepModel.h +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/sleep/include/SleepModel.h @@ -76,6 +76,7 @@ namespace OHOS int totaltime; // 睡眠总时间 } SleepDataUI; +#pragma pack(1) typedef struct { uint32_t timestamp; //时间戳 @@ -83,6 +84,8 @@ namespace OHOS } WEAR_STAT_T; +#pragma pack() + class SleepModel { public: diff --git a/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c b/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c index f13061c09..0e8d191b5 100644 --- a/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c +++ b/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c @@ -1076,7 +1076,10 @@ void cywee_wearstatus_update(int wearstatus) wear_status = wearstatus; CWM_CustomSensorInput(&csd); // CWM_OS_dbgPrintf("111wearstatus : %d\r\n",wearstatus); - +#ifdef CUSTOM_UTILS + do_custom_fileoperate_service_check_msg( + CUSTOM_FILEOPERATE_MSG_TYPE_WEAR_DATA_SAVE, NULL, 0); +#endif #endif } diff --git a/code/sdk/zhihui/utils/custom_fileoperate_service.c b/code/sdk/zhihui/utils/custom_fileoperate_service.c index 73c4b944e..fcff5568a 100644 --- a/code/sdk/zhihui/utils/custom_fileoperate_service.c +++ b/code/sdk/zhihui/utils/custom_fileoperate_service.c @@ -238,7 +238,9 @@ static void custom_fileoperate_service_check_task(void const *arg) break; case CUSTOM_FILEOPERATE_MSG_TYPE_WEAR_DATA_SAVE: - // cywee_custom_save_wear_data(); +#ifdef SUPPORT_CYWEE_SERVICE + cywee_custom_save_wear_data(); +#endif break; case CUSTOM_FILEOPERATE_MSG_TYPE_BATTERY_DATA_READ: