From 33252206358c3f09347b42a83ec5e6f900e6ea95 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 28 Apr 2022 18:25:20 +0800
Subject: [PATCH] fixed bug

---
 .../hmi/notification/WarningFloatWindowHelper.kt      |  6 ++++--
 .../core/function/hmi/ui/setting/DebugSettingView.kt  | 11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
index db7881ef3f..4a0ff636b6 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
@@ -89,8 +89,10 @@ internal class WarningFloatWindowHelper(
         // 将浮窗布局文件添加到父容器frameLayout中，并返回该浮窗文件
         val floatingView = config.layoutView?.also {
             try {
-                val parent = (it.parent as ViewGroup)
-                parent.removeAllViews()
+                if (it.parent != null) {
+                    val parent = (it.parent as ViewGroup)
+                    parent.removeAllViews()
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
             }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 623824d7f6..d4d2eb4e49 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -1413,10 +1413,15 @@ class DebugSettingView @JvmOverloads constructor(
             AppConfigInfo.widevineIDMd5 =
                 DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
         }
-        AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
-        AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
+        if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
+            AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
+            AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
+        }
+
         AppConfigInfo.netMode = DebugConfig.getNetMode()
-        AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
+        if (MogoMap.getInstance().mogoMap != null) {
+            AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
+        }
         AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
         AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()