From fafe3f914a4424752fcdb3224d5cafa8cbe851f9 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 22 Sep 2022 19:10:47 +0800
Subject: [PATCH] =?UTF-8?q?[2.11.0/1.6.0]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0taskId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/bean/BusRoutesResult.java    |  5 +++++
 .../java/com/mogo/och/bus/model/BusOrderModel.java     | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
index 485c68f0ec..4b652d30df 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java
@@ -15,6 +15,7 @@ public class BusRoutesResult {
     private String description;
     private int status;
     private long taskTime; //线路时间班次
+    private int taskId;// 线路班次id
 
     //线路轨迹相关字段
     public String csvFileUrl = ""; //轨迹文件下载的cos url，默认“”
@@ -33,6 +34,10 @@ public class BusRoutesResult {
         return lineId;
     }
 
+    public int getTaskId() {
+        return taskId;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index f383ba0917..98284d6d92 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -85,6 +85,7 @@ import mogo.telematics.pad.MessagePad;
 public class BusOrderModel {
     private final String TAG = BusOrderModel.class.getSimpleName();
     private int currentLineId = -1;
+    private int currentTaskId = -1;
     private int backgroundCurrentStationIndex = 0;//A->B 此处值是A站点索引
 
     private static volatile BusOrderModel sInstance;
@@ -503,7 +504,7 @@ public class BusOrderModel {
      */
     public void abortTask() {
         CallerLogger.INSTANCE.d( M_BUS + TAG, "结束当前路线abortTask");
-        BusServiceManager.getInstance().abortTask(mContext, currentLineId
+        BusServiceManager.getInstance().abortTask(mContext, currentTaskId
                 , new IBusServiceCallback<BaseData>() {
             @Override
             public void onSuccess(BaseData o) {
@@ -626,7 +627,7 @@ public class BusOrderModel {
         BusServiceManager.getInstance().arriveSiteStation(mContext ,
                 stationList.get(arrivedStationIndex).getSeq(),
                 stationList.get(arrivedStationIndex).getSiteId(),
-                currentLineId ,
+                currentTaskId ,
                 new IBusServiceCallback<BaseData>() {
                     @Override
                     public void onSuccess(BaseData o) {
@@ -655,7 +656,7 @@ public class BusOrderModel {
         BusServiceManager.getInstance().leaveStation(mContext,
                 stationList.get(backgroundCurrentStationIndex).getSeq(),
                 stationList.get(backgroundCurrentStationIndex).getSiteId(),
-                currentLineId,
+                currentTaskId,
                 new IBusServiceCallback<BaseData>() {
                     @Override
                     public void onSuccess(BaseData o) {
@@ -750,6 +751,7 @@ public class BusOrderModel {
         if (result == null) return;
         busRoutesResult = result;
         List<BusStationBean> site = result.getSites();
+        currentTaskId = result.getTaskId();
         currentLineId = result.getLineId();
         stationList.clear();
         stationList.addAll( site );
@@ -889,7 +891,7 @@ public class BusOrderModel {
      */
     private void endTask() {
         CallerLogger.INSTANCE.d( M_BUS + TAG, "任务正常走完endTask()");
-        BusServiceManager.getInstance().endTask(mContext, currentLineId
+        BusServiceManager.getInstance().endTask(mContext, currentTaskId
                 , new IBusServiceCallback<BaseData>() {
                     @Override
                     public void onSuccess(BaseData o) {