[2.13.0-arch-opt] merge
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
package com.mogo.eagle.core.function.map
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager
|
||||
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
|
||||
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
|
||||
import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
|
||||
import com.mogo.map.MogoMapView
|
||||
|
||||
class MapBizView(context: Context?) : MogoMapView(context) {
|
||||
|
||||
override fun onCreate(bundle: Bundle?) {
|
||||
super.onCreate(bundle)
|
||||
map.uiController.showMyLocation(true)
|
||||
// 添加Caller监听
|
||||
// CallerSkinModeListenerManager.addListener(MapFragment.functionName, this)
|
||||
//
|
||||
// CallerChassisLocationWGS84ListenerManager.addListener(MapFragment.functionName, this)
|
||||
// CallerChassisLamplightListenerManager.addListener(MapFragment.functionName, this)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -60,7 +60,6 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
|
||||
|
||||
private var mMogoMapView: MogoMapView? = null
|
||||
private var mMogoMap: IMogoMap? = null
|
||||
private val mIsControllerByOthersStatus = false
|
||||
|
||||
companion object {
|
||||
const val functionName = "MapFragment"
|
||||
@@ -140,9 +139,6 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
|
||||
|
||||
override fun onPause() {
|
||||
super.onPause()
|
||||
if (mIsControllerByOthersStatus) {
|
||||
return
|
||||
}
|
||||
if (mMogoMapView != null) {
|
||||
mMogoMapView!!.onPause()
|
||||
} else {
|
||||
@@ -152,9 +148,6 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
if (mIsControllerByOthersStatus) {
|
||||
return
|
||||
}
|
||||
if (mMogoMapView != null) {
|
||||
mMogoMapView!!.onResume()
|
||||
} else {
|
||||
@@ -384,11 +377,6 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
|
||||
}
|
||||
}
|
||||
|
||||
override fun onAutopilotBrakeLightData(brakeLight: Boolean) {
|
||||
d(SceneConstant.M_DEVA + "TurnLight", "---onAutopilotBrakeLightData ---brakeLight = $brakeLight")
|
||||
|
||||
}
|
||||
|
||||
private fun setTurnLightState(turn_light: Int): Int {
|
||||
if (turn_light == 0) {
|
||||
if (isOnTurnLight) {
|
||||
|
||||
Reference in New Issue
Block a user