From d41be00fa347a5b6acb5322884cf32550f09839a Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 15 Apr 2021 15:13:15 +0800
Subject: [PATCH] fix bug

---
 .../scenario/scene/livecar/V2XPushLiveCarWindow.java | 12 +++++++++---
 .../scene/livecar/V2XVoiceCallLiveCarWindow.java     | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
index 9549efdb15..f9ec08b008 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
@@ -113,9 +113,15 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow<V2X
             runnableV2XEvent = null;
         }
         //移除窗体
-        V2XServiceManager
-                .getMogoTopViewManager()
-                .removeView(this);
+        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeViewNoLinkage(this);
+        }else{
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeView(this);
+        }
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java
index e5021f98d1..20d97ee958 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java
@@ -89,9 +89,15 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow
         // 停止倒计时
         stopCountDown();
         //移除窗体
-        V2XServiceManager
-                .getMogoTopViewManager()
-                .removeView(this);
+        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeViewNoLinkage(this);
+        }else{
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeView(this);
+        }
     }
 
     @Override