From 1a7efa4bc3ed1dc4b8503a9fdd865cb17388a485 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 26 Jun 2023 14:04:18 +0800
Subject: [PATCH] [3.3.0] ui fix

---
 .../passenger/ui/BusPassengerBaseFragment.java   | 16 ++++++++++------
 .../jinlvvan/res/layout/bus_p_base_fragment.xml  |  2 +-
 .../bus/passenger/model/BusPassengerModel.java   |  2 --
 .../passenger/ui/BusPassengerBaseFragment.java   |  9 +++++++++
 .../jinlvvan/res/layout/bus_p_base_fragment.xml  |  2 +-
 .../passenger/ui/TaxiPassengerBaseFragment.java  | 10 ++++++++++
 .../src/main/res/layout/taxi_p_base_fragment.xml |  1 +
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index 4eafc8271c..c3a0911815 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -15,7 +15,9 @@ import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.data.multidisplay.TelematicConstant;
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
+import com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView;
 import com.mogo.eagle.core.function.view.MapBizView;
+import com.mogo.eagle.core.utilcode.util.DeviceUtils;
 import com.mogo.och.bus.passenger.R;
 
 /**
@@ -28,6 +30,7 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
 
     private MapBizView mapBizView;
     private FrameLayout flContainer;
+    private RomaPassengerView romaPView;
 
     protected AppCompatImageView videoSwitch;
 
@@ -45,13 +48,14 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
     protected void initViews() {
         mapBizView = findViewById(R.id.mapBizView);
         videoSwitch = findViewById(R.id.video_switch_iv);
+        romaPView = findViewById(R.id.romaPView);
+        if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){
+            romaPView.setVisibility(View.VISIBLE);
+        }else{
+            romaPView.setVisibility(View.GONE);
+        }
 
-        videoSwitch.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                openOrCloseLiveVideo();
-            }
-        });
+        videoSwitch.setOnClickListener(v -> openOrCloseLiveVideo());
 
         CallerTelematicListenerManager.INSTANCE.addListener(TAG, new IReceivedMsgListener() {
             @Override
diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
index 46bf3aefed..339efd6fc5 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
@@ -27,7 +27,7 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
-        android:id="@+id/ivMoGoLogo"
+        android:id="@+id/romaPView"
         android:layout_width="@dimen/dp_120"
         android:layout_height="@dimen/dp_120"
         android:background="@drawable/roma_bus_p_bg_selector"
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index f5d44b6bbd..0a899b87e2 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -457,13 +457,11 @@ public class BusPassengerModel {
 
         @Override
         public void onAutopilotDockerInfo(@NonNull String dockerVersion) {
-            IMoGoAutopilotStatusListener.super.onAutopilotDockerInfo(dockerVersion);
             // TODO: 2023/6/19 mingjun
         }
 
         @Override
         public void onAutopilotStatusResponse(int state) {
-            IMoGoAutopilotStatusListener.super.onAutopilotStatusResponse(state);
             // TODO: 2023/6/19 mingjun
         }
 
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index 73fd07a86e..8f5bfed4cd 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -21,6 +21,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
 import com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView;
+import com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView;
 import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -28,6 +29,7 @@ import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
+import com.mogo.eagle.core.utilcode.util.DeviceUtils;
 
 /**
  * Created on 2022/3/31
@@ -39,6 +41,7 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
 
     private MapBizView mapBizView;
     private FrameLayout flContainer;
+    private RomaPassengerView romaPView;
 
     @Override
     protected int getLayoutId() {
@@ -53,6 +56,12 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
     @Override
     protected void initViews() {
         mapBizView = findViewById(R.id.mapBizView);
+        romaPView = findViewById(R.id.romaPView);
+        if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){
+            romaPView.setVisibility(View.VISIBLE);
+        }else{
+            romaPView.setVisibility(View.GONE);
+        }
 
         showRouteFragment();
 
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
index b3dbf98f8c..aa903a44ce 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
@@ -28,7 +28,7 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
-        android:id="@+id/ivMoGoLogo"
+        android:id="@+id/romaPView"
         android:layout_width="@dimen/dp_121"
         android:layout_height="@dimen/dp_121"
         android:layout_marginRight="@dimen/dp_751"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index 05a1063d44..42c739cee9 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -21,7 +21,9 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxButtonView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxListView;
+import com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView;
 import com.mogo.eagle.core.function.view.MapBizView;
+import com.mogo.eagle.core.utilcode.util.DeviceUtils;
 import com.mogo.eagle.core.utilcode.util.OverlayViewUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
@@ -58,6 +60,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
     private MapBizView mapBizView;
     private ImageView mAutopilotImage;
     private ImageView mMapswitchBtn;
+    private RomaPassengerView romaPView;
 
     private WeakReference<TaxiPassengerArrivedView> mArrivedEndView;
     private WeakReference<TaxiPassengerCheckView> mArrivedCheckView;
@@ -94,6 +97,13 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         mapBizView = findViewById(R.id.mapBizView);
         mAutopilotImage = findViewById(R.id.module_och_autopilot_iv);
         mMapswitchBtn = findViewById(R.id.module_och_taxi_swich_map_iv);
+        romaPView = findViewById(R.id.romaPView);
+        if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){
+            romaPView.setVisibility(View.VISIBLE);
+        }else{
+            romaPView.setVisibility(View.GONE);
+        }
+
         updateSwitchMapIcon();
         initListener();
 
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 85eba2cdd4..a5533567ba 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -50,6 +50,7 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
+        android:id="@+id/romaPView"
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_marginStart="@dimen/dp_557"