From f129e2a4fb1750fd7dc9a78f2ce396449550b462 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 17 Aug 2022 19:11:32 +0800 Subject: [PATCH] =?UTF-8?q?[2.10.0]bus=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0"=E8=BF=9B=E7=AB=99"=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseBusTabFragment.java | 10 ++++++++ .../mogo/och/bus/fragment/BusFragment.java | 5 ++++ .../com/mogo/och/bus/model/BusOrderModel.java | 6 ++--- .../src/main/res/layout/bus_base_fragment.xml | 23 ++++++++++++++++--- .../res/values-xhdpi-2560x1440/dimens.xml | 1 + .../res/values-xhdpi-2560x1600/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../src/main/res/values/strings.xml | 1 + 8 files changed, 42 insertions(+), 6 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 c83715f9f1..9a54140635 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 @@ -67,6 +67,7 @@ public abstract class BaseBusTabFragment private RelativeLayout ctvAutopilotStatus; private ImageView ctvAutopilotStatusIv; private TextView ctvAutopilotStatusTv; + private TextView tvArrived; protected TextView tvOperationStatus; protected RelativeLayout mSettingBtn; protected RelativeLayout mBadcaseBtn; @@ -120,6 +121,7 @@ public abstract class BaseBusTabFragment // CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView); tvOperationStatus = findViewById(R.id.module_mogo_och_operation_status); + tvArrived = findViewById(R.id.module_mogo_och_arrived_tv); flSpeed = (FrameLayout) findViewById(R.id.fl_speed); mTrafficDataView = (TrafficDataView) findViewById(R.id.bus_arc); @@ -198,6 +200,10 @@ public abstract class BaseBusTabFragment tvOperationStatus.setOnClickListener(view -> { onChangeOperationStatus(); }); + + tvArrived.setOnClickListener(view -> { + onArriveStation(); + }); mSettingBtn = findViewById(R.id.module_mogo_och_setting_layout); mSettingBtn.setOnClickListener(v -> { @@ -226,6 +232,8 @@ public abstract class BaseBusTabFragment } } + protected abstract void onArriveStation(); + private void updateSwitchMapIcon(){ if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()) { mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long); @@ -284,6 +292,7 @@ public abstract class BaseBusTabFragment getActivity().runOnUiThread(() -> { slidePanelView.setText(text); slidePanelView.setVisibility(View.VISIBLE); + tvArrived.setClickable(false); }); } } @@ -294,6 +303,7 @@ public abstract class BaseBusTabFragment public void hideSlidePanel() { getActivity().runOnUiThread(() -> { slidePanelView.setVisibility(View.GONE); + tvArrived.setClickable(true); }); } 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 04f9c744de..4d6f097d3b 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 @@ -106,6 +106,11 @@ public class BusFragment extends BaseBusTabFragment mSwitchLine.setOnClickListener(this); } + @Override + protected void onArriveStation() { + mPresenter.onAutopilotArriveAtStation(null); + } + @Override protected void debugArrivedStation() { mPresenter.onAutopilotArriveAtStation(null); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index 9cbe14d3f2..19b236c0c7 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -519,9 +519,9 @@ public class BusOrderModel { ) private void leaveStationSuccess(BusRoutesResult result, boolean isRestart) { renderBusStationsStatus(result); - if (slidePannelHideCallback != null) { - slidePannelHideCallback.hideSlidePanel(); - } +// if (slidePannelHideCallback != null) { +// slidePannelHideCallback.hideSlidePanel(); +// } //开启自动驾驶 startAutopilot(isRestart); if (isGoingToNextStation) { diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 4bd073fff0..1c385e0809 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml @@ -82,8 +82,8 @@ android:background="@drawable/bus_switch_map_bg" android:elevation="@dimen/bus_dp_10" android:padding="@dimen/bus_dp_20" - app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_operation_status" - app:layout_constraintLeft_toRightOf="@+id/module_mogo_och_operation_status" + app:layout_constraintBottom_toBottomOf="@+id/module_mogo_och_arrived_tv" + app:layout_constraintLeft_toRightOf="@+id/module_mogo_och_arrived_tv" android:gravity="center" android:orientation="horizontal"> @@ -109,6 +109,22 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent"/> + + + + android:src="@drawable/bad_case_selector" /> 40px + 32px 13px 12px 350px diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml index db56121992..dee684f3e6 100644 --- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -91,6 +91,7 @@ 40px + 32px 13px 12px 350px diff --git a/OCH/mogo-och-bus/src/main/res/values/dimens.xml b/OCH/mogo-och-bus/src/main/res/values/dimens.xml index 85e4768fcc..ce34734e02 100644 --- a/OCH/mogo-och-bus/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus/src/main/res/values/dimens.xml @@ -89,6 +89,7 @@ 270px 30px + 30px 13px 12px 288px diff --git a/OCH/mogo-och-bus/src/main/res/values/strings.xml b/OCH/mogo-och-bus/src/main/res/values/strings.xml index 9e4403ea0d..992ab6c19c 100644 --- a/OCH/mogo-och-bus/src/main/res/values/strings.xml +++ b/OCH/mogo-och-bus/src/main/res/values/strings.xml @@ -25,4 +25,5 @@ 当前站点： 下一站： 自动驾驶状态为0不可用 + 进站