From 63a14fb7de4de2e761e9c8a1c609d27f98b55942 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 23 Mar 2026 16:27:17 +0800
Subject: [PATCH] =?UTF-8?q?[8.4.0]=20[SSM=20=E7=89=88=E6=9C=AC=E5=B0=8F?=
 =?UTF-8?q?=E4=BA=8E6=E5=90=8E=E5=8A=A0=E8=A3=85=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F=20]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/db/bean/TaskSiteDataBean.kt    | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt
index 5fd09c388d..40e48eaded 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt
@@ -144,6 +144,17 @@ data class TaskSiteDataBean(
         fun toTaskSiteDatas(querySites: List<SiteDataBean>,shiftsId:Long, taskId:Long, lineName: String): MutableList<TaskSiteDataBean> {
             val result = mutableListOf<TaskSiteDataBean>()
             var temp: TaskSiteDataBean?=null
+
+            // 先定义变量存储「第一个tag≠2」的元素seq值
+            var targetSeq: Int? = null
+
+// 第一步：遍历找到第一个tag≠2的元素的seq
+            querySites.forEach {
+                if (it.tag != 2 && targetSeq == null) {
+                    targetSeq = it.seq
+                }
+            }
+
             querySites.forEach {
                 temp = TaskSiteDataBean()
                 temp?.taskId = taskId
@@ -158,10 +169,14 @@ data class TaskSiteDataBean(
                 temp?.gcjLat = it.gcjLat
                 temp?.lon = it.lon
                 temp?.lat = it.lat
-                if(it.seq==1){
-                    temp?.drivingStatus = BusStationBean.drivingStatusCurrent
-                }else{
-                    temp?.drivingStatus = BusStationBean.drivingStatusNotArrived
+                // 核心：根据tag条件设置drivingStatus
+                temp?.drivingStatus = when {
+                    // 1. 找到第一个tag≠2的元素 → Current
+                    targetSeq != null && it.seq == targetSeq -> BusStationBean.drivingStatusCurrent
+                    // 2. 该元素之前的 → Passed
+                    targetSeq != null && it.seq!! < targetSeq!! -> BusStationBean.drivingStatusPassed
+                    // 3. 其余情况（包括所有tag=2）→ NotArrived
+                    else -> BusStationBean.drivingStatusNotArrived
                 }
                 temp?.leaving = false
                 temp?.introduction = it.introduction