From b0827b0d7431ead3f5b2f318954d0a335d4203fc Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 15 Apr 2022 17:50:50 +0800 Subject: [PATCH] =?UTF-8?q?[driver=20passenger=20]=20bus=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E8=BD=A6=E7=89=8C=E5=8F=B7=E6=94=B9=E4=B8=BA=E4=BB=8E?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IBusPassegerDriverStatusCallback.java | 1 + .../bus/passenger/model/BusPassengerModel.java | 1 + .../presenter/BaseBusPassengerPresenter.java | 5 +++++ .../ui/BusPassengerRouteFragment.java | 18 +++++++++++------- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java index 1dc3e00195..06885b74ab 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/callback/IBusPassegerDriverStatusCallback.java @@ -6,4 +6,5 @@ package com.mogo.och.bus.passenger.callback; */ public interface IBusPassegerDriverStatusCallback { void changeOperationStatus(boolean changeStatus); + void updatePlateNumber(String plateNumber); } diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index c8760c77c0..8420c25610 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -109,6 +109,7 @@ public class BusPassengerModel { startOrStopOrderLoop(data.data.serviceStatus == 1); if(mDriverStatusCallback != null){ mDriverStatusCallback.changeOperationStatus(data.data.serviceStatus == 1); + mDriverStatusCallback.updatePlateNumber(data.data.plateNumber); } } diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java index ca76a2a70c..3516709f17 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java @@ -120,6 +120,11 @@ public class BaseBusPassengerPresenter extends Presenter mView.changeOperationStatus(changeStatus)); } + @Override + public void updatePlateNumber(String plateNumber) { + runOnUIThread(() -> mView.updatePlateNum(plateNumber)); + } + @Override public void updateLineInfo(String lineName, String lineDurTime) { runOnUIThread(() -> mView.updateLineInfo(lineName, lineDurTime)); diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index 72668ea93d..8a7bf168df 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -56,6 +56,7 @@ public class BusPassengerRouteFragment extends private RotateAnimation rotateAnimation; private float lastBearing = 0; private BusPassengerLineStationsAdapter mAdapter; + @Override public int getStationPanelViewId() { return R.layout.bus_p_route_fragment; @@ -198,16 +199,19 @@ public class BusPassengerRouteFragment extends } } - public void updateLineInfo(String lineName, String lineDurTime) { - if (!mLineName.getText().toString().equals(lineName) - || !mOperationTime.getText().toString().equals(lineDurTime) - || !mCarPlateNum.getText().toString().equals(AppConfigInfo.INSTANCE.getPlateNumber())){ - mLineName.setText(lineName); - mOperationTime.setText(lineDurTime); - mCarPlateNum.setText(null == AppConfigInfo.INSTANCE.getPlateNumber() ? "-- --" : AppConfigInfo.INSTANCE.getPlateNumber()); + public void updatePlateNum(String plateNum){ + if ("".equals(plateNum) || null == plateNum) { + mCarPlateNum.setText("-- --"); + }else { + mCarPlateNum.setText((plateNum)); } } + public void updateLineInfo(String lineName, String lineDurTime) { + mLineName.setText(lineName); + mOperationTime.setText(lineDurTime); + } + /** * * @param stations