From ef174ff12d8f12793eb407c2df49a29ced273154 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 28 Mar 2022 20:37:00 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=20Passenger=20v1.1.0]=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0bus/taxi=20driver=E8=B5=B7=E7=BB=88=E7=82=B93D?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=A7=92=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/fragment/OchBusFragment.java     |  8 +++++++-
 .../taxi/ui/OCHTaxiBeingServerdOrdersFragment.java    | 11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
index 046bc6febd..8c94a1f856 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
@@ -15,9 +15,11 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
+import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.map.MogoMarkerManager;
+import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.module.common.constants.DataTypes;
 import com.mogo.och.bus.R;
@@ -332,7 +334,11 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
                     .icon3DRes(R.raw.start_and_end)
                     .latitude(lat)
                     .longitude(longi);
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options);
+            IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options);
+            marker.setRotateAngle(CallerHDMapManager.INSTANCE.getCenterLineInfo(
+                    longi,lat,-1)
+                    .getAngle()
+                    .floatValue());
         }else {
             CallerLogger.INSTANCE.d("RemoveMapMaker=",uuid+"=latitude="+lat+",longitude="+longi);
             MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).removeMarkers(uuid);
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
index bfd09fec94..47692ff70b 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java
@@ -22,11 +22,13 @@ import com.amap.api.navi.model.NaviLatLng;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.MogoMarkerManager;
+import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.module.common.constants.DataTypes;
 import com.mogo.och.taxi.callback.IOCHTaxiNaviChangedCallback;
@@ -527,7 +529,8 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
      */
     private void setOrRemoveMapMaker(boolean isAdd, String uuid, List<Double> station){
         if (isAdd){
-            CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= ",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));
+            CallerLogger.INSTANCE.d(M_TAXI + "setMapMaker= ",uuid+"=latitude="
+                    +station.get(1)+",longitude="+station.get(0));
 
             MogoMarkerOptions options = new MogoMarkerOptions()
                     .owner(DataTypes.TYPE_MARKER_ADAS)
@@ -538,7 +541,11 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                     .icon3DRes(R.raw.start_and_end)
                     .latitude(station.get(1))
                     .longitude(station.get(0));
-            MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options);
+            IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options);
+            marker.setRotateAngle(CallerHDMapManager.INSTANCE.getCenterLineInfo(
+                    station.get(0),station.get(1),-1)
+                    .getAngle()
+                    .floatValue());
 
         }else {
             CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));