From 49d2f2a8f594381a62ea74490583462cd533ceee Mon Sep 17 00:00:00 2001
From: wujifei <wujifei@zhidaoauto.com>
Date: Wed, 7 Apr 2021 20:05:38 +0800
Subject: [PATCH] =?UTF-8?q?new#=E4=BC=98=E5=8C=96Vr=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E6=95=85=E9=9A=9C=E6=B1=82=E5=8A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/help/V2XCarForHelpScenario.java        | 12 ++++++------
 .../scenario/scene/help/V2XCarForHelpWindow.java | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
index e1f35a4d4c..09fa98f8ee 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
@@ -67,7 +67,7 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
             } else {
                 closeWindow();
             }
-           // return;
+            return;
         }
         if (isShow) {
             showButton();
@@ -98,8 +98,8 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
     public void showWindow() {
         if (getV2XWindow() != null) {
             ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
-                            ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_140));
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    (int) V2XUtils.getApp().getResources().getDimension(R.dimen.dp_140));
             V2XServiceManager.getMogoTopViewManager().addView(getV2XWindow().getView(), layoutParams);
             getV2XWindow().show(getV2XMessageEntity().getContent());
         }
@@ -107,9 +107,9 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
 
     @Override
     public void closeWindow() {
-        if (getV2XWindow() != null) {
-            getV2XWindow().close();
-        }
+//        if (getV2XWindow() != null) {
+//            getV2XWindow().close();
+//        }
     }
 
     private V2XVoiceCallbackListener cancelCb = null;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpWindow.java
index 84b1c8081d..00ecfd0077 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpWindow.java
@@ -75,10 +75,8 @@ public class V2XCarForHelpWindow extends V2XBasWindow implements IV2XWindow<Bool
             V2XServiceManager.getV2XRefreshModel().cancelHelpSignal(new V2XRefreshCallback<BaseData>() {
                 @Override
                 public void onSuccess(BaseData result) {
-                    AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消", null);
                     //移除窗体
                     V2XServiceManager.getMogoTopViewManager().removeView(V2XCarForHelpWindow.this);
-                    V2XVoiceManager.INSTANCE.unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CANCEL_HELP);
                 }
 
                 @Override
@@ -86,6 +84,20 @@ public class V2XCarForHelpWindow extends V2XBasWindow implements IV2XWindow<Bool
                     Toast.makeText(V2XServiceManager.getContext(), msg, Toast.LENGTH_SHORT).show();
                 }
             });
+
+        }
+        AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消", null);
+        //移除窗体
+        V2XServiceManager.getMogoTopViewManager().removeView(V2XCarForHelpWindow.this);
+        V2XVoiceManager.INSTANCE.unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CANCEL_HELP);
+
+        if (V2XServiceManager.getMoGoV2XStatusManager().isOtherSeekHelpPOIShow()) {
+            // 移除线
+            V2XServiceManager.getMoGoV2XPolylineManager().clearLine();
+            // 移除事件POI
+            V2XServiceManager.getMoGoV2XMarkerManager().clearSpecialCarPOI();
+            // 绘制上次的数据
+            V2XServiceManager.getMoGoV2XMarkerManager().drawableLastAllPOI();
         }
 
     }