From a141cc3d6671eaea20c26bf4d138bd01f77b9895 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 23 Mar 2023 18:01:06 +0800
Subject: [PATCH] =?UTF-8?q?[m1]=20[=E5=88=87=E6=8D=A2=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E3=80=81=E6=A0=B9=E6=8D=AE=E9=9D=A0=E8=BE=B9=E5=81=9C=E8=BD=A6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/passenger/ui/view/LineSiteView.kt   | 12 ++----------
 .../manager/OCHPlanningStopSideStatusManager.kt      |  6 ------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
index d037c0db7e..138d2c8079 100644
--- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
+++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
@@ -368,7 +368,7 @@ class LineSiteView @JvmOverloads constructor(
                     IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
                         // 自动驾驶中
                         when (OCHPlanningStopSideStatusManager.stopSiteStatus) {
-                            OCHPlanningStopSideStatusManager.StopSite.NOTHING -> {
+                            OCHPlanningStopSideStatusManager.Status.EndingSuccess -> {
                                 isChangeIngLineAndSite = false
                                 onlyChangeSite(false)
                                 // 可以切换路径
@@ -376,15 +376,7 @@ class LineSiteView @JvmOverloads constructor(
                                 setSiteAdapterEnable(false)
                                 queryLineList()
                             }
-                            OCHPlanningStopSideStatusManager.StopSite.STOPSITED -> {
-                                isChangeIngLineAndSite = false
-                                onlyChangeSite(false)
-                                // 可以切换路径
-                                setEnableLineStatus(true)
-                                setSiteAdapterEnable(false)
-                                queryLineList()
-                            }
-                            OCHPlanningStopSideStatusManager.StopSite.LANKE_KEEP ->{
+                            else ->{
                                 ToastUtils.showShort("自动驾驶中无法切换线路")
                             }
                         }
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHPlanningStopSideStatusManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHPlanningStopSideStatusManager.kt
index fbfd3b3079..16c1c0a2a9 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHPlanningStopSideStatusManager.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHPlanningStopSideStatusManager.kt
@@ -191,12 +191,6 @@ object OCHPlanningStopSideStatusManager : IMoGoAutopilotPlanningActionsListener
         NOTHING()// 默认状态
     }
 
-    enum class StopSite{
-        NOTHING,// 初始状态
-        STOPSITED,// 靠边停车状态
-        LANKE_KEEP;// 形式状态
-    }
-
     interface OCHPlanningActionsCallback {
         fun onStartAutopilotFailure(actionStatus:Status,stopSideStatus : Boolean?, errorInfo : String?)
     }