From 5bde1bc81ead32127815e06bf4b400335816bb09 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Thu, 2 Mar 2023 20:06:23 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[=201?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=B1=8F=E5=B9=95=E5=9B=A0?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=B1=8F=E5=B9=95=E6=A0=91=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=A4=9F=E5=AF=BC=E8=87=B4=E5=90=AF=E5=8A=A8=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=20]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../location/MoGoLocationDispatcher.kt        |  2 --
 .../src/main/AndroidManifest.xml              | 32 +++----------------
 .../core/utilcode/util/MultiDisplayUtils.kt   |  7 ++--
 3 files changed, 8 insertions(+), 33 deletions(-)

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">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <!--调试用，暂时开启LAUNCHER这个属性-->
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER_APP" />
-                <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <!--调试用，暂时开启LAUNCHER这个属性-->
+                <category android:name="android.intent.category.HOME" />
             </intent-filter>
             <intent-filter>
                 <data
@@ -95,23 +95,7 @@
             android:stateNotNeeded="true"
             android:theme="@style/Main"
             android:windowSoftInputMode="adjustPan|stateHidden">
-            <!--<intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                &lt;!&ndash;调试用，暂时开启LAUNCHER这个属性&ndash;&gt;
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LAUNCHER_APP" />
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>-->
-            <intent-filter>
-                <data
-                    android:host="launcher"
-                    android:path="/main/switch2"
-                    android:scheme="mogo" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
+
         </activity>
 
         <activity
@@ -126,15 +110,7 @@
             android:stateNotNeeded="true"
             android:theme="@style/Main"
             android:windowSoftInputMode="adjustPan|stateHidden">
-            <intent-filter>
-                <data
-                    android:host="launcher"
-                    android:path="/main/switch2"
-                    android:scheme="mogo" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
+
         </activity>
 
         <activity
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt
index 4010261abe..878e1127c9 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt
@@ -38,12 +38,13 @@ object MultiDisplayUtils {
             Utils.getApp().getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
         // 获取除了内置屏幕（主屏幕）的其它屏幕
         val displays = mDisplayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION)
-        // 初始化新的集合进行接收排序后的屏幕信息
-        var displaysList = arrayOfNulls<Display>(displays.size)
+        // 初始化新的集合进行接收排序后的屏幕信息,防止数组越界初始化列表相同的集合，集合中会有null，需要在使用判断，null即没有连接屏幕
+        var displaysList = arrayOfNulls<Display>(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]