From ab5cfd85e40fec75996c04e130d76d63c68ec299 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 30 May 2024 10:29:59 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.4]=20=E5=A4=84=E7=90=86Bus=20B1=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E6=9D=80=E6=8E=89app=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/model/BusPassengerModel.kt | 9 ++++++--- .../och/bus/passenger/ui/BusPassengerRouteFragment.java | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) 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); } }