diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt index 1d2a3dd363..6ae2bebb2c 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -98,7 +98,6 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : // 50 到达终点 乘客可以评价 mView?.showOrHideArrivedEndLayout(true) getOrderRouteInfo() - overMapViewClear() } TaxiOrderStatusEnum.JourneyCompleted -> { // 60 行程完成 @@ -117,7 +116,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : } } - private fun getOrderRouteInfo() { + fun getOrderRouteInfo() { TaxiPassengerModel.queryOrderRouteInfo() } 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 a1751c1e0c..ffebeb3895 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 @@ -349,7 +349,7 @@ class TaxiPassengerBaseFragment() : fun showOrHideOverMapView() { // overMapView?.clearV2XMarkers() -// overMapView?.clearCustomPolyline() + overMapView?.clearAllMarkersAndPolyline() } diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt index 0ed5aa9938..d62a9c0e14 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/overmapview/OverMapView.kt @@ -102,6 +102,10 @@ class OverMapView @JvmOverloads constructor( } } + fun clearAllMarkersAndPolyline(){ + travelRealityView.clearAllMarkersAndPolyline() + } + fun onCreateView(savedInstanceState: Bundle?) { travelRealityView.onCreateView(savedInstanceState) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt index 2bf204fc6f..6557555ea1 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -89,7 +89,6 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : TaxiOrderStatusEnum.ArriveAtEnd -> { // 50 到达终点 乘客可以评价 mView?.showOrHideArrivedEndLayout(true) - overMapViewClear() } TaxiOrderStatusEnum.JourneyCompleted -> { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt index 9fa29f07bb..d39945ec74 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt @@ -363,7 +363,7 @@ class TaxiPassengerBaseFragment() : fun showOrHideOverMapView() { CallerLogger.d(M_TAXI_P + TAG, "showOrHideOverMapView 清理轨迹和站点") //overMapView?.clearV2XMarkers() - //overMapView?.clearCustomPolyline() + overMapView?.clearAllMarkersAndPolyline() } fun showOverMapView() {