闹钟添加切换睡眠与小睡模式

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 0b2fd5c..2e67d8c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -17,6 +17,8 @@
 #include "graphic_service.h"\r
 \r
 #include "AlarmClockTimerConfig.h"\r
+#include "cywee_service.h"\r
+#include "ConfigModelC.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
@@ -128,6 +130,14 @@ void AlarmScan(void *arg)
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "time: %d : %d",curTime.tm_hour,curTime.tm_min);\r
         on_time_CallBackProc();\r
+        if(curTime.tm_hour == get_sleep_time_from_config_model())\r
+        {\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE,NULL);\r
+        }\r
+        else if(curTime.tm_hour == get_wake_up_time_from_config_model())\r
+        {\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE,NULL);\r
+        }\r
     }\r
 }\r
 \r

diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModelC.h b/code/sdk/drivers/peripheral/config/include/ConfigModelC.h
index 8a5a2ef..ad22bc2 100644 (file)
--- a/code/sdk/drivers/peripheral/config/include/ConfigModelC.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModelC.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-17 09:32:03
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-06-21 20:17:12
+ * @LastEditTime: 2024-06-28 18:27:45
  * @FilePath: /FD230/code/sdk/drivers/peripheral/config/include/ConfigModelC.h
  */
 #ifndef _CONFIG_MODEL_C_H_
@@ -95,6 +95,9 @@ uint8_t cm_get_vibmod(void);
 //cywee 获取用户信息
 void get_user_info_from_config_model(int user_info[5]);
 
+int get_sleep_time_from_config_model(void);
+int get_wake_up_time_from_config_model(void);
+
 #ifdef __cplusplus
 #if __cplusplus
 }

diff --git a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp
index ba11493..7caecfb 100644 (file)
--- a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp
+++ b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp
@@ -1445,6 +1445,18 @@ void get_user_info_from_config_model(int user_info[5])
     user_info[3] = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_CUSTOM_DATA_HEIGHT);
     user_info[4] = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_CUSTOM_DATA_WEARING_MODE);
 }
+int get_sleep_time_from_config_model(void)
+{
+    int sleep_time = 0;
+    sleep_time = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_BEDTIME);
+    return sleep_time;
+}
+int get_wake_up_time_from_config_model(void)
+{
+    int wake_up_time = 0;
+    wake_up_time = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_GET_UP);
+    return wake_up_time;
+}
 #ifdef __cplusplus
 #if __cplusplus
 }

diff --git a/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h b/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
index b6c303e..121a973 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
+++ b/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com
  * @Date: 2024-03-26 20:29:58
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-06-22 15:03:56
+ * @LastEditTime: 2024-06-28 18:00:01
  * @FilePath: /FD230/code/sdk/drivers/peripheral/cywee/Inc/cywee_service.h
  * @Description: 
  * 
@@ -61,7 +61,8 @@ extern "C" {
 #define CYWEE_SERVICE_CMD_HRS_WEARSTATUS_CHANGE 0x21
 
 #define CYWEE_SERVICE_CMD_SEDENTARY_MODE 0x22
-#define CYWEE_SERVICE_CMD_NAP_MODE 0x23
+#define CYWEE_SERVICE_CMD_NAP_MODE 0x32
+#define CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE 0x23
 #define CYWEE_SERVICE_CMD_SLEEPING_MODE 0x24
 
 #define CYWEE_SERVICE_CMD_OPEN_HAND_UPDOWN 0x25

diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
index 0c117f8..0d8b927 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
+++ b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c
@@ -341,8 +341,11 @@ static void cywee_service_check_task(void const *arg)
 
             case CYWEE_SERVICE_CMD_NAP_MODE:
                 cywee_inactivity_mode_change(INACTIVITY_MODE_NAP);
+                
+            case CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE:
+                cywee_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY_AND_NAP);
             break;
-
+            
             case CYWEE_SERVICE_CMD_SLEEPING_MODE:
                 cywee_inactivity_mode_change(INACTIVITY_MODE_SLEEPING);
             break;