From f4d79f9e61b646e08e200e875997e6e758fdb97e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 20 Jul 2023 10:06:31 +0800 Subject: [PATCH] =?UTF-8?q?[3.3.2]=20[=E5=85=A8=E8=A7=88=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presenter/BaseTaxiPassengerPresenter.kt | 16 ++- .../och/taxi/passenger/ui/OverviewFragment.kt | 133 ------------------ .../passenger/ui/TaxiPassengerBaseFragment.kt | 9 +- 3 files changed, 20 insertions(+), 138 deletions(-) delete mode 100644 OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt index ed0b3c9475..7a03818785 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -1,11 +1,9 @@ package com.mogo.och.taxi.passenger.presenter -import android.os.Looper import androidx.lifecycle.LifecycleOwner import com.mogo.commons.AbsMogoApplication import com.mogo.commons.mvp.Presenter -import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager.bizProvider -import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager +import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler @@ -87,6 +85,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOrHideArrivedEndLayout(isShow = false) mView?.showOrHidePressengerCheckPager(isShow = false) mView?.showOrHideStartAutopilotView(isShow = false) + overMapViewShow() } TaxiPassengerOrderStatusEnum.ArriveAtEnd -> { @@ -94,24 +93,35 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOrHideArrivedEndLayout(true) mView?.showOrHidePressengerCheckPager(isShow = false) mView?.showOrHideStartAutopilotView(isShow = false) + overMapViewClear() } TaxiPassengerOrderStatusEnum.JourneyCompleted -> { // 60 行程完成 mView?.showOrHideStartAutopilotView(isShow = false) mView?.showOrHidePressengerCheckPager(isShow = false) mView?.showOrHideArrivedEndLayout(false) + overMapViewClear() } TaxiPassengerOrderStatusEnum.Cancel -> { // 70 取消订单 mView?.showOrHideStartAutopilotView(isShow = false) mView?.showOrHidePressengerCheckPager(isShow = false) mView?.showOrHideArrivedEndLayout(isShow = false) + overMapViewClear() } else -> {} } } } + private fun overMapViewShow(){ + CallerFuncBizManager.bizProvider.getAllV2XEvents() + } + private fun overMapViewClear(){ + CallerFuncBizManager.bizProvider.stopQueryV2XEvents() + mView?.showOrHideOverMapView() + } + fun checkAndUpdateStatus(phone: String?) { TaxiPassengerModel.checkPhoneAndUpdateStatus(phone) { mView?.showOrHidePressengerCheckPager(isShow = false) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt deleted file mode 100644 index c0c2fd67b3..0000000000 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt +++ /dev/null @@ -1,133 +0,0 @@ -package com.mogo.och.taxi.passenger.ui - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import com.mogo.commons.mvp.BaseFragment -import com.mogo.eagle.core.function.call.biz.CallerFuncBizManager -import com.mogo.eagle.core.function.view.OverMapView -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.taxi.passenger.R -import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum -import com.mogo.och.taxi.passenger.model.TaxiPassengerModel -import io.reactivex.Observable -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.disposables.Disposable -import java.util.concurrent.TimeUnit - -class OverviewFragment : BaseFragment() { - - private var overmapview: OverMapView?=null - - private var lifeVisable2User = false - private var finalVisable2User = false - - private var subscribe: Disposable?=null - - override fun onResume() { - super.onResume() - overmapview?.onResume() - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onResume") - lifeVisable2User = true - checkVisable() - } - - override fun onPause() { - super.onPause() - overmapview?.onPause() - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onPause") - lifeVisable2User = false - checkVisable() - } - - private fun checkVisable() { - - subscribe?.let { - if (!it.isDisposed) { - it.dispose() - } - } - subscribe = Observable.timer(500, TimeUnit.MILLISECONDS) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { - if(lifeVisable2User){//展示 - if(!finalVisable2User){ - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"正在展示") - finalVisable2User = true - statusChange(TaxiPassengerModel.curOrderStatus) - } - - }else{//没有展示 - if(finalVisable2User){ - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"已经隐藏") - finalVisable2User = false - } - } - } - } - - override fun onDestroy() { - super.onDestroy() - overmapview?.onDestroy() - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onDestroy") - } - - private fun statusChange(currentStatusEnum: TaxiPassengerOrderStatusEnum){ - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"状态变更最新状态：$currentStatusEnum") - when (currentStatusEnum) { - TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> { - CallerFuncBizManager.bizProvider.getAllV2XEvents() - } - TaxiPassengerOrderStatusEnum.ArriveAtEnd,TaxiPassengerOrderStatusEnum.JourneyCompleted, - TaxiPassengerOrderStatusEnum.Cancel -> { - // stop clear - stopAndClear() - } - else -> {} - } - } - - private fun stopAndClear(){ - CallerFuncBizManager.bizProvider.stopQueryV2XEvents() - UiThreadHandler.post({ - overmapview?.clearV2XMarkers() - overmapview?.clearCustomPolyline() - }, UiThreadHandler.MODE.QUEUE) - } - - - override fun getLayoutId(): Int { - return R.layout.taxi_p_overmap_fragment - } - - override fun getTagName(): String { - return TAG - } - - override fun initViews() { - - } - - override fun initViews(savedInstanceState: Bundle?) { - super.initViews(savedInstanceState) - overmapview = findViewById(R.id.overMapView) - overmapview?.onCreateView(savedInstanceState) - - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onCreateView") - statusChange(TaxiPassengerModel.curOrderStatus) - } - - companion object{ - private const val TAG = "OverviewFragment" - @JvmStatic - fun newInstance(): OverviewFragment { - val args = Bundle() - val fragment = OverviewFragment() - fragment.arguments = args - return fragment - } - } -} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index f2d0ce3b69..36f22c4c96 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -3,14 +3,12 @@ package com.mogo.och.taxi.passenger.ui import android.graphics.drawable.AnimationDrawable import android.os.Bundle import android.view.View -import androidx.core.content.ContextCompat import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.OverlayViewUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.map.listener.IMogoMapListener import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.och.common.module.utils.RxUtils @@ -109,6 +107,8 @@ class TaxiPassengerBaseFragment() : CallerHmiManager.hideTrafficLightView() infoVideoView.visibility = View.VISIBLE } + + else -> {} } } @@ -267,6 +267,11 @@ class TaxiPassengerBaseFragment() : } } + fun showOrHideOverMapView(){ + overMapView?.clearV2XMarkers() + overMapView?.clearCustomPolyline() + } + /** * ① 取消订单 到达上车点后乘客取消订单 隐藏乘客验证页面 * ② 司机到达上车点 到达上车点 展示乘客验证页面