diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt index f0c9a78c2e..81fbc508ed 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt @@ -197,7 +197,7 @@ abstract class CharterBaseFragment?>() : smallMapView = findViewById(R.id.smallMapView) } - override fun initViews(savedInstanceState: Bundle) { + override fun initViews(savedInstanceState: Bundle?) { super.initViews(savedInstanceState) mapBizView!!.onCreate(savedInstanceState) smallMapView!!.onCreateView(savedInstanceState) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 260898b0c3..1557e4b7c8 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -66,7 +66,7 @@ class TaxiPassengerBaseFragment() : initListener() } - override fun initViews(savedInstanceState: Bundle) { + override fun initViews(savedInstanceState: Bundle?) { super.initViews(savedInstanceState) mapBizView!!.onCreate(savedInstanceState) overMapView.onCreateView(savedInstanceState) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt index 16507fdd9d..2db6ba4d9f 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt @@ -6,10 +6,12 @@ import android.os.Bundle import android.text.TextUtils import android.view.MotionEvent import android.view.View +import chassis.Chassis import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.enums.TrafficTypeEnum import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListenerManager import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager.setIsInit import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager.invokeUploadLogFile import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.invokeListenersOnRoadIdGet @@ -49,6 +51,7 @@ import com.zhidaoauto.map.sdk.open.tools.MapTools.getVisibleRegion import com.zhidaoauto.map.sdk.open.tools.MapTools.toScreenLocation import com.zhidaoauto.map.sdk.open.view.MapAutoView import com.zhjt.service.chain.ChainLog +import kotlin.properties.Delegates class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIController, OnMapLoadedListener, OnCameraChangeListener, OnMapClickListener, OnMapTouchListener, @@ -205,9 +208,13 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle } } + private var roadCross:RoadCross? by Delegates.observable(null){ _,_,newValue -> + + } + override fun onRoadCrossInfo(roadCross: RoadCross?) { - //todo d(SceneConstant.M_MAP + TAG, "onRoadCrossInfo:roadCross$roadCross") + } override fun onStopLineInfo(stopLine: StopLine?) {