1.解决app设置睡眠不生效问题。

2.解决app设置喝水提醒不生效问题。
3.解决开机设置屏幕亮度后，重启后亮度没有设置成功问题

diff --git a/code/sdk/zhihui/config/src/ConfigModel.cpp b/code/sdk/zhihui/config/src/ConfigModel.cpp
index c8e1706..3152659 100644 (file)
--- a/code/sdk/zhihui/config/src/ConfigModel.cpp
+++ b/code/sdk/zhihui/config/src/ConfigModel.cpp
@@ -1369,11 +1369,9 @@ void cm_sync_all_config_to_disk(void)
 
 void cm_initScreenBrightness(void)
 {
-   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cm_initScreenBrightness");
-   int brightness = OHOS::ConfigModel::GetInstance()->GetBrightness();
-   #ifdef BOARD_LEINIAO
-   OHOS::ConfigModel::GetInstance()->SetBrightness(5);
-   #endif
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cm_initScreenBrightness");
+    int brightness = OHOS::ConfigModel::GetInstance()->GetBrightness();
+    uapi_setScreenBrightness(brightness);
 }
 
 int cm_getScreenBrightness(void)

diff --git a/code/sdk/zhihui/services/ble_service/blemoder/ble_congfig_adapt.cpp b/code/sdk/zhihui/services/ble_service/blemoder/ble_congfig_adapt.cpp
index e87b091..44951cd 100644 (file)
--- a/code/sdk/zhihui/services/ble_service/blemoder/ble_congfig_adapt.cpp
+++ b/code/sdk/zhihui/services/ble_service/blemoder/ble_congfig_adapt.cpp
@@ -15,6 +15,9 @@
 #include "cywee_service.h"
 #endif
 
+#include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h"
+#include "sleep/include/SleepModel.h"
+
 void set_ota_upgrade_(void)
 {
    OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
@@ -87,27 +90,26 @@ void get_sedent_param_(msg_sedent_set_param_info_t * data)
 void ble_set_sleep_remind_(msg_get_sleep_param_info_t data)
 {
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
-      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开关：%d\r\n",data.schedule);
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开关：%d\r\n",data.schedule);
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP,data.schedule);
     //if(data.schedule)
     {
-          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间：%d\r\n",data.bedtime_hour);
-          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间：%d\r\n",data.bedtime_min);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间：%d\r\n",data.bedtime_hour);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"开始时间：%d\r\n",data.bedtime_min);
         p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_BEDTIME,data.bedtime_hour<<16|data.bedtime_min);
-       
-          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间：%d\r\n",data.waketime_hour);
-          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间：%d\r\n",data.waketime_min);
+        
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间：%d\r\n",data.waketime_hour);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"结束时间：%d\r\n",data.waketime_min);
         p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_GET_UP,data.waketime_hour<<16|data.waketime_min);
 
-          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"睡前提醒 %d\r\n",data.bedtime_alarm);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"睡前提醒 %d\r\n",data.bedtime_alarm);
         p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SLEEP_REMIND,data.bedtime_alarm);
-    #ifdef SUPPORT_SLEEP_MODEL
+    
         //更新睡眠配置
         OHOS::SleepModel::GetInstance().set_sleep_goal();
         set_sleep_and_wake_time();
         //OHOS::clean_sleep_file();  //重设睡眠时间段 删除历史文件
         get_sleep_time_notify();
-    #endif
     }  
     return;
 }
@@ -159,7 +161,7 @@ void ble_set_drink_remind_(msg_drink_info_t data)
             p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_DRINK_FREQ,data.freq);
         }
     }
-    // set_drinkreminder_data();/*更新喝水提醒时间*/
+    set_drinkreminder_data();/*更新喝水提醒时间*/
     return;
 }
 

diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
index 1f042cf..c6eff05 100644 (file)
--- a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
@@ -4530,7 +4530,7 @@ void type2AE4Data(ble_read_data *buffer_handle,uint8_t *buf_cmd,uint8_t *data,ui
         case SET_DRINK_PARAM_CMD://app下发的喝水提醒设置
             SetDrinkSetParamCmd(typeID,data,datalen,totalData,crcvalue);
             break;
-        case SET_SLEEP_PARAM_CMD://appä¸\8bå\8f\91ç\9a\84å\96\9dæ°´æ\8f\90é\86\92设置
+        case SET_SLEEP_PARAM_CMD://appä¸\8bå\8f\91ç\9d¡ç\9c 设置
             SetsleepSetParamCmd(typeID,data,datalen,totalData,crcvalue);
             break;
         case SET_STEP_TARGET_CMD://app下发的步数目标设置