From 66cde2ea81dca9a121e1942c7185dec5a832b82f Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Tue, 29 Mar 2022 18:22:27 +0800
Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20d=202.6.5]Bus/Taxi:=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E4=B8=9A=E5=8A=A1=E6=9A=82=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=BA=A2=E7=BB=BF=E7=81=AF=EF=BC=88=E5=BA=95=E5=B1=82=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=AE=9E=E7=8E=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/fragment/BaseOchBusTabFragment.java    |  6 +++---
 .../src/main/res/layout/bus_base_fragment.xml  | 18 +++++++++---------
 .../och/taxi/ui/BaseOchTaxiTabFragment.java    |  8 +++-----
 .../src/main/res/layout/taxi_base_fragment.xml | 18 +++++++++---------
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
index ae2a9c920b..9f90f0d7f7 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
@@ -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);
 
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 611be76c84..6d12e21ed6 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
@@ -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>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java
index 33c4ae13ef..000bbc5051 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java
@@ -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);
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
index 86f725cb1d..26963bb31d 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
@@ -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>
\ No newline at end of file