Merge #30 into xts_origin from refs/changes/30/head

Code review from 袁清梦

* refs/changes/30/head: (2 commits squashed)

  - 优化训练back逻辑

  - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/30

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp
index cb70db1..d191695 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp
@@ -90,7 +90,8 @@ namespace OHOS
         }
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnClick viewid = %d", viewId);
         if (viewId < VIEW_MAX_INTER_APP) {
-            NativeAbility::GetInstance().ChangeSlice(viewId);
+            //更改功能列表进入函数
+            NativeAbility::GetInstance().EnterSlice(viewId);
             return true;
         } else if (viewId == VIEW_EXTERN_APP) {
 #ifdef JS_ENABLE

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
index f88b473..7400fce 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
@@ -532,6 +532,7 @@ namespace OHOS
         uint8_t value = 0;
         value = battery_get_voltage(&voltage);
         PRINT("Read ALLData!\n");
+        
         // 更新界面显示
         showTimeLabel->SetText(timeStr);
         showWeekLabel->SetText(weekStr);
@@ -550,7 +551,7 @@ namespace OHOS
             if (value <= (i + 1) * 10)
             {
                 progressImageSrc = progressImages[i];
-                PRINT("Update progressImageSrc!\n");
+                PRINT("Update progressImageSrc [%d]!\r\n", i);
                 break;
             }
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h
index 8033849..d2e6356 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-04-17 14:18:05
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalPresenter.h
+ */
 
 #ifndef _TraingNomal_PRESENTER_H
 #define _TraingNomal_PRESENTER_H
@@ -28,7 +34,7 @@ namespace OHOS
         // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承;
         bool OnClick(UIView &view, const ClickEvent &event) override;
         bool OnDrag(UIView &view, const DragEvent &event) override;
-        bool OnDragEnd(UIView& view, const DragEvent& event) override;
+        // bool OnDragEnd(UIView& view, const DragEvent& event) override;
     };
 } // namespace OHOS
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
index 8a3a93a..a247865 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
@@ -1,7 +1,7 @@
 /*** 
  * @Date: 2024-04-15 14:19:47
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-04-16 10:29:09
+ * @LastEditTime: 2024-04-17 14:59:43
  * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -67,7 +67,7 @@ namespace OHOS
     {
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAINING);
         }
         UNUSED(view);
         return true;
@@ -78,7 +78,7 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调
         if (strcmp(view.GetViewId(), BUTTONBACK) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING);
+            NativeAbility::GetInstance().Back();
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
index c25f5d4..fec4fbc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -61,12 +61,21 @@ namespace OHOS
     }\r
     bool TraingNomalPresenter::OnDrag(UIView &view, const DragEvent &event)\r
     {\r
+        if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
+        {\r
+            PRINT("TraingNomalPresenter OnDrag!\r\rn");\r
+            NativeAbility::GetInstance().Back(); // 返回函数\r
+        }\r
+        UNUSED(view);\r
         return true;\r
     }\r
+#if 0\r
     bool TraingNomalPresenter::OnDragEnd(UIView &view, const DragEvent &event)\r
     {\r
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
         {\r
+            //NativeAbility::GetInstance().Back(); // 返回函数\r
+\r
             uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Id:[%d]", preSlice);\r
             if (preSlice == VIEW_MAIN)\r
@@ -88,23 +97,23 @@ namespace OHOS
         UNUSED(view);\r
         return true;\r
     }\r
+#endif\r
 \r
     bool TraingNomalPresenter::OnClick(UIView &view, const ClickEvent &event)\r
     {\r
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), BUTTONSET) == 0)\r
         {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSET);\r
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGSET);\r
         }\r
         if (strcmp(view.GetViewId(), BUTTONGO) == 0)\r
         {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGCRAD);\r
             // 获取运动类型\r
             ExerciseClass type = TraingModel::GetInstance()->GetSportType();\r
             // 开启对应的运动\r
             TraingCardPresenter::GetInstance()->OpenSensor(type);\r
         }\r
-\r
         return true;\r
     }\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
index 8f92318..8040a22 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
@@ -66,7 +66,7 @@ namespace OHOS
         UNUSED(view);
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
+            NativeAbility::GetInstance().Back();
         }
         return true;
     }
@@ -75,22 +75,22 @@ namespace OHOS
     {
         if (strcmp(view.GetViewId(), BUTTON1) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL);
             TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING);
         }
         if (strcmp(view.GetViewId(), BUTTON2) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL);
             TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING);
         }
         if (strcmp(view.GetViewId(), BUTTON3) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL);
             TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING);
         }
         if (strcmp(view.GetViewId(), BUTTONMORE) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGMORE);
         }
 
         return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp
index b1731ea..01ed4e6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp
@@ -74,8 +74,7 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), BUTTONOK) == 0)\r
         {\r
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-            NativeAbility::GetInstance().ChangeSlice(preSlice);\r
+              NativeAbility::GetInstance().Back(); // 返回函数\r
         }\r
         return true;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp
index 02e391a..665ca44 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-04-17 11:59:10
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp
+ */
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
 #include"language/font/ui_resource_string.h"
@@ -74,8 +80,7 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调
         if (strcmp(view.GetViewId(), BUTTONOK) == 0)
         {
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGGPSSET);
+            NativeAbility::GetInstance().Back();
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
index a4214dc..1a4d76c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
@@ -1,4 +1,4 @@
-/*** \r
+/***\r
  * @Date: 2024-04-15 10:55:58\r
  * @LastEditors: Caisking 3449750381@qq.com\r
  * @LastEditTime: 2024-04-16 10:29:50\r
@@ -73,8 +73,7 @@ namespace OHOS
 \r
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
         {\r
-            // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);\r
+            NativeAbility::GetInstance().Back();\r
         }\r
         UNUSED(view);\r
         return true;\r
@@ -85,11 +84,11 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), BUTTONTIME) == 0)\r
         {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSETTIME);\r
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGSETTIME);\r
         }\r
         if (strcmp(view.GetViewId(), BUTTONCALULI) == 0)\r
         {\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGSETCALULI);\r
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGSETCALULI);\r
         }\r
         return true;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp
index 20d0976..84d7cfc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp
@@ -74,8 +74,7 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调
         if (strcmp(view.GetViewId(), BUTTONOK) == 0)
         {
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGGPSSET);
+             NativeAbility::GetInstance().Back();
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp
index 36f58ef..73c2261 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp
@@ -1,3 +1,9 @@
+/*** \r
+ * @Date: 2024-04-15 10:55:58\r
+ * @LastEditors: Caisking 3449750381@qq.com\r
+ * @LastEditTime: 2024-04-17 11:58:48\r
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp\r
+ */\r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
 #include"language/font/ui_resource_string.h"\r
@@ -74,8 +80,7 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), BUTTONOK) == 0)\r
         {\r
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
-            NativeAbility::GetInstance().ChangeSlice(preSlice);\r
+            NativeAbility::GetInstance().Back();\r
         }\r
         if (strcmp(view.GetViewId(), "Remind") == 0)\r
         {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp
index c71226b..4bf9d63 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-04-17 14:22:58
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp
+ */
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
@@ -75,7 +81,7 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调
         if (strcmp(view.GetViewId(), BUTTONOK) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGENDDATA);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGENDDATA);
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 4423c08..84fe198 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -253,11 +253,11 @@ namespace OHOS
             if (TraingCardView::GetInstance()->RefreshEndView())\r
             {\r
                 //进行存储操作？\r
-                NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGWIN);\r
+                NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGWIN);\r
             }\r
             else\r
             {\r
-                NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);\r
+                NativeAbility::GetInstance().Back();\r
             }\r
         }\r
         // 返回按键\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
index bec5092..c4334e3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
@@ -33,22 +33,26 @@ namespace OHOS
         }
         if (strcmp(view.GetViewId(), BUTTON1) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL);
+            // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
             TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING);
         }
         if (strcmp(view.GetViewId(), BUTTON2) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL);
+            // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
             TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING);
         }
         if (strcmp(view.GetViewId(), BUTTON3) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGNOMAL);
+            //  NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
             TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING);
         }
         if (strcmp(view.GetViewId(), BUTTONMORE) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
+            NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGMORE);
+            //  NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
         }
         // 标记进入界面是主界面
         // TraingModel::GetInstance()->SetInterface(VIEW_MAIN);

diff --git a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
index 5da2763..0b0d62e 100755 (executable)
--- a/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
+++ b/code/sdk/application/wearable/nativeabilityfwk/include/Ability.h
@@ -28,7 +28,7 @@
 #include "stack"
 #include <AppViewIDs.h>
 namespace OHOS {
-const static uint16_t gSliceInvalid = 0;
+const static uint16_t gSliceInvalid = 0;         
 const static uint16_t gSliceDefaultPriority = 4;  // 页面默认是最低优先级
 const static uint16_t gMaxHistorySlices = 10;  // 默认最多保存三个历史记录
 
@@ -81,8 +81,13 @@ public:
     }
 
     // 处理后退操作
-    bool Back(const uint16_t transitionId = TRANSITION_INVALID,
-        const uint16_t priority = gSliceDefaultPriority) {
+     bool Back(const uint16_t transitionId = TRANSITION_INVALID,
+        const uint16_t priority = gSliceDefaultPriority) { 
+        /*
+        if (backStack_.empty()) {
+        backStack_.push(defaultSliceId_); // 将默认主界面的 ID 推入栈中
+        }
+        */
         if (!backStack_.empty()) {
             uint16_t preSlice = backStack_.top();
             backStack_.pop();