Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
#	app/build.gradle
#	app/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt

@@ -7,7 +7,6 @@ import android.view.View
 import android.view.WindowManager
 import android.view.animation.OvershootInterpolator
 import com.mogo.eagle.core.data.enums.SidePattern
-import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt

@@ -12,5 +12,9 @@ data class UrlConfig(
     @SerializedName("socket_base_url")
     val socketBaseUrl: String,
     @SerializedName("socket_tech_url")
-    val socketTechUrl: String
+    val socketTechUrl: String,
+    @SerializedName("eagle_mis_url")
+    val eagleMisUrl: String,
+    @SerializedName("eagle_dns_url")
+    val eagleDnsUrl: String
 )

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/telematic/TelematicConstant.kt

@@ -0,0 +1,12 @@
+package com.mogo.eagle.core.data.telematic
+
+/**
+ * @author: wangmingjun
+ * @date: 2023/3/3
+ * 供网约车司乘屏通信使用
+ */
+class TelematicConstant {
+    companion object {
+        const val BUSINESS_STRING = 100
+    }
+}

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt

@@ -39,7 +39,7 @@ object MultiDisplayUtils {
         // 获取除了内置屏幕（主屏幕）的其它屏幕
         val displays = mDisplayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION)
         // 初始化新的集合进行接收排序后的屏幕信息,防止数组越界初始化列表相同的集合，集合中会有null，需要在使用判断，null即没有连接屏幕
-        var displaysList = arrayOfNulls<Display>(lcd_sub_port_six_lcd_mode.size)
+        var displaysList = arrayOf<Display?>()
         Log.d(TAG, "displays:$displays")
 
         // 判断副屏个数
@@ -67,10 +67,10 @@ object MultiDisplayUtils {
         // 处理EB5副屏幕
         else {
             if (mDisplayManager.displays.isNotEmpty()) {
-                displaysList = arrayOfNulls(1)
                 // EB5目前副屏幕ID为固定4096
                 for (i in mDisplayManager.displays.indices) {
                     if (mDisplayManager.displays[i].displayId == 4096) {
+                        displaysList = arrayOfNulls(1)
                         displaysList[0] = mDisplayManager.displays[i]
                     }
                 }