diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 5a5d6fdfcb..44758ad03c 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -119,8 +119,7 @@ public class BusPassengerModel { private int mPreRouteIndex = 0; private int mWipePreIndex = 0; - @Volatile - private var isGoingToNextStation = false + private volatile boolean isGoingToNextStation = false; private static final int MSG_QUERY_BUS_P_STATION = 1001; private final Handler handler = new Handler(new Handler.Callback() { @@ -294,8 +293,8 @@ public class BusPassengerModel { for (int i = 0; i< stations.size(); i++){ BusStationBean station = stations.get(i); if (station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving() && i+1 < stations.size()){ - Logger.d(M_BUS_P + TAG, "order = station= leave") - isGoingToNextStation = true + Logger.d(M_BUS_P + TAG, "order = station= leave"); + isGoingToNextStation = true; mRouteLineInfoCallback.updateStationsInfo(stations,i+1,false); if(mNextStationIndex != i+1){ mTwoStationsRouts.clear(); @@ -308,8 +307,8 @@ public class BusPassengerModel { startOrStopRouteAndWipe(false); } - isGoingToNextStation = false - Logger.d(M_BUS_P + TAG, "order = station= arrive") + isGoingToNextStation = false; + Logger.d(M_BUS_P + TAG, "order = station= arrive"); mPreRouteIndex = 0; startOrStopCalculateRouteInfo(false); mRouteLineInfoCallback.updateStationsInfo(stations,i,true); @@ -504,10 +503,10 @@ public class BusPassengerModel { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); } else{ if (FunctionBuildConfig.isDemoMode && - mNextStationIndex>= 0 && mNextStationIndex <= mStations.size - 1 + mNextStationIndex>= 0 && mNextStationIndex <= mStations.size() - 1 && isGoingToNextStation){ - d(M_BUS_P + TAG, "FunctionBuildConfig.isDemoMode is true") - return + Logger.d(M_BUS_P + TAG, "FunctionBuildConfig.isDemoMode is true"); + return; } if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {