From ca5c6336ed3370802984343d1ba7c920632b74b6 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Sun, 28 Apr 2024 12:53:34 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presenter/BaseBusPassengerPresenter.java  | 80 +++++++++++++++----
 .../ui/BusPassengerBaseFragment.java          |  1 +
 .../passenger/ui/PM2DrivingInfoFragment.kt    |  5 +-
 .../ui/music/list/MusicListViewModel.kt       |  1 +
 .../ui/music/playing/MusicPlayingViewModel.kt |  1 +
 .../taxi/passenger/ui/video/InfoVideoView.kt  |  2 +
 .../och/taxi/passenger/ui/bar/RightBarView.kt |  8 +-
 .../ui/music/list/MusicListViewModel.kt       |  1 +
 .../taxi/passenger/ui/video/InfoVideoView.kt  |  2 +
 9 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
index e0b8add9a9..2983db0b0d 100644
--- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
+++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
@@ -81,20 +81,32 @@ public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragme
 
     @Override
     public void onAutopilotEnable() {
-        runOnUIThread(() -> mView.onAutopilotStatusChanged(
-                IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.onAutopilotStatusChanged(
+                        IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE);
+            }
+        });
     }
 
     @Override
     public void onAutopilotDisable() {
-        runOnUIThread(() -> mView.onAutopilotStatusChanged(
-                IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.onAutopilotStatusChanged(
+                        IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE);
+            }
+        });
     }
 
     @Override
     public void onAutopilotRunning() {
-        runOnUIThread(() -> mView.onAutopilotStatusChanged(
-                IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.onAutopilotStatusChanged(
+                        IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);
+            }
+        });
     }
 
     @Override
@@ -104,14 +116,20 @@ public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragme
 
     @Override
     public void onCarLocationChanged(MogoLocation location) {
-        if (location != null){
-            runOnUIThread(() -> mView.onCarLocationChanged(location));
-        }
+        runOnUIThread(() -> {
+            if(mView!=null&&location!=null) {
+                mView.onCarLocationChanged(location);
+            }
+        });
     }
 
     @Override
     public void changeOperationStatus(boolean changeStatus) {
-        runOnUIThread(() -> mView.changeOperationStatus(changeStatus));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.changeOperationStatus(changeStatus);
+            }
+        });
     }
 
     @Override
@@ -121,37 +139,65 @@ public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragme
 
     @Override
     public void updateDriverSn(String sn) {
-        runOnUIThread(() -> mView.updateDriverSn(sn));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.updateDriverSn(sn);
+            }
+        });
     }
 
     @Override
     public void updateLineInfo(String lineName, String lineDurTime) {
-        runOnUIThread(() -> mView.updateLineInfo(lineName, lineDurTime));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.updateLineInfo(lineName, lineDurTime);
+            }
+        });
     }
 
     @Override
     public void updateStationsInfo(List<BusStationBean> stations, int currentStationIndex, boolean isArrived) {
-        runOnUIThread(() -> mView.updateStationsInfo(stations,currentStationIndex, isArrived));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.updateStationsInfo(stations, currentStationIndex, isArrived);
+            }
+        });
     }
 
     @Override
     public void showNoTaskView() {
-        runOnUIThread(() -> mView.showNoTaskView());
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.showNoTaskView();
+            }
+        });
     }
 
     @Override
     public void hideNoTaskView() {
-        runOnUIThread(() -> mView.hideNoTaskView());
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.hideNoTaskView();
+            }
+        });
     }
 
     @Override
     public void routeResult(List<LatLng> routeArrived,List<LatLng> routeArriving,MogoLocation location) {
-        runOnUIThread(() ->mView.routeResult(routeArrived,routeArriving,location));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.routeResult(routeArrived, routeArriving, location);
+            }
+        });
     }
 
     @Override
     public void routePlanningToNextStationChanged(long meters, long timeInSecond) {
-        runOnUIThread(() -> mView.updateRoutePlanningToNextStation(meters, timeInSecond));
+        runOnUIThread(() -> {
+            if(mView!=null) {
+                mView.updateRoutePlanningToNextStation(meters, timeInSecond);
+            }
+        });
     }
 
 }
diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index 77b7012c04..ff7cee2e26 100644
--- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -131,6 +131,7 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
     @Override
     public void onDestroyView() {
         mapBizView.onDestroy();
+        CallerTelematicListenerManager.INSTANCE.removeListener(TAG);
         super.onDestroyView();
     }
 
diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt
index a573be4e8d..60a8efc03a 100644
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt
@@ -124,11 +124,12 @@ class PM2DrivingInfoFragment :
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
+    override fun onDestroyView() {
         overMapView?.let{
             it.onDestroy()
         }
+        super.onDestroyView()
+
     }
 
     fun updateSpeed(speed: Int){
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt
index a2312e2f1e..574920a1af 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListViewModel.kt
@@ -25,6 +25,7 @@ class MusicListViewModel : ViewModel(),
     }
 
     override fun onCleared() {
+        AuditionManager.removeDataChangeListener(TAG)
         super.onCleared()
         this.viewCallback = null
     }
diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt
index 6d46b46d74..f25f9ac8dd 100644
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt
@@ -25,6 +25,7 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen
 
     override fun onCleared() {
         super.onCleared()
+        AuditionManager.removeDataChangeListener(TAG)
         this.viewCallback = null
     }
 
diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
index e3d71d4af8..8d355370d0 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
@@ -18,6 +18,7 @@ import com.mogo.och.taxi.passenger.widget.indicator.IndicatorView
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorStyle
+import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 import kotlin.math.floor
 
@@ -229,5 +230,6 @@ internal class InfoVideoView @JvmOverloads constructor(
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        GSYVideoManager.releaseAllVideos()
     }
 }
\ No newline at end of file
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt
index e473bcf35e..e83d4c94b9 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt
@@ -51,7 +51,7 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
     private var normalSize = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),76f)
 
     init {
-        AuditionManager.addDataChangeListener(TAG,this)
+
     }
 
     private fun initView() {
@@ -149,6 +149,7 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         CallerLogger.d(TAG, "onAttachedToWindow")
+        AuditionManager.addDataChangeListener(TAG,this)
         // RightBarView启动的时候必须把MusicPlayingViewModel初始化了，否则和AuditionManager的回掉及逻辑会有问题
         try {
             val musicPlayingViewModel = findViewTreeViewModelStoreOwner()?.let {
@@ -161,6 +162,11 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener {
         }
     }
 
+    override fun onDetachedFromWindow() {
+        AuditionManager.removeDataChangeListener(TAG)
+        super.onDetachedFromWindow()
+    }
+
     init {
         try {
             initView()
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt
index 9e9523ac00..8acc85631e 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListViewModel.kt
@@ -25,6 +25,7 @@ class MusicListViewModel : ViewModel(),
     }
 
     override fun onCleared() {
+        AuditionManager.removeDataChangeListener(TAG)
         super.onCleared()
         this.viewCallback = null
     }
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
index 3b378abbb9..8ac56ab8e6 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/InfoVideoView.kt
@@ -27,6 +27,7 @@ import com.mogo.och.taxi.passenger.widget.indicator.IndicatorView
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode
 import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorStyle
+import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.video.base.GSYVideoView
 import kotlin.math.floor
 
@@ -254,6 +255,7 @@ internal class InfoVideoView @JvmOverloads constructor(
 
     override fun onDetachedFromWindow() {
         MediaDataSourceManager.unInit(TAG)
+        GSYVideoManager.releaseAllVideos()
         super.onDetachedFromWindow()
     }
 }
\ No newline at end of file