[6.2.0]

[shuttle]
[车模变更]

OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java

@@ -34,7 +34,6 @@ import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView;
 import com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView;
 import com.mogo.eagle.core.function.smp.view.SmallMapView;
-import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -44,6 +43,7 @@ import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.och.bus.R;
+import com.mogo.och.bus.view.BizMapView;
 import com.mogo.och.data.bean.BusRoutesResult;
 import com.mogo.och.bus.model.OrderModel;
 import com.mogo.och.bus.view.SlidePanelView;
@@ -70,7 +70,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     protected RelativeLayout mBadcaseBtn;
     protected RelativeLayout mAICollectBtn;
     private FrameLayout flStationPanelContainer;
-    private MapBizView mapBizView;
+    private BizMapView mapBizView;
     private Group groupTestPanel;
     private TrafficDataView mTrafficDataView;
     // private BusTrafficLightView mTrafficLightView;

OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt

@@ -0,0 +1,63 @@
+package com.mogo.och.bus.view
+
+import android.content.Context
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.view.MapBizView
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.map.uicontroller.IMogoMapUIController
+import com.mogo.och.bus.R
+
+/**
+ * 魔戒蓝牙控件
+ * 放置于StatusBar右侧位置
+ */
+class BizMapView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    private lateinit var mapBizView: MapBizView
+
+    init {
+        if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+            LayoutInflater.from(context).inflate(R.layout.shuttle_m2_bizmap_map, this, true)
+        }else if(AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)){
+            LayoutInflater.from(context).inflate(R.layout.shuttle_jl_bizmap_map, this, true)
+        }else{
+            LayoutInflater.from(context).inflate(R.layout.shuttle_jl_bizmap_map, this, true)
+        }
+        mapBizView = findViewById(R.id.bizMapView)
+    }
+
+    fun getUI(): IMogoMapUIController? {
+        return mapBizView.getUI()
+    }
+
+    fun onCreate(bundle: Bundle?) {
+        mapBizView.onCreate(bundle)
+    }
+    fun onResume() {
+        mapBizView.onResume()
+    }
+
+    fun onSaveInstanceState(outState: Bundle){
+        mapBizView.onSaveInstanceState(outState)
+    }
+
+    fun onLowMemory() {
+        mapBizView.onLowMemory()
+    }
+
+    fun onPause() {
+        mapBizView.onPause()
+    }
+
+    fun onDestroy() {
+        mapBizView.onDestroy()
+    }
+}

OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml

@@ -6,10 +6,8 @@
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/dp_72">
 
-    <com.mogo.eagle.core.function.view.MapBizView
+    <com.mogo.och.bus.view.BizMapView
         android:id="@+id/mapBizView"
-        app:isWeatherEnable="false"
-        app:locationIcon3DRes="@raw/m2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 

OCH/shuttle/driver/src/main/res/layout/shuttle_jl_bizmap_map.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:parentTag="FrameLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/bizMapView"
+        app:isWeatherEnable="false"
+        app:locationIcon3DRes="@raw/xiaoba"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</merge>

OCH/shuttle/driver/src/main/res/layout/shuttle_m2_bizmap_map.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:parentTag="FrameLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <com.mogo.eagle.core.function.view.MapBizView
+        android:id="@+id/bizMapView"
+        app:isWeatherEnable="false"
+        app:locationIcon3DRes="@raw/m2"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</merge>