主界面：优化睡眠数据读取

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 6863261..d087ca1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h
@@ -90,6 +90,7 @@ namespace OHOS
         void update_time_info(uint32_t timestamp, std::string &timeStr);
         void update_sleep(SLEEP_T *data);
         void ReInitData(); // 重新刷新UI
+        void Msg_ReInitData();
 
         void set_sleep_goal();
         int get_sleep_hour();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModelC.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModelC.h
index 4020422..a6e6786 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModelC.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModelC.h
@@ -19,6 +19,7 @@ extern "C"
     void custom_save_nap_data(void);
     void custom_read_sleep_data(void);
     void custom_read_nap_data(void);
+    void custom_sleep_model_updata(void);
 #ifdef __cplusplus
 #if __cplusplus
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp
index 7e1cd8e..97ce35c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp
@@ -87,7 +87,7 @@ namespace OHOS
     }\r
     void SleepCardView::PreLoad(void)\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepCardView::PreLoad");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepCardView::PreLoad viewiInitStatus %d",viewiInitStatus);\r
         if (!viewiInitStatus)\r
         {\r
             InitView();\r

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 bb733a4..77b706f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
@@ -1,8 +1,8 @@
 /*
  * @Author: penglei 1624952103@qq.com
  * @Date: SLEPPNOTIFY24-06-26 19:36:48
- * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-10-12 20:32:23
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-10-14 09:58:35
  * @FilePath:
  * /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
  * @Description:
@@ -646,7 +646,7 @@ namespace OHOS
     // 初始化配置睡眠目标
     set_sleep_goal();
     // 刷新数据
-    ReInitData();
+    Msg_ReInitData();
   }
   SleepModel::~SleepModel() {}
   SleepModel &SleepModel::GetInstance()
@@ -654,7 +654,10 @@ namespace OHOS
     static SleepModel instance;
     return instance;
   }
-
+  void SleepModel::Msg_ReInitData() {
+      do_custom_fileoperate_service_check_msg(
+  CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPMODLE_UPDATE, nullptr, 0);
+    }
   void SleepModel::ReInitData()
   {
     // 配置睡眠数据
@@ -925,7 +928,8 @@ namespace OHOS
   // 清空睡眠数据
   bool SleepModel::DeleteSleepData()
   {
-    ReInitData(); // 刷新
+    // ReInitData(); // 刷新
+    do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPMODLE_UPDATE, nullptr, 0);
     return true;
   }
 
@@ -1179,6 +1183,11 @@ namespace OHOS
       read_nap_data(&nap_data);
     }
 
+    void custom_sleep_model_updata(void)
+    {
+      OHOS::SleepModel::GetInstance().ReInitData();
+    }
+
 #ifdef __cplusplus
 #if __cplusplus
   }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
index 7483468..d262904 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp
@@ -27,6 +27,7 @@ SleepTimeView::~SleepTimeView() {
 }
 
 void SleepTimeView::SleepDataRefresh() {
+  
   int sleep_hour = SleepModel::GetInstance().get_sleep_hour();
   int sleep_min = SleepModel::GetInstance().get_sleep_min();
   int sleep_goal = SleepModel::GetInstance().get_sleep_goal();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
index 2c09e1c..3407cdd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
@@ -32,7 +32,7 @@ namespace OHOS
         // 获取睡眠数据
         SleepModel &sleepModel = SleepModel::GetInstance();
         // 读取一次文件
-        sleepModel.ReInitData();
+        sleepModel.Msg_ReInitData();
 
         int sleep_hour = sleepModel.get_sleep_hour();
         int sleep_min = sleepModel.get_sleep_min();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
index d91ce22..212bc3a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
@@ -187,7 +187,6 @@ bool TrainingDataView::InitView(void *caller) {
   }
   SetDraggable(true);
   SetTouchable(true);
-  //   SleepDataRefresh();
   return true;
 }
 } // namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
index cc77a90..f078f69 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
@@ -134,7 +134,6 @@ bool TrainingDetailView::InitView(void *caller) {
   }
   SetDraggable(true);
   SetTouchable(true);
-  //   SleepDataRefresh();
   return true;
 }
 UILabelExt *TrainingDetailView::GetMileLabel() { return milelabel; }

diff --git a/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c b/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c
index 6727198..d4e0d39 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c
+++ b/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c
@@ -129,6 +129,9 @@ static void custom_fileoperate_service_check_task(void const *arg)
         case CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_READ:
             custom_read_nap_data();
             break;
+        case CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPMODLE_UPDATE:
+            custom_sleep_model_updata();
+            break;
         default:
             PRINT("Unknown CUSTOM_FILE_OPERATE_MSG cmd 0x%02X \r\n", mail.cmd);
             break;

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index 99a43ed..d426a82 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -241,7 +241,8 @@ errcode_t do_custom_cmd_service_check_msg(int cmd, void *params, int paramlen);
 #define CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_SAVE 0x06//小睡数据
 
 #define CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPDATA_READ 0x07 //读取睡眠时间
-#define CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_READ 0x08  //读取小睡数据
+#define CUSTOM_FILEOPERATE_MSG_TYPE_NAPDATA_READ 0x08   //读取小睡数据
+#define CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPMODLE_UPDATE 0x09//更新睡眠model数据
 
 errcode_t uapi_custom_fileoperate_service_init(void);
 errcode_t do_custom_fileoperate_service_check_msg(int cmd, void *params, int paramlen);