From e41c908ef456474ae4f4bd9f253946ca1b6cf7f0 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 23 Aug 2023 15:41:23 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81=E5=8E=BB=E9=99=A4marker=20?= =?UTF-8?q?api=E4=BF=AE=E6=94=B9=202=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BE=85?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BA=A2=E7=82=B9=E5=92=8C=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=203=E3=80=81=E5=8E=BB=E6=8E=89=E5=88=B0=E7=AB=99=E5=92=8C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=E4=B8=BB=E5=8A=A8=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=8F=96=E6=B6=88=E8=87=AA=E9=A9=BE=E7=9A=84=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/model/TaxiModel.kt | 3 ++- .../mogo/och/taxi/ui/TaxiOrderCancelDialog.java | 2 +- .../och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 7 ++----- .../taxi/ui/task/TaxiCurrentTaskViewModel.kt | 7 ++++--- .../och/taxi/ui/task/TaxiNextTaskFragment.kt | 1 + .../och/taxi/ui/task/TaxiTaskTabFragment.kt | 12 ++++++++++++ .../com/mogo/och/taxi/utils/MapMakerManager.kt | 2 +- .../res/layout/taxi_server_orders_panel.xml | 17 ++++++----------- 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt index 79761fa9ed..7d1d909059 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt @@ -636,7 +636,8 @@ object TaxiModel { mUntruthTask = null if (isArriveEndSite) { cleanStation() - cancelAutopilot() + //2020.8.23 到站后不再调用取消自驾. 原因是取消自驾,D档位会溜车 +// cancelAutopilot() } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index f4c9c07e9f..a86a8f2edd 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -45,7 +45,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi private CommitReasonListener mCommitListener = null; - protected TaxiOrderCancelDialog(Context context, int orderStatus,CommitReasonListener commitListener) { + public TaxiOrderCancelDialog(Context context, int orderStatus,CommitReasonListener commitListener) { super(context,R.style.OrderCancelDialog); this.mOrderStatus = orderStatus; contextWeakReference = new WeakReference<>(context); diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 4d26024b3d..cb5d39a442 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -1,11 +1,10 @@ -package com.mogo.och.taxi.ui +package com.mogo.och.taxi.ui.task import android.annotation.SuppressLint import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.os.Build import android.os.Bundle -import android.text.Html import android.view.View import androidx.annotation.RequiresApi import androidx.core.text.HtmlCompat @@ -39,8 +38,8 @@ import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER import com.mogo.och.taxi.model.TaxiModel +import com.mogo.och.taxi.ui.TaxiOrderCancelDialog import com.mogo.och.taxi.ui.base.TaxiFragment -import com.mogo.och.taxi.ui.task.TaxiCurrentTaskViewModel import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState import com.mogo.och.taxi.ui.unmanned.UnmannedIntent import com.mogo.och.taxi.utils.MapMakerManager @@ -330,8 +329,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } - updateMapMarkers() - updateRemainDistanceAndTime(false) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 0e025303c0..cebcf72667 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -118,11 +118,11 @@ class TaxiCurrentTaskViewModel : BaseViewModel(){ * 更新接单状态 */ private fun updateCarStatus() { - if (!LoginStatusManager.isLogin()) { + if (!isLogin()) { TaxiModel.loginService!!.queryLoginStatusByNet() return } - if (TaxtServingStatusManager.isOpeningOrderStatus()){//接单状态下,去结束 + if (isOpeningOrderStatus()){//接单状态下,去结束 CarServiceManager.endService(mContext, object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { @@ -397,7 +397,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel(){ VoiceNotice.showNotice("乘客已经取消") mCurrentTaskAndOrder = null updateNoTaskAndOrderUi() - TaxiModel.cancelAutopilot() + //2020.8.23 到站后不再调用取消自驾. 原因是取消自驾,D档位会溜车 +// TaxiModel.cancelAutopilot() return } if (data.data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站 diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt index c9a38bb0f5..1a90437eb1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt @@ -56,6 +56,7 @@ class TaxiNextTaskFragment : BaseFragment() { if (model.taskType == TaskTypeEnum.VirtualTask.code) { val order = model.order updateOrderUI(order!!) + } else { showNoOrderView() } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt index eebd6b5c69..053f6d8641 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt @@ -15,11 +15,15 @@ import com.google.android.material.tabs.TabLayout import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment +import com.mogo.och.taxi.ui.task.TaxiCurrentTaskFragment import kotlinx.android.synthetic.main.taxi_server_orders_panel.module_och_taxi_tab import kotlinx.android.synthetic.main.taxi_server_orders_panel.module_och_taxi_view_pager +import kotlinx.android.synthetic.main.taxi_server_orders_panel.wait_order_num import me.jessyan.autosize.utils.AutoSizeUtils /** @@ -188,6 +192,14 @@ class TaxiTaskTabFragment : BaseFragment() { fun updateOrderChanged(model: QueryCurrentTaskRespBean.Result?) { if (null == nextTaskFragment) return + if (model != null && model.taskType == TaskTypeEnum.VirtualTask.code + && model.order != null) { + VoiceNotice.showNotice("已为您提前接到下一订单，待完成当前任务后服务") + wait_order_num.visibility = View.VISIBLE + } else { + wait_order_num.visibility = View.GONE + } + nextTaskFragment!!.updateOrderChanged(model) } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt index ffd8b423bd..a2f0feb736 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/utils/MapMakerManager.kt @@ -78,7 +78,7 @@ object MapMakerManager { ) val overlayManager = CallerMapUIServiceManager.getOverlayManager() - overlayManager?.removeAllLinesInOwner(owner) + overlayManager?.removeAllPointsInOwner(owner) } OCHThreadPoolManager.getsInstance().execute(removeAllMapMarkerRunnable) } diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml index b52c347f82..ab353393ca 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml @@ -32,19 +32,14 @@ android:background="@drawable/taxi_order_viewpager_bg" app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_tab" app:layout_constraintStart_toStartOf="parent"/> -