From 36be568e109470b88aa4fa94999217de969ea458 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 6 Sep 2023 16:57:19 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81=E8=BD=A8=E8=BF=B9=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E9=9C=8030s-1?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=E6=89=8D=E6=98=BE=E7=A4=BA=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202=E3=80=81=E5=8F=8D=E5=A4=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=AF=BC=E8=88=AA=E6=8C=89=E9=92=AE,=20=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E8=BD=A8=E8=BF=B9=E4=B8=8D=E5=8A=A0=E8=BD=BD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/common/module/map/CommonAmapNaviVIew.kt     | 5 ++---
 .../java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt    | 2 +-
 .../com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt   | 4 ++++
 .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt    | 2 +-
 .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt
index bc16c9fb2b..0a34893090 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/CommonAmapNaviVIew.kt
@@ -134,7 +134,6 @@ class CommonAmapNaviVIew @JvmOverloads constructor(
     }
 
     override fun onNaviCancel() {
-        TODO("Not yet implemented")
     }
 
     override fun onNaviBackClick(): Boolean {
@@ -170,11 +169,11 @@ class CommonAmapNaviVIew @JvmOverloads constructor(
     }
 
     override fun onMapTypeChanged(p0: Int) {
-        TODO("Not yet implemented")
+
     }
 
     override fun onNaviViewShowMode(p0: Int) {
-        TODO("Not yet implemented")
+
     }
 
     fun onCreate(savedInstanceState : Bundle?){
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
index 4b933918a9..a9ab0a9ed8 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
@@ -592,6 +592,7 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
 
     fun showRoutingToStationFragment(isShow: Boolean) {
         val transaction: FragmentTransaction = childFragmentManager.beginTransaction()
+        closeRoutingViewIfHadAdd()
         if (isShow) {
             closeAmapViewIFHadeAdd()
             taxiRoutingNaviFragment = TaxiRoutingNaviFragment.newInstance()
@@ -605,7 +606,6 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
             module_mogo_och_navi_panel_container.visibility = View.VISIBLE
             smallMapView.visibility = View.GONE
         } else {
-            closeRoutingViewIfHadAdd()
             taxi_close_navi_icon.visibility = View.GONE
             module_mogo_och_navi_panel_container.visibility = View.INVISIBLE //2023.9.4高德导航由gone设置成INVISIBLE,保留导航实例,避免导航被挂起
             smallMapView.visibility = View.VISIBLE
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt
index b819444271..9fd62f28d6 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiMapDirectionView.kt
@@ -74,6 +74,7 @@ class TaxiMapDirectionView @JvmOverloads constructor(
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         // 注册定位监听
+        clearPolyline()
         CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
     }
 
@@ -215,6 +216,7 @@ class TaxiMapDirectionView @JvmOverloads constructor(
             texIndexList.add(1)
         }
         if (mPolyline != null) {
+            d(SceneConstant.M_TAXI + TAG, "mPolyline != null")
             mPolyline!!.points = allPoints
             mPolyline!!.options.customTextureIndex = texIndexList
             return
@@ -234,10 +236,12 @@ class TaxiMapDirectionView @JvmOverloads constructor(
         }
 
         // 绘制线
+        d(SceneConstant.M_TAXI + TAG, "绘制线mPolyline = mAMap.addPolyline(polylineOptions)")
         mPolyline = mAMap.addPolyline(polylineOptions)
     }
 
     override fun clearPolyline() {
+        d(SceneConstant.M_TAXI + TAG, "clearPolyline")
         if (mPolyline != null) {
             mPolyline!!.remove()
             mPolyline = null
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 beb22e68c5..cab5dae978 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
@@ -267,7 +267,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
         driveToNearestStationTask: StartServiceRespBean.Result?,
         currentTaskWithOrder: QueryCurrentTaskRespBean.Result?
     ) {
-        if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null
+        if (currentTaskWithOrder?.endSite != null
             && (currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
                     ||currentTaskWithOrder.order != null)
         ) {
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index cf4f690875..e70f507880 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -706,7 +706,7 @@ object TaxiTaskModel {
 
                         if (result.order != null && result.currentStatus == TaskStatusEnum.CompleteTask.code
                             && result.servingStatus == 1){
-                            if (result.order!!.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code) {
+                            if (result.order!!.orderStatus < TaxiOrderStatusEnum.ArriveAtStart.code) {
                                 VoiceNotice.showNotice("已为您接到订单")
                             }
                             if (result.taskType == TaskTypeEnum.ToOrderStartTask.code