From baec20895e87bcde6dcee9a10b7eb5a67eba9470 Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Thu, 4 Jul 2024 17:03:24 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E7=9D=A1=E7=9C=A0=E6=B6=88?= =?utf8?q?=E6=81=AF=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/AlarmClockTimerConfig.cpp | 16 ++++++++++------ .../service/ble_service/blemoder/bletest.cpp | 3 ++- .../service/ble_service/bleservice/bleEvent.c | 2 +- .../msg_center/src/msg_center_customer.cpp | 2 +- .../drivers/peripheral/cywee/src/board_yh601s.c | 8 ++++++-- code/sdk/drivers/peripheral/cywee/src/main_dml.c | 10 +++++++--- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index 0f072b209..53f27d467 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -56,8 +56,8 @@ extern "C" // 设置睡眠提醒时间 void get_sleep_time_notify(void) { - int goal_hour = sleep_time >> 16; - int goal_min = (sleep_time & 0X00FF); + int goal_hour = (sleep_time & 0XFFFF0000) >> 16; + int goal_min = (sleep_time & 0X0000FFFF); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "goal_hour:%d goal_min:%d", goal_hour, goal_min); sleep_time_min = (goal_min >= SLEPPNOTIFY) ? goal_min - SLEPPNOTIFY : ((goal_min + 60) - SLEPPNOTIFY); // 避免分钟数为负 @@ -256,22 +256,26 @@ extern "C" // 进入睡眠模式 if (curTime.tm_hour == ((sleep_time & 0XFFFF0000) >> 16) && curTime.tm_min == (sleep_time & 0X0000FFFF) && curTime.tm_sec == 0) { - do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL); // 睡眠弹窗 printf("要睡觉啦!\r\n"); AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4); // 设置状态为睡眠 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP); + LOS_Msleep(1000); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); } // 退出睡眠模式 if (curTime.tm_hour == ((wake_up_time & 0XFFFF0000) >> 16) && curTime.tm_min == (wake_up_time & 0X0000FFFF) && curTime.tm_sec == 0) { + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL); printf("起床啦!\r\n"); - do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL); // 早安提醒 AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4); - // 设置状态为睡眠 + // 设置状态为小睡 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WALK); + LOS_Msleep(1000); + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_MODE, NULL); } } @@ -348,7 +352,7 @@ extern "C" g_alarmCtrB.info.week = week; g_alarmCtrB.info.hour = hour; g_alarmCtrB.info.minute = minute; - g_alarmCtrB.info.second = 1; + g_alarmCtrB.info.second = 5; } else { diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp index a0d491f68..f14abfd30 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -534,9 +534,10 @@ char * ble_sywee_history(uint8_t day,uint16_t *len ,uint8_t type) printf("fread %d \r\n",ret); for(int i=0;i482)num=482; - Send_Sleep_Bin_Data(data[0],50); + Send_Sleep_Bin_Data(data[0],num); break; case 0x21://文件目录 EACH_DATA_LEN = DIS_DATA_LEN; 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 215de7311..7c46644f8 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 @@ -1027,7 +1027,7 @@ void MsgCenterNotifyInactivityProc(const Topic topic, Request *req) { sleep_data.fall_asleep_timestamp = timestamp; } - else if(cywee_Inactivity_Info->status == 14) + else if(cywee_Inactivity_Info->status == 4) { sleep_data.wake_up_timestamp = timestamp; } diff --git a/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c b/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c index 3b337282f..4ad3ad15f 100644 --- a/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c +++ b/code/sdk/drivers/peripheral/cywee/src/board_yh601s.c @@ -391,10 +391,14 @@ void CWM_OS_saveData_history(int* new_data,int *history ,uint32_t len,uint8_t ty } uint32_t creationTime; int ret =uapi_get_timestampe_ss(&creationTime); + uint8_t creationTime_[4]={0}; + memcpy(creationTime_,&creationTime,4); + CWM_OS_dbgPrintf("uapi_get_timestampe_ss %02X %02X %02X %02X\n",creationTime_[0],creationTime_[1],creationTime_[2],creationTime_[3]); - CWM_OS_dbgPrintf("uapi_get_timestampe_ss %d\n",ret); - ret =fwrite(&creationTime,1,len,fp); + CWM_OS_dbgPrintf("uapi_get_timestampe_ss %d %d\n",ret,creationTime); + + ret =fwrite(&creationTime,1,4,fp); if(ret==0) { CWM_OS_dbgPrintf("fwrite failed %d\n",ret); diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c index a0711d055..a5f69bf97 100644 --- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c +++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c @@ -179,7 +179,7 @@ void distances_history_save(void) void fat_history_save(void) { int data= get_fat_time_data(); - CWM_OS_saveData_history(&data,&history_fat_,sizeof(int),CYWEE_SAVE_DATA_FAT); + CWM_OS_saveData_history(&data,&history_fat_,sizeof(uint16_t),CYWEE_SAVE_DATA_FAT); } void cywee_goal_history_save(void) @@ -214,14 +214,18 @@ void cywee_reset_daily_data(void) memset(&scl, 0, sizeof(scl)); CWM_SettingControl(SCL_RESET_DAILY_INFO, &scl); history_step = 0; + history_calories=0; //一小时前卡路里数据 + history_distances=0; //历史数据 + history_fat=0; //历史数据 } //INT[1] : 0 立即输出，但不中止睡眠。 1 立即输出且中止睡眠 void cywee_get_sleep_data(void) { + CWM_OS_dbgPrintf("cywee_get_sleep_data\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; - scl.iData[1] = 0; + scl.iData[1] = 1; CWM_SettingControl(SCL_REQ_SLEEPING_DATA, &scl); } @@ -1060,7 +1064,7 @@ int cywee_main_dml(void) cywee_activity_mode_change(SPORT_ACTIVE_MODE_NORMAL); - cywee_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY_AND_NAP); + cywee_inactivity_mode_change(INACTIVITY_MODE_NAP); //cywee_inactivity_mode_change(INACTIVITY_MODE_SLEEPING); -- 2.17.1