diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index dceee0937e..b6d22ccdf0 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/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 protected RelativeLayout mBadcaseBtn; protected RelativeLayout mAICollectBtn; private FrameLayout flStationPanelContainer; - private MapBizView mapBizView; + private BizMapView mapBizView; private Group groupTestPanel; private TrafficDataView mTrafficDataView; // private BusTrafficLightView mTrafficLightView; diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/view/BizMapView.kt new file mode 100644 index 0000000000..0f31f1a06f --- /dev/null +++ b/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() + } +} \ No newline at end of file diff --git a/OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml index fe15f217e3..4ec7f643b1 100644 --- a/OCH/shuttle/driver/src/main/res/layout/bus_base_fragment.xml +++ b/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"> - diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_jl_bizmap_map.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_jl_bizmap_map.xml new file mode 100644 index 0000000000..ffb955a311 --- /dev/null +++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_jl_bizmap_map.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_m2_bizmap_map.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_m2_bizmap_map.xml new file mode 100644 index 0000000000..625b786557 --- /dev/null +++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_m2_bizmap_map.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file