From aa4f03d91e913fcc372da8d18300454d94ba7ffd Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 11 Mar 2024 18:32:29 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0][Fix]=E8=A7=A3=E5=86=B3=E9=AB=98?=
 =?UTF-8?q?=E7=B2=BE=E5=9C=B0=E5=9B=BE=E5=8F=96=E6=B6=88=E5=90=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=B8=8B=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt
index c8cfcc4621..ef3a291b02 100644
--- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt
+++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt
@@ -92,9 +92,6 @@ class RoadHelper private constructor() {
         cacheHdDataProgressJob?.cancel()
         cacheHdDataProgressJob = null
 
-        mHdDataDownloadListener?.clear()
-        mHdDataDownloadListener = null
-
         cancelCacheHDData()
 
         hdMapProvider.release()
@@ -995,7 +992,7 @@ class RoadHelper private constructor() {
         return key
     }
 
-    fun cancelCacheHDData() {
+    private fun cancelJob() {
         cacheHdDataProgressJob?.cancel()
         cacheList.clear()
         RoadResultController.instance.removeRoadResultListenerByTag("cacheHDDataBy")
@@ -1003,6 +1000,12 @@ class RoadHelper private constructor() {
         mapBox.cancelCacheHDData()
     }
 
+    fun cancelCacheHDData() {
+        mHdDataDownloadListener?.clear()
+        mHdDataDownloadListener = null
+        cancelJob()
+    }
+
     fun removeRoadApiKey(key:String){
         RoadResultController.instance.removeRoadResultListener(key)
     }
@@ -1174,7 +1177,7 @@ class RoadHelper private constructor() {
             return
         }
 
-        cancelCacheHDData()
+        cancelJob()
         cacheList.add(id)
         cacheHDDataResultByCity(id,isCanCancel,object : IResult<Boolean> {
             override fun result(code: Int, result: Boolean?) {