From 1755755f722b335e7cc8debf90522899e4954c68 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 1 Apr 2022 19:45:41 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=20driver=20V2.6.5]=20=E8=AE=BE=E7=BD=AEta?=
 =?UTF-8?q?xi/bus=20=E7=BD=91=E7=BA=A6=E8=BD=A6maker=20=E4=B8=93=E7=94=A8m?=
 =?UTF-8?q?arker=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/bus/constant/OchBusConst.kt   | 5 +++++
 .../main/java/com/mogo/och/bus/fragment/OchBusFragment.java  | 5 +----
 .../src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt | 5 +++++
 .../mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java  | 3 +--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt
index da4113702f..5f07d5d097 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/constant/OchBusConst.kt
@@ -58,5 +58,10 @@ class OchBusConst {
         const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false
         const val EVENT_PARAM_PLATE_NUM = "plate_number" // 车牌号
         const val EVENT_PARAM_ENV_ONLINE = "env_online" // 是否线上环境：true/false
+
+        /**
+         * 订单起终点Marker类型
+         */
+        const val TYPE_MARKER_BUS_ORDER = "TYPE_MARKER_BUS_ORDER"
     }
 }
\ No newline at end of file
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 8c94a1f856..c44cba062b 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
@@ -3,8 +3,6 @@ package com.mogo.och.bus.fragment;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
 
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.view.View;
 import android.widget.TextView;
 
@@ -21,7 +19,6 @@ 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;
 import com.mogo.och.bus.bean.OchBusStation;
 import com.mogo.och.bus.constant.OchBusConst;
@@ -326,7 +323,7 @@ public class OchBusFragment extends BaseOchBusTabFragment<OchBusFragment, OchBus
             CallerLogger.INSTANCE.d("setMapMaker= ", uuid + "=latitude=" + lat + ",longitude=" + longi);
 
             MogoMarkerOptions options = new MogoMarkerOptions()
-                    .owner(DataTypes.TYPE_MARKER_ADAS)
+                    .owner(OchBusConst.TYPE_MARKER_BUS_ORDER)
                     .anchor(0.5f, 0.5f)
                     .set3DMode(true)
                     .gps(true)
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt
index 7db638b41e..9102614a1f 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/OCHTaxiConst.kt
@@ -66,5 +66,10 @@ class OCHTaxiConst {
 
         //总里程/平均车速。（bus的平均里程：25km/h，taxi的平均里程：38km/h），单位为：分钟，不足1分钟时，显示1分钟。
         const val TAXI_AVERAGE_SPEED = 38
+
+        /**
+         * 订单起终点Marker类型
+         */
+        const val TYPE_MARKER_TAXI_ORDER = "TYPE_MARKER_TAXI_ORDER"
     }
 }
\ No newline at end of file
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 668a2ab344..5eee71e8eb 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
@@ -28,7 +28,6 @@ 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;
 import com.mogo.och.taxi.constant.OCHTaxiConst;
 import com.mogo.och.taxi.constant.OrderStatusEnum;
@@ -559,7 +558,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem
                     +station.get(1)+",longitude="+station.get(0));
 
             MogoMarkerOptions options = new MogoMarkerOptions()
-                    .owner(DataTypes.TYPE_MARKER_ADAS)
+                    .owner(OCHTaxiConst.TYPE_MARKER_TAXI_ORDER)
                     .anchor(0.5f, 0.5f)
                     .set3DMode(true)
                     .gps(true)