From d4b65b6c499f1f64cb257e56ab1484f7044d652d Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 27 Jun 2022 19:12:00 +0800 Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20driver=20v2.8.0]Bus/Taxi=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=BA=BF=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF=EF=BC=88=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseBusTabFragment.java | 41 ++++++++++++++----- .../mogo/och/bus/fragment/BusFragment.java | 2 + .../com/mogo/och/taxi/ui/TaxiFragment.java | 41 +++++++++++++++---- 3 files changed, 65 insertions(+), 19 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 40e524763e..f10abfd87f 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -74,7 +74,6 @@ public abstract class BaseBusTabFragment public boolean isOperationStatus;//false-收车，true-出车 private FrameLayout flStationPanelContainer; private Group groupTestPanel; - private View busTestBar; private FrameLayout flSpeed; // private BusArcView mouduleArc; private TrafficDataView mTrafficDataView; @@ -111,7 +110,6 @@ public abstract class BaseBusTabFragment @Override protected void initViews() { groupTestPanel = findViewById(R.id.groupTestPanel); - busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar); slidePanelView = findViewById(R.id.module_mogo_och_slide_panel); ctvAutopilotStatus = findViewById(R.id.module_mogo_och_autopilot_status); ctvAutopilotStatusIv = findViewById(R.id.bus_autopilot_btn_iv); @@ -518,22 +516,43 @@ public abstract class BaseBusTabFragment } /** - * bus testBar开关 + * Bus调试信息：线路、轨迹等信息 + * + * START */ + private View busTestBar; + private TextView lineIdTV; + private TextView trajMd5TV; + private TextView stopMd5TV; + public void showHideTestBar() { + if (busTestBar == null) { + busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar); + lineIdTV = findViewById(R.id.bus_test_bar_current_line_id); + trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5); + stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5); + } + if (busTestBar.getVisibility() == View.VISIBLE) { busTestBar.setVisibility(View.GONE); } else { BusRoutesResult routesResult = BusOrderModel.getInstance().getBusRoutesResult(); - if (routesResult != null) { - TextView lineIdTV = findViewById(R.id.bus_test_bar_current_line_id); - TextView trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5); - TextView stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5); - lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId()))); - trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5)); - stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5)); - } + lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId()))); + trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5)); + stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5)); busTestBar.setVisibility(View.VISIBLE); } } + + public void updateBusTestBarInfo() { + if (busTestBar != null && busTestBar.getVisibility() == View.VISIBLE) { + BusRoutesResult routesResult = BusOrderModel.getInstance().getBusRoutesResult(); + lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId()))); + trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5)); + stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5)); + } + } + /** + * END + */ } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 3e5997bd6d..71ef4037ec 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -229,6 +229,8 @@ public class BusFragment extends BaseBusTabFragment mNextStationName.setText(nextStationName); mStartStationFlag.setVisibility(startStationFlagVisibility); mEndStationFlag.setVisibility(endStationFlagVisibility); + + updateBusTestBarInfo(); } public void hideOchBus() { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index 093b10cccf..e7c81a0a9d 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -15,7 +15,6 @@ import androidx.fragment.app.FragmentTransaction; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.module.common.MogoApisHandler; -import com.mogo.och.common.module.utils.PinYinUtil; import com.mogo.och.taxi.R; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; import com.mogo.och.taxi.bean.OrderQueryRespBean; @@ -211,6 +210,7 @@ public class TaxiFragment extends BaseTaxiTabFragment