Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323

# Conflicts:
#	OCH/mogo-och-common-module/build.gradle
#	OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
This commit is contained in:
wangmingjun
2023-03-30 11:13:00 +08:00
26 changed files with 412 additions and 80 deletions

View File

@@ -8,6 +8,7 @@ package com.mogo.och.data.bean;
public class BusStationBean {
private int siteId;
private String name;
private String nameKr;
private int seq;
private double gcjLon; //高德
private double gcjLat; //高德
@@ -16,6 +17,10 @@ public class BusStationBean {
private int drivingStatus;//行驶信息0初始值1已经过2当前站3未到站
private boolean leaving;
public String getNameKr() {
return nameKr;
}
public int getSiteId() {
return siteId;
}