[8.2.0][fix]解决库中读取站点和轨迹点未排序的问题

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt

@@ -56,10 +56,13 @@ class BusRoutesResponse : BaseData() {
                 temp?.isPlayTts = Boolean.TRUE == taskAndsite.isPlayTts
                 temp?.seq = (taskAndsite.seq ?: 0)
                 temp?.siteId = if (taskAndsite.siteId == null) 0 else taskAndsite.siteId!!.toInt()
-                points?.let {
-                    val sitePoint = it.filter {
+                points?.let { pointList->
+                    val sitePoint = pointList.filter {
                         it.siteId?.toInt() == temp?.siteId
-                    }
+                    }.sortedWith(
+                        compareBy<PointDataBean> { it.subSeq }
+//                            .thenBy {it.subSeq }
+                    )
                     val tempPassPoints =  mutableListOf<BusStationBean>()
                     val tempblackPoints =  mutableListOf<BusStationBean>()
                     sitePoint.forEach { point->

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/SiteDataDao.kt

@@ -41,7 +41,7 @@ interface SiteDataDao {
     @Query("SELECT * FROM ${SiteDataBean.tableName} WHERE line_id = :lineId and site_id = :siteId")
     fun querySitesByLineIdAndSiteId(lineId: Long,siteId:Long):List<SiteDataBean>?
 
-    @Query("SELECT * FROM ${SiteDataBean.tableName} WHERE line_id = :lineId")
+    @Query("SELECT * FROM ${SiteDataBean.tableName} WHERE line_id = :lineId order by seq")
     fun querySitesByLineId(lineId: Long):List<SiteDataBean>?
 
     @Query("SELECT *  FROM ${SiteDataBean.tableName} GROUP by md5 HAVING count(1) > 1")