From 71b66d87c768960bae1dd93b0eb8e85dda6d57b0 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 7 Feb 2023 22:13:20 +0800
Subject: [PATCH] [m1] [1.0.0] [och delete IMogoStatusChangedListener,add Map
 view and debugview toggle]

---
 .../och/bus/passenger/MogoOCHBusPassenger.kt  | 14 +------
 .../passenger/ui/BusPassengerRouteFragment.kt | 39 +++++++++++++++++++
 .../src/m1/res/layout/bus_p_fragment.xml      | 16 ++++++++
 3 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
index 422f601d8b..d6ede055ab 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
@@ -20,7 +20,7 @@ import com.mogo.och.bus.passenger.ui.BusPassengerRouteFragment
  * Created on 2022/3/29
  */
 @Route(path = BusPassengerConst.PATH)
-class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener {
+class MogoOCHBusPassenger : IMogoOCH {
     private var mActivity: FragmentActivity? = null
     private var mContainerId = 0
     private var mPassengerFragment: BusPassengerRouteFragment? = null
@@ -28,6 +28,7 @@ class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener {
     override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
         mActivity = activity
         mContainerId = containerId!!
+        showFragment()
         return null
     }
 
@@ -40,18 +41,7 @@ class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener {
     }
 
     override fun init(context: Context) {
-        MogoStatusManager.getInstance()
-            .registerStatusChangedListener("OchBus", StatusDescriptor.VR_MODE, this)
-    }
 
-    override fun onStatusChanged(descriptor: StatusDescriptor, isTrue: Boolean) {
-        if (descriptor == StatusDescriptor.VR_MODE) {
-            if (isTrue) {
-                showFragment()
-            } else {
-                hideFragment()
-            }
-        }
     }
 
     /**
diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
index e7c888f417..95fbdd1860 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.kt
@@ -1,10 +1,13 @@
 package com.mogo.och.bus.passenger.ui
 
+import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerSmpManager.hidePanel
+import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
+import com.mogo.eagle.core.function.view.MapBizView
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -25,6 +28,7 @@ class BusPassengerRouteFragment :
 
     private var bpFunctionGroupDialogFragment: WeakReference<BusPassengerFunctionFragment>? = null
 
+    private lateinit var mapBizView: MapBizView
     override fun getLayoutId(): Int {
         return R.layout.bus_p_fragment
     }
@@ -36,6 +40,7 @@ class BusPassengerRouteFragment :
     override fun initViews() {
         //隐藏小地图
         hidePanel()
+        mapBizView = findViewById(R.id.mapBizView)!!
         cb_bp_video_player.onClick {
             openSettingPage(BusPassengerFunctionFragment.VIDEOTAB)
         }
@@ -45,6 +50,10 @@ class BusPassengerRouteFragment :
         cb_bp_setting_device.onClick {
             openSettingPage(BusPassengerFunctionFragment.SETTINGDEVICETAB)
         }
+        v_debug.setOnLongClickListener {
+            ToggleDebugView.toggleDebugView.toggle(requireContext())
+            true
+        }
     }
 
     private fun openSettingPage(tab:String) {
@@ -89,6 +98,36 @@ class BusPassengerRouteFragment :
         return BusPassengerPresenter(this)
     }
 
+    override fun initViews(savedInstanceState: Bundle?) {
+        super.initViews(savedInstanceState)
+        mapBizView.onCreate(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mapBizView.onResume()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mapBizView.onSaveInstanceState(outState)
+    }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        mapBizView.onLowMemory()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        mapBizView.onPause()
+    }
+
+    override fun onDestroyView() {
+        mapBizView.onDestroy()
+        super.onDestroyView()
+    }
+
     companion object {
         private const val TAG = "BusPassengerRouteFragment"
     }
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
index 5a9ca46877..ed49a275e5 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_fragment.xml
@@ -4,6 +4,22 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/mapBizView"
+        android:layout_width="@dimen/dp_1860"
+        android:layout_height="match_parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <View
+        android:id="@+id/v_debug"
+        app:layout_constraintStart_toStartOf="@+id/mapBizView"
+        app:layout_constraintTop_toTopOf="@+id/mapBizView"
+        app:layout_constraintBottom_toBottomOf="@+id/mapBizView"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_100"/>
+
     <ImageView
         android:id="@+id/cb_bp_video_player"
         android:src="@drawable/bus_p_function_bottom_information_bg_selector"