[6.7.0]

[fea]
[算路模块修改]

OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.java

@@ -20,6 +20,7 @@ public class BusStationBean {
     private boolean leaving;
     private String introduction;// 站点简介
     private boolean isPlayTts;
+    private int pointType; //  1:途径点 2:禁行点 3:站点
 
     public String getNameKr() {
         return nameKr;
@@ -117,6 +118,14 @@ public class BusStationBean {
         isPlayTts = playTts;
     }
 
+    public int getPointType() {
+        return pointType;
+    }
+
+    public void setPointType(int pointType) {
+        this.pointType = pointType;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -130,13 +139,14 @@ public class BusStationBean {
                 && Double.compare(that.lat, lat) == 0
                 && drivingStatus == that.drivingStatus
                 && leaving == that.leaving
+                && pointType == that.pointType
                 && name.equals(that.name)
                 && (nameKr == null || nameKr.equals(that.nameKr));
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(siteId, name, nameKr, seq, gcjLon, gcjLat, lon, lat, drivingStatus, leaving);
+        return Objects.hash(siteId, name, nameKr, seq, gcjLon, gcjLat, lon, lat, drivingStatus, leaving,pointType);
     }
 
     @Override
@@ -154,6 +164,7 @@ public class BusStationBean {
                 ", leaving=" + leaving +
                 ", introduction='" + introduction + '\'' +
                 ", isPlayTts=" + isPlayTts +
+                ", pointType=" + pointType +
                 '}';
     }
 }

OCH/common/data/src/main/java/com/mogo/och/data/bean/ContraiInfo.kt

@@ -30,4 +30,7 @@ data class ContraiInfo(
      * 文件的保存时间
      */
     val contrailSaveTime: Long,
+
+    var passPoints: MutableList<BusStationBean>?, //  用于算路的经停点
+    var blackPoints: MutableList<BusStationBean>?, //  用于算路的黑名單點
 )