diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt index bc5dfa9d16..af3b0af188 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt @@ -11,7 +11,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.map.CallerGaoDeMapLocationListenerManager import com.mogo.eagle.core.function.call.obu.CallerObuLocationWGS84ListenerManager -import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import mogo.telematics.pad.MessagePad @@ -93,7 +92,6 @@ object MoGoLocationDispatcher : DataSourceType.TELEMATIC ) } - MultiDisplayUtils.getOtherDisplay() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml index d63465a300..80b72654c5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml @@ -66,11 +66,11 @@ android:windowSoftInputMode="adjustPan|stateHidden"> - - + + - - - - - - - + - - - - - - + (displays.size) + // 初始化新的集合进行接收排序后的屏幕信息,防止数组越界初始化列表相同的集合,集合中会有null,需要在使用判断,null即没有连接屏幕 + var displaysList = arrayOfNulls(lcd_sub_port_six_lcd_mode.size) + Log.d(TAG, "displays:$displays") // 判断副屏个数 if (displays.isNotEmpty()) { - displaysList = arrayOfNulls(displays.size) + displaysList = arrayOfNulls(lcd_sub_port_six_lcd_mode.size) // 循环出来副屏幕进行重新排序 for (i in displays.indices) { // 这里如果需要固定某个屏幕, 使用 if( display.toString().indexOf("port=1")!=-1) ) 而不是使用 display[i]