yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bus/Taxi d 2.6.5]Bus/Taxi:司机端业务暂隐藏红绿灯（底层统一实现）

Browse Source
This commit is contained in:
pangfan
2022-03-29 18:22:27 +08:00
parent e65819760a
commit 66cde2ea81
4 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
View File

@@ -70,7 +70,7 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
private FrameLayout flSpeed;
private BusArcView mouduleArc;
private ImageView mUpgradeTipIv;
private BusTrafficLightView mTrafficLightView;
// private BusTrafficLightView mTrafficLightView;
public static final String TYPE_ENTRANCE = "entrance";
@@ -107,8 +107,8 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
ctvAutopilotStatusTv = findViewById(R.id.bus_autopolot_btn_tv);
flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container);
mTrafficLightView = findViewById(R.id.bus_traffic_light_view);
CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
// mTrafficLightView = findViewById(R.id.bus_traffic_light_view);
// CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
tvOperationStatus = findViewById(R.id.module_mogo_och_operation_status);

18
OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
View File

@@ -230,13 +230,13 @@
app:constraint_referenced_ids="btnAutopilotArrive,btnAutopilotDisable,btnAutopilotEnable,btnAutopilotRunning"
tools:visibility="visible" />
<com.mogo.och.bus.ui.BusTrafficLightView
android:id="@+id/bus_traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginRight="@dimen/bus_traffic_light_layout_margin_right"
android:layout_marginTop="@dimen/bus_traffic_light_layout_margin_top"
android:visibility="gone"/>
<!-- <com.mogo.och.bus.ui.BusTrafficLightView-->
<!-- android:id="@+id/bus_traffic_light_view"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- android:layout_marginRight="@dimen/bus_traffic_light_layout_margin_right"-->
<!-- android:layout_marginTop="@dimen/bus_traffic_light_layout_margin_top"-->
<!-- android:visibility="gone"/>-->
</androidx.constraintlayout.widget.ConstraintLayout>

8
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java
View File

@@ -77,7 +77,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
protected ImageView mBadcaseBtn;
protected ImageView mUpgradeTipIv;
protected OCHNaviFragment ochNaviFragment = null;
protected TaxiTrafficLightView mTrafficLightView;
// protected TaxiTrafficLightView mTrafficLightView;
private Handler mHandler = new Handler(Looper.getMainLooper());
@@ -97,10 +97,8 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
mAutopilotTv = findViewById(R.id.module_och_autopilot_tv);
flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container);
mTrafficLightView = findViewById(R.id.taxi_traffic_light_view);
CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
mTrafficLightView.showWarningTrafficLight(3);
mTrafficLightView.changeCountdownTrafficLightNum(1, 2, 21);
// mTrafficLightView = findViewById(R.id.taxi_traffic_light_view);
// CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
mPersonalBtn = findViewById(R.id.module_och_taxi_personal_layout);
mSpeedView = findViewById(R.id.module_mogo_och_speed_tv);

18
OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -270,13 +270,13 @@
app:layout_constraintBottom_toBottomOf="parent"
android:src="@drawable/taxi_close_navi_icon"/>
<com.mogo.och.taxi.ui.TaxiTrafficLightView
android:id="@+id/taxi_traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginRight="@dimen/taxi_traffic_light_layout_margin_right"
android:layout_marginTop="@dimen/taxi_traffic_light_layout_margin_top"
android:visibility="gone"/>
<!-- <com.mogo.och.taxi.ui.TaxiTrafficLightView-->
<!-- android:id="@+id/taxi_traffic_light_view"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- android:layout_marginRight="@dimen/taxi_traffic_light_layout_margin_right"-->
<!-- android:layout_marginTop="@dimen/taxi_traffic_light_layout_margin_top"-->
<!-- android:visibility="gone"/>-->
</androidx.constraintlayout.widget.ConstraintLayout>