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

---
 .../scene/livecar/V2XPushLiveCarWindow.java   | 36 +++++++++----------
 .../livecar/V2XVoiceCallLiveCarWindow.java    | 24 +++++++------
 2 files changed, 32 insertions(+), 28 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 f9ec08b008..ad3810f2ee 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
@@ -112,16 +112,7 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow<V2X
             handlerV2XEvent.removeCallbacks(runnableV2XEvent);
             runnableV2XEvent = null;
         }
-        //移除窗体
-        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
-            V2XServiceManager
-                    .getMogoTopViewManager()
-                    .removeViewNoLinkage(this);
-        }else{
-            V2XServiceManager
-                    .getMogoTopViewManager()
-                    .removeView(this);
-        }
+        remove();
     }
 
     @Override
@@ -140,14 +131,9 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow<V2X
     public void countDownV2XEvent(V2XPushMessageEntity v2XPushMessageEntity) {
         // 倒计时
         if (runnableV2XEvent == null) {
-            runnableV2XEvent = () -> {
-                //Logger.d(MODULE_NAME, "V2X=== Window 30秒倒计时结束。。。");
-                //移出Window详细信息
-                //移除窗体
-                V2XServiceManager
-                        .getMogoTopViewManager()
-                        .removeViewNoLinkage(this);
-            };
+            //Logger.d(MODULE_NAME, "V2X=== Window 30秒倒计时结束。。。");
+            //移出Window详细信息
+            runnableV2XEvent = this::close;
         } else {
             handlerV2XEvent.removeCallbacks(runnableV2XEvent);
         }
@@ -155,4 +141,18 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow<V2X
         //Logger.d(MODULE_NAME, "V2X=== Window 展示开始倒计时：" + expireTime);
         handlerV2XEvent.postDelayed(runnableV2XEvent, expireTime);
     }
+
+    //移除窗体
+    private void remove(){
+        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeViewNoLinkage(this);
+        }else{
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeView(this);
+        }
+    }
+
 }
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 20d97ee958..1db6ae4d66 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
@@ -88,16 +88,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow
     public void close() {
         // 停止倒计时
         stopCountDown();
-        //移除窗体
-        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
-            V2XServiceManager
-                    .getMogoTopViewManager()
-                    .removeViewNoLinkage(this);
-        }else{
-            V2XServiceManager
-                    .getMogoTopViewManager()
-                    .removeView(this);
-        }
+        remove();
     }
 
     @Override
@@ -142,4 +133,17 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow
             EXPIRE_TIMER = ALL_EXPIRE_TIMER;
         }
     }
+
+    //移除窗体
+    private void remove(){
+        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeViewNoLinkage(this);
+        }else{
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .removeView(this);
+        }
+    }
 }