呼吸训练优化

diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/include/RespiratoryTrainingView.h b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/include/RespiratoryTrainingView.h
index 51c7517..b07fd33 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/include/RespiratoryTrainingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/include/RespiratoryTrainingView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-08 09:36:01
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-12 10:37:30
+ * @LastEditTime: 2024-06-13 09:22:22
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/include/RespiratoryTrainingView.h
  */
 
@@ -99,9 +99,9 @@ namespace OHOS
         UIImageAnimatorView *RespiratoryTrainingAnimatorView{nullptr}; // 呼吸训练动画
         const char **RespiratoryTrainingArray{nullptr};
 #endif
-        void InitRespiratoryTrainingElements();
-        void InitRespiratoryTrainingCallBackAndAnimator();
-        void InitRespiratoryTrainingScrollView();
+        bool InitRespiratoryTrainingElements();
+        bool InitRespiratoryTrainingCallBackAndAnimator();
+        bool InitRespiratoryTrainingScrollView();
         UIScrollView *RespiratoryTrainingScrollView[MAX_RESPIRATORYTRAININGID]{nullptr};
         RespiratoryTrainingCompletedView *p_RespiratoryTrainingCompletedView{nullptr};
         RespiratoryTrainingCallback *RespiratoryTrainingCallBack_ = nullptr;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
index a34ef22..3f7a1ec 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-05-07 11:25:58
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-12 11:09:19
+ * @LastEditTime: 2024-06-13 09:34:12
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/RespiratoryTraining/src/RespiratoryTrainingView.cpp
  */
 
@@ -75,7 +75,6 @@ namespace OHOS
         {RESPIRATORYTRAININGCOMPLETED, &RespiratoryTrainingView::ChangeRespiratoryTrainingCompletedView},
     };
 
-    // 3.根据传入的interface参数执行相应视图ID关联的成员函数。
     bool RespiratoryTrainingView::ClickFunc(int16_t interface)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::ClickFunc");
@@ -390,8 +389,7 @@ namespace OHOS
         return true;
     }
 
-    // 初始化呼吸训练元素
-    void RespiratoryTrainingView::InitRespiratoryTrainingElements()
+    bool RespiratoryTrainingView::InitRespiratoryTrainingElements()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::InitRespiratoryTrainingElements");
         // 加载呼吸训练图片
@@ -399,7 +397,7 @@ namespace OHOS
         if (imgInfo == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Load image failed!");
-            return;
+            return false;
         }
 
         // 创建并设置呼吸训练图片
@@ -407,7 +405,7 @@ namespace OHOS
         if (RespiratoryTrainingImg_ == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingImg_ new failed!");
-            return;
+            return false;
         }
         RespiratoryTrainingImg_->SetSrc(imgInfo);
         RespiratoryTrainingImg_->SetPosition(113, 70, 240, 240);
@@ -423,7 +421,7 @@ namespace OHOS
         if (RespiratoryTrainingStart_ == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingStart_ new failed!");
-            return;
+            return false;
         }
         RespiratoryTrainingStart_->SetPosition(158, 320, 150, 75);
         RespiratoryTrainingStart_->SetText("Start");
@@ -436,7 +434,7 @@ namespace OHOS
         if (RespiratoryTrainingStartNote_ == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingStartNote_ new failed!");
-            return;
+            return false;
         }
         RespiratoryTrainingStartNote_->SetPosition(53, 320, 360, 70);
         RespiratoryTrainingStartNote_->SetStyle(STYLE_TEXT_FONT, 30);
@@ -447,17 +445,18 @@ namespace OHOS
         RespiratoryTrainingStartNote_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         RespiratoryTrainingStartNote_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         RespiratoryTrainingScrollView[RESPIRATORYTRAINING]->Add(RespiratoryTrainingStartNote_);
+        return true;
 #endif
     }
 
-    void RespiratoryTrainingView::InitRespiratoryTrainingCallBackAndAnimator()
+    bool RespiratoryTrainingView::InitRespiratoryTrainingCallBackAndAnimator()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::InitRespiratoryTrainingCallBackAndAnimator");
         RespiratoryTrainingCallBack_ = new RespiratoryTrainingCallback(RespiratoryTrainingImg_);
         if (RespiratoryTrainingCallBack_ == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "callBack new fail");
-            return;
+            return false;
         }
 
         RespiratoryTrainingAnimator_ = new Animator(RespiratoryTrainingCallBack_, RespiratoryTrainingImg_, 0, true);
@@ -466,20 +465,22 @@ namespace OHOS
             delete RespiratoryTrainingCallBack_;
             RespiratoryTrainingCallBack_ = nullptr;
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Animator new fail");
-            return;
+            return false;
         }
 
         animateStart_ = false;
+
+        return true;
     }
 
-    void RespiratoryTrainingView::InitRespiratoryTrainingScrollView()
+    bool RespiratoryTrainingView::InitRespiratoryTrainingScrollView()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingCompletedView::CreateRespiratoryTrainingCompletedScrollView");
         RespiratoryTrainingScrollView[RESPIRATORYTRAINING] = new UIScrollView();
         if (RespiratoryTrainingScrollView[RESPIRATORYTRAINING] == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::ScrollView new fail!");
-            return;
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScrollView new fail!");
+            return false;
         }
         RespiratoryTrainingScrollView[RESPIRATORYTRAINING]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
         RespiratoryTrainingScrollView[RESPIRATORYTRAINING]->SetScrollBlankSize(50);
@@ -488,14 +489,19 @@ namespace OHOS
         RespiratoryTrainingScrollView[RESPIRATORYTRAINING]->SetTouchable(true);
         RespiratoryTrainingScrollView[RESPIRATORYTRAINING]->SetDraggable(true);
         container_->Add(RespiratoryTrainingScrollView[RESPIRATORYTRAINING]);
+
+        return true;
     }
 
     void RespiratoryTrainingView::RespiratoryTrainingViewInit(void)
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::RespiratoryTrainingViewInit");
-        InitRespiratoryTrainingScrollView();
-        InitRespiratoryTrainingElements();
-        InitRespiratoryTrainingCallBackAndAnimator();
+        if (!InitRespiratoryTrainingScrollView() || !InitRespiratoryTrainingElements() ||
+            !InitRespiratoryTrainingCallBackAndAnimator())
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewInit fail!!");
+            return;
+        }
         RespiratoryTrainingModel::GetInstance().RT_StartTimer(ONE_SECOND);
     }