Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317

app/build.gradle

@@ -202,6 +202,10 @@ android {
         targetCompatibility 1.8
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }

app/config/tempConfig.json

@@ -159,6 +159,12 @@
           "type": 1,
           "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
           "title": "1"
+        },
+        {
+          "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
+          "type": 1,
+          "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
+          "title": "2"
         }
       ]
     },

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)