Merge branch 'dev_robotaxi-d_230612_3.3.0' into dev_saasbus-d_230607_from3.2.0

# Conflicts:
#	gradle.properties

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -36,6 +36,7 @@ object ConfigStartUp {
         AppConfigInfo.workingBranchName = BuildConfig.WORKING_BRANCH_NAME
         AppConfigInfo.workingBranchHash = BuildConfig.WORKING_BRANCH_HASH
         AppConfigInfo.appBuildTime = BuildConfig.APP_BUILD_TIME
+        AppConfigInfo.flavor = BuildConfig.FLAVOR
         // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle  GPS_PROVIDER  0-Android系统，1-工控机，2-OBU
         FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER
         // 演示模式,上一次勾选的数据
@@ -133,7 +134,6 @@ object ConfigStartUp {
         val mapParams = MapParams.init()
         mapParams.setDebugMode(false) // 1-使用本地地图数据，0-使用在线地图数据
             //.setDataFileSource(1)
-            .setDebugMode(false)
             .setIsRecordLogs(false)
             .setCoordinateType(MapParams.COORDINATETYPE_GCJ02)
             .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_UP_CAR)