From: Caisking <3449750381@qq.com>
Date: Wed, 2 Oct 2024 08:30:29 +0000 (+0800)
Subject: 语言助手：增加subview的右滑退出
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f0f3f757fae8b3f3e3835b77c25a505df877cda1;p=mirrors%2FFD230.git

语言助手：增加subview的右滑退出
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantBleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantBleView.cpp
index 7deda1508..c9015843e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantBleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantBleView.cpp
@@ -225,6 +225,15 @@ UIScrollView *AssistantBleView::CreateAssistantBleView(void) {
   scrollView->SetThrowDrag(true);
   scrollView->SetMaxScrollDistance(1000);
   scrollView->SetDirection(UIScrollView::VERTICAL);
+  // 设置拖拽监听器
+  UIView::OnDragListener *dragListener =
+      static_cast<UIView::OnDragListener *>(AssistantPresenter::GetInstance());
+  if (!dragListener) {
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+                  "AssistantPresenter::获取实例失败！");
+    return nullptr; // 获取失败，返回空指针
+  }
+  scrollView->SetOnDragListener(dragListener);
 
   /* --------------------------------- 获取蓝牙名称*
    * --------------------------------- */
diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp
index ec8558a3a..0973f07fe 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp
@@ -225,6 +225,7 @@ UIScrollView *AssistantHfpView::CreateAssistantHfpView(void) {
   scrollView->SetViewId(ASSISTANT_HFP_BLE);
   scrollView->SetReboundSize(35);
   scrollView->SetDirection(UIScrollView::VERTICAL);
+  //设置页面点击监听器
   UIView::OnClickListener *buttonClick =
       static_cast<UIView::OnClickListener *>(AssistantPresenter::GetInstance());
   if (buttonClick == nullptr) {
@@ -232,6 +233,15 @@ UIScrollView *AssistantHfpView::CreateAssistantHfpView(void) {
     return nullptr;
   }
   scrollView->SetOnClickListener(buttonClick);
+  // 设置拖拽监听器
+  UIView::OnDragListener *dragListener =
+      static_cast<UIView::OnDragListener *>(AssistantPresenter::GetInstance());
+  if (!dragListener) {
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+                  "AssistantPresenter::获取实例失败！");
+    return nullptr; // 获取失败，返回空指针
+  }
+  scrollView->SetOnDragListener(dragListener);
 
   if (!CreateAssistantHfpViewLabel() || !CreateAssistantHfpViewImage() ||
       !CreateAssistantHfpViewButton()) {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp
index 00cc44151..7860d80e7 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantPresenter.cpp
@@ -53,11 +53,25 @@ bool AssistantPresenter::OnDrag(UIView &view, const DragEvent &event) {
     if (&view == p_AssistantView->GetAssistantScrollView(ASSISTANT_MAIN_VIEW)) {
       NativeAbility::GetInstance().Back();
     }
+    /*在其他界面返回主界面*/
     if (&view ==
         p_AssistantView->GetAssistantScrollView(ASSISTANT_ANSWER_VIEW)) {
       p_AssistantView->ChangeView(ASSISTANT_ANSWER_VIEW, ASSISTANT_MAIN_VIEW);
     }
-    /*在其他界面返回主界面*/
+    if (&view ==
+        p_AssistantView->GetAssistantScrollView(ASSISTANT_HFP_FAIL_VIEW)) {
+      p_AssistantView->ChangeView(ASSISTANT_HFP_FAIL_VIEW, ASSISTANT_MAIN_VIEW);
+    }
+    if (&view ==
+        p_AssistantView->GetAssistantScrollView(ASSISTANT_BLE_NOTE_VIEW)) {
+      p_AssistantView->ChangeView(ASSISTANT_BLE_NOTE_VIEW,
+                                  ASSISTANT_HFP_FAIL_VIEW);
+    }
+    if (&view ==
+        p_AssistantView->GetAssistantScrollView(ASSISTANT_START_FAILED_VIEW)) {
+      p_AssistantView->ChangeView(ASSISTANT_START_FAILED_VIEW,
+                                  ASSISTANT_MAIN_VIEW);
+    }
   }
   return true;
 }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantStartFailedView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantStartFailedView.cpp
index 0c57528c6..bf2b3ce55 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantStartFailedView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantStartFailedView.cpp
@@ -52,6 +52,16 @@ UIScrollView *AssistantStartFailedView::CreateAssistantStartFailedView(void) {
     scrollView->SetScrollBlankSize(50);
     scrollView->SetReboundSize(35);
     scrollView->SetDirection(UIScrollView::VERTICAL);
+    // 设置拖拽监听器
+    UIView::OnDragListener *dragListener =
+        static_cast<UIView::OnDragListener *>(
+            AssistantPresenter::GetInstance());
+    if (!dragListener) {
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+                    "AssistantPresenter::获取实例失败！");
+      return nullptr; // 获取失败，返回空指针
+    }
+    scrollView->SetOnDragListener(dragListener);
     /* ----------------------- ImageView ---------------------- */
     ImageView = new UIImageView();
     if (ImageView == nullptr) {