From d11f55bbec4044b3a5b60af3cd7afd360ae415d9 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 26 Sep 2023 18:46:29 +0800 Subject: [PATCH] [6.1.0]fix bug of close screen to operate null map instance --- .../main/java/com/mogo/eagle/core/function/main/MainActivity.kt | 2 -- libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt index 61fba3befa..e03ec1d562 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt @@ -349,8 +349,6 @@ open class MainActivity : MvpActivity(), MainView, CallerAutoPilotStatusListenerManager.removeListener(TAG) CallerRequestActivityHandleManager.removeListener(TAG) mogoMapListenerHandler.unregisterHostMapListener(TAG) - val mapUIController = getMapUIController() - mapUIController?.destroy() MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false) d(SceneConstant.M_HMI + TAG, "destroy.") ContextHolderUtil.releaseContext() diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt index 442cd1a3db..b62777654d 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt @@ -47,6 +47,7 @@ class MogoMap private constructor() { fun clear(instance: String = DEFAULT) { if (mapCache.containsKey(instance)) { + mapCache[instance]?.uiController?.destroy() mapCache.remove(instance) } else { CallerLogger.e(