From adc0d892f647ce31b7be7d276ae918048c67541a Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Fri, 28 Jun 2024 14:40:00 +0800 Subject: [PATCH] =?utf8?q?=E8=A1=A5=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/sleep/include/SleepModel.h | 4 +- .../nativeui/sleep/src/SleepModel.cpp | 57 +++---------------- .../msg_center/src/msg_center_customer.cpp | 10 +++- 3 files changed, 18 insertions(+), 53 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 4d7ca4a95..1c1f9e53d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-06-26 19:36:48 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-06-28 11:17:48 + * @LastEditTime: 2024-06-28 14:25:40 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h * @Description: * @@ -66,7 +66,7 @@ namespace OHOS void set_nap_data(NAP_T *data); void set_sleep_data(SLEEP_T *data); - void set_sleep_state(SLEEP_STATE_T *data); + void set_sleep_status(SLEEP_STATE_T *data); uint32_t read_sleep_data(char *data,uint32_t size,FILE *fp); bool save_sleep_data(SLEEP_T *data); 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 6a0f5c4f3..0658e48fb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-06-26 19:36:48 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-06-28 11:49:42 + * @LastEditTime: 2024-06-28 14:34:42 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp * @Description: * @@ -73,22 +73,9 @@ namespace OHOS void set_nap_data(NAP_T *data) { - if(data->fall_asleep_timestamp) - nap_data.fall_asleep_timestamp=data->fall_asleep_timestamp; - - if(data->wake_up_timestamp) - nap_data.wake_up_timestamp=data->wake_up_timestamp; - - if(data->total_time) - nap_data.total_time=data->total_time; - - if(nap_data.total_time!=0 && nap_data.wake_up_timestamp!=0 && nap_data.fall_asleep_timestamp!=0 ) - { - save_nap_data(&nap_data); - nap_data.total_time=0; - nap_data.wake_up_timestamp=0; - nap_data.fall_asleep_timestamp=0; - } + memset(&nap_data,0,sizeof(NAP_T)); + memcpy_s(&nap_data,sizeof(NAP_T),data,sizeof(NAP_T)); + save_nap_data(&nap_data); } uint32_t read_nap_data(char *data,uint32_t size,FILE *fp) @@ -103,40 +90,15 @@ namespace OHOS void set_sleep_data(SLEEP_T *data) { - if(data->fall_asleep_timestamp) - sleep_data.fall_asleep_timestamp=data->fall_asleep_timestamp; - - if(data->wake_up_timestamp) - sleep_data.wake_up_timestamp=data->wake_up_timestamp; - - if(data->total_time) - sleep_data.total_time=data->total_time; - - if(data->total_deep_sleep_time) - sleep_data.total_deep_sleep_time=data->total_deep_sleep_time; - - if(data->total_mild_sleep_time) - sleep_data.total_mild_sleep_time=data->total_mild_sleep_time; - - if(data->total_rem_sleep_time) - sleep_data.total_rem_sleep_time=data->total_rem_sleep_time; - - if(data->total_wake_time) - sleep_data.total_wake_time=data->total_wake_time; - - save_sleep_data(&sleep_data); memset(&sleep_data,0,sizeof(SLEEP_T)); + memcpy_s(&sleep_data,sizeof(SLEEP_T),data,sizeof(SLEEP_T)); + save_sleep_data(&sleep_data); } - void set_sleep_state(SLEEP_STATE_T *data) + void set_sleep_status(SLEEP_STATE_T *data) { memset(&sleep_status,0,sizeof(SLEEP_STATE_T)); - - if(data->timestamp) - sleep_status.timestamp=data->timestamp; - - if(data->stat) - sleep_status.stat=data->stat; + memcpy_s(&sleep_status,sizeof(SLEEP_STATE_T),data,sizeof(SLEEP_STATE_T)); //save_sleep_data(&sleep_status); } @@ -146,9 +108,6 @@ namespace OHOS return fread(data,1,size,fp); } - void GetSleepTime(); // 获取睡眠时间 - - SleepModel::SleepModel() {} SleepModel::~SleepModel() {} SleepModel &SleepModel::GetInstance() diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp index 31464c4f7..f03333e03 100644 --- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp @@ -951,7 +951,7 @@ void MsgCenterNotifyActivityProc(const Topic topic, Request* req) return; } - int rets = memcpy_s(c_activity_result_t, req->len, (cywee_activity_result_t*)req->data, req->len); + int rets = memcpy_s(c_activity_result_t, req->len, (cywee_activity_result_t*)req->data, req->len); if (rets != EOK) { free(c_activity_result_t); @@ -969,6 +969,8 @@ void MsgCenterNotifyActivityProc(const Topic topic, Request* req) if(c_activity_result_t->MHR_zone>=2) set_fat_time_data(); + free(c_activity_result_t); + c_activity_result_t = NULL; } void MsgCenterNotifyActivityExtraInfoProc(const Topic topic, Request* req) @@ -1029,7 +1031,7 @@ void MsgCenterNotifyInactivityProc(const Topic topic, Request *req) uapi_get_timestampe_ss(×tamp); state_data.timestamp = timestamp; state_data.stat = cywee_Inactivity_Info->status; - set_sleep_state(&state_data); + set_sleep_status(&state_data); if(cywee_Inactivity_Info->status == 6) //0进入睡眠 1潜睡 2深睡 3清醒 4结束睡眠 6入睡 7出睡最后一笔输出 8未出睡最后一笔输出 12快速动眼 13取消入睡 { @@ -1088,6 +1090,8 @@ void MsgCenterNotifyInactivityAccumulateTimeProc(const Topic topic, Request* req nap_data.total_time = cywee_Inactivity_Accumulate_Time_Info->total_time; set_nap_data(&nap_data); memset(&nap_data,0,sizeof(NAP_T)); + free(cywee_Inactivity_Accumulate_Time_Info); + cywee_Inactivity_Accumulate_Time_Info = NULL; return ; } @@ -1099,6 +1103,8 @@ void MsgCenterNotifyInactivityAccumulateTimeProc(const Topic topic, Request* req set_sleep_data(&sleep_data); memset(&sleep_data,0,sizeof(SLEEP_T)); + free(cywee_Inactivity_Accumulate_Time_Info); + cywee_Inactivity_Accumulate_Time_Info = NULL; } //APP运动相关 -- 2.17.1