From 81259abd0d401a538e7d2034b7e55c326774f6b4 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Sun, 28 Apr 2024 11:30:37 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[taxi=20=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E6=8B=BF=E5=8E=BBstatusbar]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/TaxiPassengerBaseFragment.kt     | 15 +++++++++------
 .../passenger/ui/TaxiPassengerBaseFragment.kt     | 12 ++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index 35e53af810..c6d1651944 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -17,6 +17,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
+import com.mogo.och.common.module.biz.provider.CommonService
+import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice
@@ -65,14 +67,15 @@ class TaxiPassengerBaseFragment() :
         overMapView.onCreateView(savedInstanceState)
         overMapView.hideResetView()
 
-        (ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_VIEW_MANAGER)
-            .navigation() as? IStatusViewLayout)?.apply {
-            val statusView = getStatusView(requireContext())
-            if (statusView is StatusBarView) {
-                statusBarView = statusView
+        val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_PASSENGER).navigation();
+        if(commonService is CommonService){
+            context?.let {
+                val statusView = commonService.getStatusBarView(it)
+                if (statusView is StatusBarView) {
+                    statusBarView = statusView
+                }
             }
         }
-
     }
 
     private fun settingAndMusicListener() {
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index a4c4340474..c88af948f9 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -17,6 +17,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
+import com.mogo.och.common.module.biz.provider.CommonService
+import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager
 import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceNotice
@@ -88,6 +90,16 @@ class TaxiPassengerBaseFragment() :
             }
         }
 
+        val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER).navigation();
+        if(commonService is CommonService){
+            context?.let {
+                val statusView = commonService.getStatusBarView(it)
+                if (statusView is StatusBarView) {
+                    statusBarView = statusView
+                }
+            }
+        }
+
     }
 
     private fun settingAndMusicListener() {