优化目标设置界面交互

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
index 8375af4..8afcd2d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
@@ -63,6 +63,14 @@ namespace OHOS
         bool ChangeSetDurationView(int16_t thisview);
         bool ClickFunc(int16_t interface);
         void ChangeView(int16_t hideView, int16_t showView);
+        void SetCurrentViewId(int viewId)
+        {
+            CurrentViewId = viewId;
+        }
+        int GetCurrentViewId()
+        {
+            return CurrentViewId;
+        }
 
     private:
         UIView::OnDragListener *draglistener{nullptr};
@@ -99,6 +107,7 @@ namespace OHOS
         UIButton *butSteps = nullptr;
 
         bool viewiInitStatus{false};
+        int CurrentViewId;
     };
 } // namespace OHOS
 #endif // TraingSet_PRESENTER_H

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 0de53bd..ecdefd0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
@@ -70,10 +70,18 @@ namespace OHOS
 \r
     bool TraingSetPresenter::OnDragEnd(UIView &view, const DragEvent &event)\r
     {\r
-\r
+        int CardID = TraingSetView::GetInstance()->GetCurrentViewId();\r
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)\r
         {\r
-            NativeAbility::GetInstance().Back();\r
+            // 不在设置页面\r
+            if (CardID != SET_VIEW)\r
+            {\r
+                TraingSetView::GetInstance()->ChangeView(CardID, SET_VIEW);\r
+            }\r
+            else\r
+            {\r
+                NativeAbility::GetInstance().Back();\r
+            }\r
         }\r
         UNUSED(view);\r
         return true;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
index 7894824..515fadb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
@@ -333,6 +333,7 @@ namespace OHOS
         SetTagScrollView[hideView]->SetVisible(false);\r
         ClickFunc(showView);\r
         SetTagScrollView[showView]->SetVisible(true);\r
+        SetCurrentViewId(showView); // 切换页面更换成目标ID\r
         Draw();\r
     }\r
     /* -------------------------------------------------------------------------- */\r
@@ -369,6 +370,7 @@ namespace OHOS
 \r
         PreLoad();\r
         RootView::GetInstance()->Add(SetTagScrollView[SET_VIEW]);\r
+        SetCurrentViewId(SET_VIEW); // 设置当前页面ID\r
     }\r
 \r
     void TraingSetView::OnSetUpView()\r