diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt
index 0adbe08c49..b1db9d6a14 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt
@@ -81,6 +81,9 @@ class OfflineMapDialog(context: Context): BaseFloatDialog(context) {
         }
 
         okView?.setOnClickListener {
+            if (isLoading) {
+                CallerMapUIServiceManager.cancelDownloadCacheData()
+            }
             dismiss()
         }
     }
@@ -90,6 +93,12 @@ class OfflineMapDialog(context: Context): BaseFloatDialog(context) {
             override fun onMapHdCacheProgress(cityId: Int, progress: Double) {
                 updateProgress(progress.toInt())
             }
+
+            override fun onMapHdCacheResult(cityId: Int, state: Int) {
+                if (state == 0) {// 失败
+                    showNewContent(isLoading = false, false)
+                }
+            }
         })
     }
 
@@ -131,6 +140,7 @@ class OfflineMapDialog(context: Context): BaseFloatDialog(context) {
 
     @SuppressLint("UseCompatLoadingForDrawables")
     private fun showNewContent(isLoading: Boolean, isSuccess: Boolean) {
+        this.isLoading = isLoading
         change2NewStyle()
         when {
             isLoading -> {
diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle
index 0cf7bfaf30..87b0a3c14a 100644
--- a/core/function-impl/mogo-core-function-map/build.gradle
+++ b/core/function-impl/mogo-core-function-map/build.gradle
@@ -60,7 +60,6 @@ dependencies {
 
     implementation rootProject.ext.dependencies.mogocustommap
     implementation rootProject.ext.dependencies.amapnavi3dmap
-//    implementation rootProject.ext.dependencies.amaplocation
 
     implementation rootProject.ext.dependencies.androidxroomruntime
     kapt rootProject.ext.dependencies.androidxroomcompiler
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt
index 1c5104a623..bf7f44b92b 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt
@@ -46,4 +46,8 @@ object CallerMapUIServiceManager {
     fun getGDLocationServer(context: Context): IMogoGDLocationClient?{
         return serviceProvider?.getGDLocationServer(context)
     }
+
+    fun cancelDownloadCacheData() {
+        serviceProvider?.mapUIController?.cancelDownloadCacheData()
+    }
 }
\ No newline at end of file
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt
index 4761e40fff..9492c60ba7 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt
@@ -2,4 +2,6 @@ package com.mogo.map.hdcache
 
 interface IHdCacheListener {
     fun onMapHdCacheProgress(cityId: Int, progress: Double)
+
+    fun onMapHdCacheResult(cityId: Int, state: Int)// 0失败，1成功
 }
\ No newline at end of file
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
index 8235fe8a36..93093c74f7 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
@@ -358,4 +358,6 @@ public interface IMogoMapUIController {
      * @return
      */
     boolean isCityDataCached();
+
+    void cancelDownloadCacheData();
 }
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
index 68c15404f3..0becb4a9c9 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
@@ -58,6 +58,7 @@ import com.mogo.map.utils.ResIdCache;
 import com.zhidaoauto.map.sdk.open.MapAutoApi;
 import com.zhidaoauto.map.sdk.open.abs.MapStatusListener;
 import com.zhidaoauto.map.sdk.open.abs.OnCameraChangeListener;
+import com.zhidaoauto.map.sdk.open.abs.OnHdDataDownByCityListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapClickListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapLoadedListener;
 import com.zhidaoauto.map.sdk.open.abs.OnMapStyleListener;
@@ -1051,17 +1052,35 @@ public class AMapViewWrapper implements IMogoMapView,
             Integer id = HDMapUtils.getHDCityCode(gdCityCode);
             if (id != null) {
                 hdCacheListener = listener;
-                mMapView.getMapAutoViewHelper().cacheHDDataByCity(id, (cityId, progress) -> {
-                    if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
-                        if (hdCacheListener != null) {
-                            hdCacheListener.onMapHdCacheProgress(cityId, progress * 100);
-                        }
-                    } else {
-                        UiThreadHandler.post(() -> {
+                mMapView.getMapAutoViewHelper().cacheHDDataByCity(id, new OnHdDataDownByCityListener() {
+                    @Override
+                    public void onMapHDDataCacheProgressByCity(int cityId, double progress) {
+                        if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
                             if (hdCacheListener != null) {
                                 hdCacheListener.onMapHdCacheProgress(cityId, progress * 100);
                             }
-                        });
+                        } else {
+                            UiThreadHandler.post(() -> {
+                                if (hdCacheListener != null) {
+                                    hdCacheListener.onMapHdCacheProgress(cityId, progress * 100);
+                                }
+                            });
+                        }
+                    }
+
+                    @Override
+                    public void onMapHDDataCacheStateByCity(int i, int state) {// 0失败，1成功
+                        if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
+                            if (hdCacheListener != null) {
+                                hdCacheListener.onMapHdCacheResult(i, state);
+                            }
+                        } else {
+                            UiThreadHandler.post(() -> {
+                                if (hdCacheListener != null) {
+                                    hdCacheListener.onMapHdCacheResult(i, state);
+                                }
+                            });
+                        }
                     }
                 });
             }
@@ -1086,4 +1105,11 @@ public class AMapViewWrapper implements IMogoMapView,
         }
         return true;
     }
+
+    @Override
+    public void cancelDownloadCacheData() {
+        if (mMapView.getMapAutoViewHelper() != null) {
+            mMapView.getMapAutoViewHelper().cancelCacheHDData();
+        }
+    }
 }
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
index fbbb4ab578..4dca845c89 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
@@ -466,4 +466,11 @@ public class MogoMapUIController implements IMogoMapUIController {
         }
         return true;
     }
+
+    @Override
+    public void cancelDownloadCacheData() {
+        if (mDelegate != null) {
+            mDelegate.cancelDownloadCacheData();
+        }
+    }
 }
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
index f48f36cc66..98bc405067 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
@@ -405,4 +405,11 @@ public class AMapUIController implements IMogoMapUIController {
         }
         return true;
     }
+
+    @Override
+    public void cancelDownloadCacheData() {
+        if (mClient != null) {
+            mClient.cancelDownloadCacheData();
+        }
+    }
 }