From dc1237c2fa7413e1a4e5964e27fd10c3ac18fa74 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 2 Jun 2022 15:20:26 +0800
Subject: [PATCH] =?UTF-8?q?[taxi/bus-d=20270]=20taxi/bus=20=E8=BF=9C?=
 =?UTF-8?q?=E8=A7=86=E8=A7=92=E6=A8=A1=E5=BC=8F=E4=B8=8B=E8=B5=B7=E7=BB=88?=
 =?UTF-8?q?=E7=82=B9=E6=B6=88=E5=A4=B1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/fragment/BaseBusTabFragment.java     | 4 +++-
 .../java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java    | 4 +++-
 .../main/java/com/mogo/map/marker/MogoMarkersHandler.java | 8 +++-----
 3 files changed, 9 insertions(+), 7 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 c6560e82f9..17868ded4c 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
@@ -42,6 +42,7 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.constants.DataTypes;
 import com.mogo.module.common.view.OnPreventFastClickListener;
 import com.mogo.och.bus.R;
+import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.util.BDRouteDataTestUtils;
 import com.mogo.och.bus.view.BusArcView;
 import com.mogo.och.bus.view.SlidePanelView;
@@ -135,7 +136,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
                 } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
-                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS);
+                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+                            .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, BusConst.TYPE_MARKER_BUS_ORDER);
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long);
                 }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 9789040e7f..9ff20ab0e7 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -42,6 +42,7 @@ import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.module.common.constants.DataTypes;
 import com.mogo.module.common.view.OnPreventFastClickListener;
 import com.mogo.och.taxi.R;
+import com.mogo.och.taxi.constant.TaxiConst;
 
 import record_cache.RecordPanelOuterClass;
 
@@ -131,7 +132,8 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
                 } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
-                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS);
+                    MogoMarkerManager.getInstance(AbsMogoApplication.getApp())
+                            .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, TaxiConst.TYPE_MARKER_TAXI_ORDER);
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                     mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_long);
                 }
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
index 0fec1eb72b..0ddd98cd55 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java
@@ -70,11 +70,9 @@ public class MogoMarkersHandler implements IMogoMarkerClickListener, IMogoMarker
                     if (TextUtils.isEmpty(mogoMarker.getOwner())) {
                         mogoMarker.setVisible(false);
                     }
-                    Arrays.stream(owner).forEach(own -> {
-                        if (!mogoMarker.getOwner().equals(own)) {
-                            mogoMarker.setVisible(false);
-                        }
-                    });
+                    if (!Arrays.asList(owner).contains(mogoMarker.getOwner())){
+                        mogoMarker.setVisible(false);
+                    }
                 }));
     }