From: penglei <1624952103@qq.com>
Date: Sat, 14 Sep 2024 07:05:25 +0000 (+0800)
Subject: 优化创建睡眠文件夹（补交）
X-Git-Tag: release_V1.2.70_20241020_135402~477
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=163215faf7d2ac7ad3c5f58957728dc30d0027ef;p=mirrors%2FFD230.git

优化创建睡眠文件夹（补交）
---

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 93a7955ba..37af6ea22 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-09-14 13:04:48
+ * @LastEditTime: 2024-09-14 15:04:10
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h
  * @Description:
  *
@@ -77,7 +77,7 @@ namespace OHOS
     bool read_sleep_data(SLEEP_T *data);
     void clean_sleep_data(void);
     bool create_sleep_folder(void);
-    void clean_sleep_file(void);
+    //void clean_sleep_file(void);
     // 睡眠状态
     enum class SLEEPSTATE
     {
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 59041a56c..11df8ec5f 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: SLEPPNOTIFY24-06-26 19:36:48
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-09-14 14:26:11
+ * @LastEditTime: 2024-09-14 14:59:37
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
  * @Description:
  *
@@ -168,17 +168,17 @@ namespace OHOS
         fall_asleep_timestamp = 0;
     }
 
-    void clean_sleep_file(void)
-    {
-        uint32_t sleep_time = get_sleep_time_from_config_model();
-        uint32_t wake_up_time = get_wake_up_time_from_config_model();
-        uint32_t sleep_min = ((sleep_time & 0xFFFF0000) >> 16) * 60 + sleep_time & 0x0000FFFF;
-        uint32_t wake_min = ((wake_up_time & 0xFFFF0000) >> 16) * 60 + wake_up_time & 0x0000FFFF;
-        if(sleep_min < wake_min)
-        {
-            uapi_delete_files(dir_path);
-        }
-    }
+    // void clean_sleep_file(void)
+    // {
+    //     uint32_t sleep_time = get_sleep_time_from_config_model();
+    //     uint32_t wake_up_time = get_wake_up_time_from_config_model();
+    //     uint32_t sleep_min = ((sleep_time & 0xFFFF0000) >> 16) * 60 + sleep_time & 0x0000FFFF;
+    //     uint32_t wake_min = ((wake_up_time & 0xFFFF0000) >> 16) * 60 + wake_up_time & 0x0000FFFF;
+    //     if(sleep_min < wake_min)
+    //     {
+    //         uapi_delete_files(dir_path);
+    //     }
+    // }
 
     bool create_sleep_folder(void)
     {
@@ -204,7 +204,7 @@ namespace OHOS
             
             if(current_min >= sleep_min && current_min < 24 * 60)
                 uapi_get_YYMMDD_Time_extend(day, '\0' , -1);
-            else if(current_min >= 24 * 60 && current_min < wake_min)
+            else if(current_min >= 0 && current_min < wake_min)
                 uapi_get_YYMMDD_Time_extend(day, '\0' , 0);
         }
         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 c7a7452bf..d62fd87ec 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -1215,7 +1215,7 @@ void ble_set_sleep_remind(msg_get_sleep_param_info_t data)
         //更新睡眠配置
         OHOS::SleepModel::GetInstance().set_sleep_goal();
         set_sleep_and_wake_time();
-        OHOS::clean_sleep_file();  //重设睡眠时间段 删除历史文件
+        //OHOS::clean_sleep_file();  //重设睡眠时间段 删除历史文件
         get_sleep_time_notify();
     }  
     return;