[6.0.0] 1、去除marker api修改 2、增加待服务红点和语音 3、去掉到站和订单取消主动调用取消自驾的命令

2023-08-23 15:41:23 +08:00
parent 492849fa65
commit e41c908ef4
8 changed files with 29 additions and 22 deletions
--- 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()
                }
            }

--- 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);
--- 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)
    }

--- 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<UnmannedState, UnmannedIntent>(){
     * 更新接单状态
     */
    private fun updateCarStatus() {
-        if (!LoginStatusManager.isLogin()) {
+        if (!isLogin()) {
            TaxiModel.loginService!!.queryLoginStatusByNet()
            return
        }
-        if (TaxtServingStatusManager.isOpeningOrderStatus()){//接单状态下,去结束
+        if (isOpeningOrderStatus()){//接单状态下,去结束
            CarServiceManager.endService(mContext,
                object : OchCommonServiceCallback<BaseData> {
                    override fun onSuccess(data: BaseData?) {
@@ -397,7 +397,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
                        VoiceNotice.showNotice("乘客已经取消")
                        mCurrentTaskAndOrder = null
                        updateNoTaskAndOrderUi()
-                        TaxiModel.cancelAutopilot()
+                        //2020.8.23 到站后不再调用取消自驾. 原因是取消自驾,D档位会溜车
+//                        TaxiModel.cancelAutopilot()
                        return
                    }
                    if (data.data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站
--- 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()
        }
--- 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)
    }
 }
--- 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)
    }
--- 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"/>
-    <TextView
+    <ImageView
        android:id="@+id/wait_order_num"
-        android:layout_width="@dimen/dp_46"
-        android:layout_height="@dimen/dp_46"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="40dp"
-        android:gravity="center"
-        android:textSize="@dimen/dp_30"
-        android:textColor="@android:color/white"
-        android:text="0"
-        android:textStyle="bold"
+        android:layout_width="@dimen/dp_36"
+        android:layout_height="@dimen/dp_36"
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_48"
        android:visibility="gone"
-        android:background="@drawable/taxi_driver_image_circle_icon"
+        android:src="@drawable/taxi_driver_image_circle_icon"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"/>
    <View