Merge branch 'dev_robotaxi-d_240807_6.6.0' into tmp_6.7.0_arrow

libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt

@@ -695,13 +695,15 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr
         if (DEBUG) {
             Log.i(TAG, "destroyop--MapEngine.unload-start")
         }
-        mMapEngine.unload()
         if (DEBUG) {
             Log.i(TAG, "destroyop-mapop-surfaceop----onDetachedFromWindow-over:")
         }
 
     }
 
+    fun unloadEngine() {
+        mMapEngine.unload()
+    }
 
     override fun onSurfaceCreated(gl: GL10, config: EGLConfig) {
         if (DEBUG) {

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt

@@ -647,6 +647,7 @@ open class MapAutoView : FrameLayout, LonLatPointListener, ITraffic,ILockLocatio
         mTrafficHelper = null
         mEventController?.exit()
         mPanelManager = null
+        mMapView?.unloadEngine()
         mMapView = null
         if (CompileConfig.DEBUG) {
             Log.i(TAG, "destroyop--autoop--onDestroy--removeAllViews-start")