diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt index 77a31effcb..f9d4c8c6cd 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt @@ -25,6 +25,7 @@ import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.NetworkUtils @@ -228,9 +229,6 @@ object BusPassengerModel { d(M_BUS_P + TAG, "order = station= leave") isGoingToNextStation = true mRouteLineInfoCallback?.updateStationsInfo(stations, i + 1, false) - if (mNextStationIndex != i + 1) { - mTwoStationsRouts.clear() - } mNextStationIndex = i + 1 val startStation = mStations[i] val endStation = mStations[i + 1] @@ -434,6 +432,11 @@ object BusPassengerModel { } }else if (baseMsg != null && baseMsg.type == DPMsgType.TYPE_TASK_DETAILS.type){ val msg = GsonUtils.fromJson(String(byteArray), TaskDetailsMsg::class.java) + Logger.d( + M_BUS_P + TAG, + "onReceivedMsg = " + GsonUtils.toJson(msg) + ) + if (msg == null || msg.msg?.isEmpty() == true){ clearLocalRouteResult() return diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index 0e90f05d64..bf1132a4f9 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -311,6 +311,8 @@ public class BusPassengerRouteFragment extends public void hideNoTaskView(){ if (mNoLineInfoView.getVisibility() == View.VISIBLE){ mNoLineInfoView.setVisibility(View.GONE); + } + if (mRouteInfoView.getVisibility() == View.GONE){ mRouteInfoView.setVisibility(View.VISIBLE); } }