diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt index 7e6fae56b7..2fd138c7a3 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt @@ -163,12 +163,8 @@ class MainFragment : MvpFragment(), IMogo } aciv_map_2_default.setOnClickListener { omvOverMap.displayCustomOverView() - val controller = getMapUIController() - if (controller != null) { - //切换到地图中间 - controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) - // 切换缩放到中视角 - controller.changeZoom2(0.8f) + mapBizView.getUI()?.let { + it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null) } } MogoMapListenerHandler.mogoMapListenerHandler.registerHostMapListener(TAG, this) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/map/BizMapView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/map/BizMapView.kt new file mode 100644 index 0000000000..581c3dbec5 --- /dev/null +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/map/BizMapView.kt @@ -0,0 +1,57 @@ +package com.mogo.och.charter.passenger.ui.map + +import android.content.Context +import android.os.Bundle +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.MotionEvent +import android.widget.FrameLayout +import com.mogo.eagle.core.function.view.MapBizView +import com.mogo.map.uicontroller.IMogoMapUIController + +import com.mogo.och.charter.passenger.R + +class BizMapView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : FrameLayout(context, attrs, defStyleAttr) { + + private lateinit var mapBizView: MapBizView + + init { + LayoutInflater.from(context).inflate(R.layout.charter_p_bizmap, this, true) + mapBizView = findViewById(R.id.bizMapView) + } + + override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean { + return true + } + + 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/charter/passenger/src/main/res/layout/charter_p_bizmap.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bizmap.xml new file mode 100644 index 0000000000..b6ba701a93 --- /dev/null +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bizmap.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml index 43dcded38a..78b70a8c53 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml @@ -4,13 +4,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> -