From 52e740fae2ff9c6ea72dfe195960c3523b2da332 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 23 Sep 2022 10:43:01 +0800
Subject: [PATCH] =?UTF-8?q?[2110]=20=E7=99=BB=E5=BD=95=E5=90=8E=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E3=80=81=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E5=B0=91=E4=B8=8D=E7=94=A8=E6=89=93=E5=BC=80=E4=BB=8E?=
 =?UTF-8?q?=E4=BD=8E=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/constant/LineAndTaskStatusManager.kt  | 21 -------------------
 .../mogo/och/bus/presenter/BusPresenter.java  |  7 ++-----
 .../mogo/och/bus/ui/BusSwitchLineActivity.kt  |  2 +-
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/LineAndTaskStatusManager.kt

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/LineAndTaskStatusManager.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/LineAndTaskStatusManager.kt
deleted file mode 100644
index 577445a2d6..0000000000
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/LineAndTaskStatusManager.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.mogo.och.bus.constant
-
-object LineAndTaskStatusManager {
-    var lineId: Int? = null//线路id
-    var taskId: Int? = null//任务id
-
-
-    @JvmStatic
-    fun setLineAndTaskId(lineId: Int?,taskId: Int?){
-        this.lineId = lineId
-        this.taskId = taskId
-    }
-    @JvmStatic
-    fun hasLineAndTaskId():Boolean{
-        if(lineId!=null&& taskId!=null){
-            return true
-        }else{
-            return false
-        }
-    }
-}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
index 22855144e0..e1cfd22a0f 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -20,7 +20,6 @@ import com.mogo.och.bus.bean.BusStationBean;
 import com.mogo.och.bus.callback.IBusControllerStatusCallback;
 import com.mogo.och.bus.callback.IRefreshBusStationsCallback;
 import com.mogo.och.bus.callback.ISlidePannelHideCallback;
-import com.mogo.och.bus.constant.LineAndTaskStatusManager;
 import com.mogo.och.bus.fragment.BusFragment;
 import com.mogo.och.bus.model.BusOrderModel;
 import com.mogo.och.bus.util.BusTrajectoryManager;
@@ -311,7 +310,6 @@ public class BusPresenter extends Presenter<BusFragment>
     }
     @Override
     public void loginSuccess(DriverStatusQueryRespBean data) {
-        LineAndTaskStatusManager.setLineAndTaskId(data.data.lineId,data.data.taskId);
         if(LoginStatusUtil.isLogin()){
             BusOrderModel.getInstance().startOrStopOrderLoop(true);
         }else {
@@ -322,9 +320,8 @@ public class BusPresenter extends Presenter<BusFragment>
             mView.hideSlidePanel();
             BusOrderModel.getInstance().closeBeautificationMode();
         }
-        if(LineAndTaskStatusManager.hasLineAndTaskId()){
-            BusOrderModel.getInstance().queryBusRoutes();
-        }
+        BusOrderModel.getInstance().queryBusRoutes();
+
     }
 
     @Override
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt
index 976bc2711e..1309e825f5 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt
@@ -161,7 +161,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
                 result.taskList.addAll(lineTaskInfo.data)
                 // 打开操作
                 mAdapter.notifyItemChanged(position)
-                if(position==mData.size-1||position==mData.size-2){
+                if((position==mData.size-1||position==mData.size-2)&&mData.size>6){
                     linearLayoutManager.stackFromEnd = true
                 }else{
                     linearLayoutManager.stackFromEnd = false