From e17f044f14423e709a21af578331136f718755f0 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 12 Apr 2023 20:07:48 +0800
Subject: [PATCH] =?UTF-8?q?[m2]=20[3.0.0]=20[m2=20=E8=BD=A6=E6=A8=A1?=
 =?UTF-8?q?=E5=81=8F=E7=A7=BB-0.5f]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/launcher/startup/ConfigStartUp.kt    |  6 ++++++
 .../eagle/core/utilcode/mogo/AppIdentityModeUtils.kt   | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
index 9554e1abcb..cbfc3f83a9 100644
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -167,6 +167,12 @@ object ConfigStartUp {
         if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
             mapParams.setShadowEnable(false)
         }
+        if(AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
+            // shuttle m2 车需要偏移
+            if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
+                mapParams.setCarPosition(-0.5f)
+            }
+        }
 
         MapAutoApi.init(context, mapParams)
 
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
index 7e94907e1e..db7cbfc26b 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
@@ -117,6 +117,16 @@ object AppIdentityModeUtils {
         }
         return false
     }
+    /**
+     * 是否是 接驳车（这里不细分具体是：司机、乘客等类型）
+     *
+     * @param appIdentityMode productFlavors 配置的类型
+     * @return true - 是小巴车端 false - 不是小巴车端
+     */
+    @JvmStatic
+    fun isShuttlePassenger(appIdentityMode: String): Boolean {
+        return isShuttle(appIdentityMode) && isPassenger(appIdentityMode)
+    }
     @JvmStatic
     fun isM2(appIdentityMode: String): Boolean {
         val (_, _, model) = getInfo(appIdentityMode)