diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index a38c367..e810ac2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -52,7 +52,9 @@ jobs:
           artifactErrorsFailBuild: true
           body:  |
             ### 功能更新
-            - 处理MapView内存泄露问题，onDispose不可靠，Lifecycle.Event.ON_DESTROY中也要做地图销毁处理
+            - 处理高德地图内存泄露问题
+            - 百度地图同高德地图在MapApplier中移除对MapView的引用
+            - 升级Compose版本和JDK版本
           token: ${{ secrets.github_token }}
           commit: master
           # tag名称
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index ca648d5..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-OmniMap
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 31e055c..0b39407 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/README.md b/README.md
index dba76d1..8151d1f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 OmniMap Compose 🗺
 ===============
-<a href="https://github.com/TheMelody/OmniMap-Compose/blob/main/LICENSE"><img alt="LICENSE" src="https://img.shields.io/github/license/TheMelody/OmniMap-Compose"/></a>  <img alt="issues" src="https://img.shields.io/github/issues/TheMelody/OmniMap-Compose?color=important"/>  <img alt="forks" src="https://img.shields.io/github/forks/TheMelody/OmniMap-Compose?color=blueviolet"/>  <img alt="stars" src="https://img.shields.io/github/stars/TheMelody/OmniMap-Compose?color=success"/>  <a href="https://juejin.cn/user/8451824316670/posts"><img alt="稀土掘金" src="https://img.shields.io/badge/%E7%A8%80%E5%9C%9F%E6%8E%98%E9%87%91-392-green?labelColor=%231e80FF&color=black" ></a>  <a href="https://www.zhihu.com/people/fq_halifax"><img src="https://img.shields.io/badge/dynamic/json?color=282c34&amp;labelColor=0084ff&amp;label=%E7%9F%A5%E4%B9%8E%E5%85%B3%E6%B3%A8&amp;query=%24.data.totalSubs&amp;url=https%3A%2F%2Fapi.spencerwoo.com%2Fsubstats%2F%3Fsource%3Dzhihu%26queryKey%3Dfq_halifax&amp;longCache=true" alt="知乎"></a>  <a href="https://blog.csdn.net/logicsboy"><img src="https://img.shields.io/badge/CSDN-3k+-red?labelColor=%231e80FF&color=black" alt="CSDN"></a>
+<a href="https://github.com/TheMelody/OmniMap-Compose/blob/main/LICENSE"><img alt="LICENSE" src="https://img.shields.io/github/license/TheMelody/OmniMap-Compose"/></a>  <img alt="issues" src="https://img.shields.io/github/issues/TheMelody/OmniMap-Compose?color=important"/>  <img alt="forks" src="https://img.shields.io/github/forks/TheMelody/OmniMap-Compose?color=blueviolet"/>  <img alt="stars" src="https://img.shields.io/github/stars/TheMelody/OmniMap-Compose?color=success"/>  <a href="https://juejin.cn/user/8451824316670/posts"><img alt="稀土掘金" src="https://img.shields.io/badge/%E7%A8%80%E5%9C%9F%E6%8E%98%E9%87%91-432-green?labelColor=%231e80FF&color=black" ></a>  <a href="https://www.zhihu.com/people/fq_halifax"><img src="https://img.shields.io/badge/dynamic/json?color=282c34&amp;labelColor=0084ff&amp;label=%E7%9F%A5%E4%B9%8E&amp;query=%24.data.totalSubs&amp;url=https%3A%2F%2Fapi.spencerwoo.com%2Fsubstats%2F%3Fsource%3Dzhihu%26queryKey%3Dfq_halifax&amp;longCache=true" alt="知乎"></a>  <a href="https://blog.csdn.net/logicsboy"><img src="https://img.shields.io/badge/CSDN-3k+-red?labelColor=%231e80FF&color=black" alt="CSDN"></a>
 
 **Compose一键集成5大地图神器**
 
@@ -10,13 +10,13 @@ OmniMap Compose 🗺
 -------
 <table>
  <tr>
-  <td>gd_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/gd_compose?versionPrefix=1.0.4"></td>
+  <td>gd_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/gd_compose?versionPrefix=1.0.5"></td>
  </tr>
  <tr>
-  <td>tencent_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/tencent_compose?versionPrefix=1.0.4"></td>
+  <td>tencent_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/tencent_compose?versionPrefix=1.0.5"></td>
  </tr>
  <tr>
-  <td>baidu_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/baidu_compose?versionPrefix=1.0.4"></td>
+  <td>baidu_compose</td><td><img alt="Maven Central" src="https://img.shields.io/maven-central/v/io.github.TheMelody/baidu_compose?versionPrefix=1.0.5"></td>
  </tr>
 </table>
 
diff --git a/baidu-map-compose/build.gradle b/baidu-map-compose/build.gradle
index bfbff3a..9fcf1a2 100644
--- a/baidu-map-compose/build.gradle
+++ b/baidu-map-compose/build.gradle
@@ -26,25 +26,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
     lint {
+        checkReleaseBuilds false
         abortOnError false
     }
 }
 
 dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     // 地图组件
     api 'com.baidu.lbsyun:BaiduMapSDK_Map:7.5.8'
 }
\ No newline at end of file
diff --git a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/BDMap.kt b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/BDMap.kt
index c79be8e..f94318b 100644
--- a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/BDMap.kt
+++ b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/BDMap.kt
@@ -91,7 +91,10 @@ fun BDMap(
     val mapView = remember {
         MapView(context, bdMapOptionsFactory())
     }
-    AndroidView(modifier = modifier, factory = { mapView })
+    AndroidView(modifier = modifier, factory = { mapView }, onRelease = {
+        runCatching { it.onDestroy() }
+        it.removeAllViews()
+    })
     MapLifecycle(mapView)
     val mapClickListeners = remember { MapClickListeners() }.also {
         it.onMapLoaded = onMapLoaded
@@ -111,6 +114,7 @@ fun BDMap(
         disposingComposition {
             mapView.newComposition(parentComposition) {
                 MapUpdater(
+                    mapView = mapView,
                     mapUiSettings = currentUiSettings,
                     clickListeners = mapClickListeners,
                     locationSource = currentLocationSource,
@@ -138,7 +142,7 @@ private suspend inline fun MapView.newComposition(
 ): Composition {
     val map = awaitMap()
     return Composition(
-        MapApplier(map, this), parent
+        MapApplier(map, this.context.applicationContext), parent
     ).apply {
         setContent(content)
     }
@@ -161,7 +165,7 @@ private fun MapLifecycle(mapView: MapView) {
     DisposableEffect(mapView) {
         onDispose {
             // fix memory leak
-            mapView.onDestroy()
+            runCatching { mapView.onDestroy() }
             mapView.removeAllViews()
         }
     }
@@ -180,11 +184,6 @@ private fun MapView.lifecycleObserver(previousState: MutableState<Lifecycle.Even
             }
             Lifecycle.Event.ON_RESUME -> this.onResume()
             Lifecycle.Event.ON_PAUSE -> this.onPause()
-            Lifecycle.Event.ON_DESTROY -> {
-                // fix memory leak
-                this.onDestroy()
-                this.removeAllViews()
-            }
             else -> { /* ignore */ }
         }
         previousState.value = event
diff --git a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapApplier.kt b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapApplier.kt
index 94f7630..b3509d8 100644
--- a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapApplier.kt
+++ b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapApplier.kt
@@ -22,6 +22,7 @@
 
 package com.melody.map.baidu_compose
 
+import android.content.Context
 import androidx.compose.runtime.*
 import com.baidu.mapapi.map.BaiduMap
 import com.baidu.mapapi.map.MapView
@@ -51,11 +52,11 @@ private object MapNodeRoot : MapNode
 
 internal class MapApplier(
     val map: BaiduMap,
-    val mapView: MapView,
+    mapContext: Context,
 ) : AbstractApplier<MapNode>(MapNodeRoot) {
     private val decorations = mutableListOf<MapNode>()
     private var enableMultipleInfoWindow: Boolean = false
-    private val infoWindowAdapter = ComposeInfoWindowAdapter(mapView)
+    private val infoWindowAdapter = ComposeInfoWindowAdapter(mapContext)
 
     init {
         attachClickListeners()
diff --git a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapUpdater.kt b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapUpdater.kt
index 460758b..11655b7 100644
--- a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapUpdater.kt
+++ b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/MapUpdater.kt
@@ -35,6 +35,7 @@ import com.baidu.mapapi.map.BaiduMap.OnMapStatusChangeListener
 import com.baidu.mapapi.map.MapPoi
 import com.baidu.mapapi.map.MapStatus
 import com.baidu.mapapi.map.MapStatusUpdateFactory
+import com.baidu.mapapi.map.MapView
 import com.baidu.mapapi.map.MyLocationData
 import com.baidu.mapapi.model.LatLng
 import com.melody.map.baidu_compose.model.BDCameraPosition
@@ -118,6 +119,7 @@ internal class MapPropertiesNode(
 @Suppress("NOTHING_TO_INLINE")
 @Composable
 internal inline fun MapUpdater(
+    mapView: MapView,
     mapUiSettings: MapUiSettings,
     clickListeners: MapClickListeners,
     locationSource: MyLocationData?,
@@ -126,7 +128,6 @@ internal inline fun MapUpdater(
 ) {
     val mapApplier = currentComposer.applier as MapApplier
     val map = mapApplier.map
-    val mapView = mapApplier.mapView
     val density = LocalDensity.current
     val layoutDirection = LocalLayoutDirection.current
     ComposeNode<MapPropertiesNode, MapApplier>(
diff --git a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/adapter/ComposeInfoWindowAdapter.kt b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/adapter/ComposeInfoWindowAdapter.kt
index d137332..23d24b7 100644
--- a/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/adapter/ComposeInfoWindowAdapter.kt
+++ b/baidu-map-compose/src/main/java/com/melody/map/baidu_compose/adapter/ComposeInfoWindowAdapter.kt
@@ -22,11 +22,13 @@
 
 package com.melody.map.baidu_compose.adapter
 
+import android.content.Context
 import android.content.res.Resources
 import android.graphics.Color
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.Space
 import android.widget.TextView
@@ -34,7 +36,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionContext
 import androidx.compose.ui.platform.ComposeView
 import com.baidu.mapapi.map.InfoWindow
-import com.baidu.mapapi.map.MapView
 import com.melody.map.baidu_compose.R
 import com.melody.map.baidu_compose.extensions.getInfoWindowYOffset
 import com.melody.map.baidu_compose.extensions.getSnippetExt
@@ -43,18 +44,7 @@ import com.melody.map.baidu_compose.overlay.ClusterOverlayNode
 import com.melody.map.baidu_compose.overlay.MarkerNode
 import com.melody.map.baidu_compose.utils.clustering.ClusterItem
 
-internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
-
-    private val infoWindowView: ComposeView
-        get() = ComposeView(mapView.context).apply {
-            mapView.addView(
-                this,
-                ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.WRAP_CONTENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-                )
-            )
-        }
+internal class ComposeInfoWindowAdapter(private val mapContext: Context) {
 
     fun getInfoContents(markerNode: MarkerNode): InfoWindow {
         val infoContent = markerNode.infoContent
@@ -63,7 +53,7 @@ internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
             val snippet = markerNode.marker.getSnippetExt()
             getDefaultInfoContent(title, snippet)
         } else {
-            infoWindowView.applyAndRemove(false, markerNode.compositionContext) {
+            applyAndRemove(false, markerNode.compositionContext) {
                 infoContent(markerNode.marker)
             }
         }
@@ -76,7 +66,7 @@ internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
 
     fun getInfoWindow(markerNode: MarkerNode): InfoWindow {
         val infoWindow = markerNode.infoWindow!!
-        val view = infoWindowView.applyAndRemove(true, markerNode.compositionContext) {
+        val view = applyAndRemove(true, markerNode.compositionContext) {
             infoWindow(markerNode.marker)
         }
         return InfoWindow(
@@ -87,7 +77,7 @@ internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
     }
 
     fun getInfoWindow(clusterItem: ClusterItem, clusterItemNode: ClusterOverlayNode): InfoWindow {
-        val view = infoWindowView.applyAndRemove(true, clusterItemNode.compositionContext) {
+        val view = applyAndRemove(true, clusterItemNode.compositionContext) {
             clusterItemNode.onClusterItemInfoWindow?.invoke(clusterItem)
         }
         return InfoWindow(
@@ -97,30 +87,38 @@ internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
         )
     }
 
-    private fun ComposeView.applyAndRemove(
+    private fun applyAndRemove(
         fromInfoWindow: Boolean,
         parentContext: CompositionContext,
         content: @Composable () -> Unit
-    ): ComposeView {
-        val result = this.apply {
-            setParentCompositionContext(parentContext)
-            setContent {
+    ):  ViewGroup{
+        return FrameLayout(mapContext).apply {
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+            if (fromInfoWindow) {
+                // 去除地图默认气泡背景, 如果是InfoContent，则只定制内容，不修改窗口背景和样式
                 setBackgroundColor(Color.TRANSPARENT)
-                if (!fromInfoWindow) {
-                    setBackgroundResource(R.drawable.infowindow_bg)
-                }
-                content.invoke()
+            }else {
+                setBackgroundResource(R.drawable.infowindow_bg)
             }
+            addView(
+                ComposeView(mapContext).apply {
+                    setParentCompositionContext(parentContext)
+                    setContent {
+                        content.invoke()
+                    }
+                }
+            )
         }
-        (this.parent as? MapView)?.removeView(this)
-        return result
     }
 
     /**
      * 针对普通的Marker
      */
     private fun getDefaultInfoContent(title: String?,snippet: String?): LinearLayout {
-        return LinearLayout(mapView.context).apply {
+        return LinearLayout(mapContext).apply {
             layoutParams = LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT
@@ -129,7 +127,7 @@ internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
             orientation = LinearLayout.VERTICAL
             if (title?.isNotBlank() == true) {
                 addView(
-                    TextView(mapView.context).apply {
+                    TextView(mapContext).apply {
                         gravity = Gravity.CENTER
                         setTextSize(TypedValue.COMPLEX_UNIT_SP, 10f)
                         setTextColor(Color.BLACK)
@@ -138,7 +136,7 @@ internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
                 )
             }
             addView(
-                Space(mapView.context).apply {
+                Space(mapContext).apply {
                     layoutParams = LinearLayout.LayoutParams(
                         LinearLayout.LayoutParams.MATCH_PARENT,
                         LinearLayout.LayoutParams.WRAP_CONTENT
@@ -148,7 +146,7 @@ internal class ComposeInfoWindowAdapter(private val mapView: MapView) {
             )
             if (snippet?.isNotBlank() == true) {
                 addView(
-                    TextView(mapView.context).apply {
+                    TextView(mapContext).apply {
                         gravity = Gravity.CENTER
                         setTextSize(TypedValue.COMPLEX_UNIT_SP, 10f)
                         setTextColor(Color.BLACK)
diff --git a/build.gradle b/build.gradle
index 4dbd19b..61ece28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        compose_version = '1.3.3'
+        compose_version = '1.5.0-beta03'
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
diff --git a/gd-map-compose/build.gradle b/gd-map-compose/build.gradle
index e49a458..707909c 100644
--- a/gd-map-compose/build.gradle
+++ b/gd-map-compose/build.gradle
@@ -25,25 +25,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
     lint {
+        checkReleaseBuilds false
         abortOnError false
     }
 }
 
 dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
 
     // 高德地图3d
     api 'com.amap.api:3dmap:9.7.0'
diff --git a/gd-map-compose/src/main/java/com/melody/map/gd_compose/GDMap.kt b/gd-map-compose/src/main/java/com/melody/map/gd_compose/GDMap.kt
index 7ffd73a..3dda20c 100644
--- a/gd-map-compose/src/main/java/com/melody/map/gd_compose/GDMap.kt
+++ b/gd-map-compose/src/main/java/com/melody/map/gd_compose/GDMap.kt
@@ -37,7 +37,6 @@ import androidx.lifecycle.LifecycleEventObserver
 import com.amap.api.maps.AMapOptions
 import com.amap.api.maps.LocationSource
 import com.amap.api.maps.MapView
-import com.amap.api.maps.model.IndoorBuildingInfo
 import com.amap.api.maps.model.LatLng
 import com.amap.api.maps.model.Poi
 import com.melody.map.gd_compose.extensions.awaitMap
@@ -56,7 +55,7 @@ import kotlinx.coroutines.awaitCancellation
  *
  * @param modifier [Modifier]修饰符
  * @param cameraPositionState 地图相机位置状态[CameraPositionState]
- * @param aMapOptionsFactory 可以传百度地图[AMapOptions]参数，如离线地图开关等。
+ * @param aMapOptionsFactory 可以传高德地图[AMapOptions]参数，如离线地图开关等。
  * @param properties 地图属性配置[MapProperties]
  * @param uiSettings 地图SDK UI配置[MapUiSettings]
  * @param locationSource 设置定位数据, 只有先允许定位图层后设置数据才会生效，参见: [com.melody.map.gd_compose.poperties.MapProperties.isMyLocationEnabled]
@@ -95,7 +94,10 @@ fun GDMap(
     val mapView = remember {
         MapView(context, aMapOptionsFactory())
     }
-    AndroidView(modifier = modifier, factory = { mapView })
+    AndroidView(modifier = modifier, factory = { mapView }, onRelease = {
+        it.onDestroy()
+        it.removeAllViews()
+    })
     MapLifecycle(mapView)
     val mapClickListeners = remember { MapClickListeners() }.also {
         it.onMapLoaded = onMapLoaded
@@ -143,7 +145,7 @@ private suspend inline fun MapView.newComposition(
 ): Composition {
     val map = awaitMap()
     return Composition(
-        MapApplier(map, this), parent
+        MapApplier(map, this.context.applicationContext), parent
     ).apply {
         setContent(content)
     }
@@ -188,11 +190,6 @@ private fun MapView.lifecycleObserver(previousState: MutableState<Lifecycle.Even
             }
             Lifecycle.Event.ON_RESUME -> this.onResume()
             Lifecycle.Event.ON_PAUSE -> this.onPause()
-            Lifecycle.Event.ON_DESTROY -> {
-                // fix memory leak
-                this.onDestroy()
-                this.removeAllViews()
-            }
             else -> { /* ignore */ }
         }
         previousState.value = event
diff --git a/gd-map-compose/src/main/java/com/melody/map/gd_compose/MapApplier.kt b/gd-map-compose/src/main/java/com/melody/map/gd_compose/MapApplier.kt
index 03a2ab0..95d5976 100644
--- a/gd-map-compose/src/main/java/com/melody/map/gd_compose/MapApplier.kt
+++ b/gd-map-compose/src/main/java/com/melody/map/gd_compose/MapApplier.kt
@@ -22,9 +22,9 @@
 
 package com.melody.map.gd_compose
 
+import android.content.Context
 import androidx.compose.runtime.*
 import com.amap.api.maps.AMap
-import com.amap.api.maps.MapView
 import com.amap.api.maps.model.Marker
 import com.amap.api.maps.model.MultiPointItem
 import com.amap.api.maps.model.Polyline
@@ -46,7 +46,7 @@ private object MapNodeRoot : MapNode
 
 internal class MapApplier(
     val map: AMap,
-    private val mapView: MapView,
+    private val mapContext: Context,
 ) : AbstractApplier<MapNode>(MapNodeRoot) {
 
     private val decorations = mutableListOf<MapNode>()
@@ -132,7 +132,7 @@ internal class MapApplier(
         // 设置InfoWindow内容
         map.setInfoWindowAdapter(
             ComposeInfoWindowAdapter(
-                mapView,
+                mapContext,
                 markerNodeFinder = {
                     decorations.nodeForMarker(it)
                 }
diff --git a/gd-map-compose/src/main/java/com/melody/map/gd_compose/adapter/ComposeInfoWindowAdapter.kt b/gd-map-compose/src/main/java/com/melody/map/gd_compose/adapter/ComposeInfoWindowAdapter.kt
index 34cf2b1..7ee9880 100644
--- a/gd-map-compose/src/main/java/com/melody/map/gd_compose/adapter/ComposeInfoWindowAdapter.kt
+++ b/gd-map-compose/src/main/java/com/melody/map/gd_compose/adapter/ComposeInfoWindowAdapter.kt
@@ -27,6 +27,7 @@ import android.graphics.Color
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.Space
 import android.widget.TextView
@@ -34,39 +35,27 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionContext
 import androidx.compose.ui.platform.ComposeView
 import com.amap.api.maps.AMap
-import com.amap.api.maps.MapView
 import com.amap.api.maps.model.Marker
 import com.melody.map.gd_compose.overlay.MarkerNode
 
 internal class ComposeInfoWindowAdapter(
-    private val mapView: MapView,
+    private val mapContext: Context,
     private val markerNodeFinder: (Marker) -> MarkerNode?
 ) : AMap.InfoWindowAdapter {
 
-    private val infoWindowView: ComposeView
-        get() = ComposeView(mapView.context).apply {
-            mapView.addView(
-                this,
-                ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.WRAP_CONTENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-                )
-            )
-        }
-
     override fun getInfoContents(marker: Marker): View? {
         // https://lbs.amap.com/api/android-sdk/guide/draw-on-map/draw-marker
         // 当实现此方法并返回有效值时（返回值不为空，则视为有效）,SDK 将不会使用默认的样式，而采用此方法返回的样式
-        val markerNode = markerNodeFinder(marker) ?: return Space(mapView.context)
+        val markerNode = markerNodeFinder(marker) ?: return Space(mapContext)
         val infoContent  = markerNode.infoContent
         if (infoContent == null) { // 这里返回null，是处理getInfoWindow这2个方法谁返回视图的并显示冲突的问题
             if(markerNode.infoWindow == null){
                 // 由于上面返回了一个SpaceView，这里返回一个，啥都没有设置的默认视图内容
-                return getDefaultInfoContent(marker, mapView.context)
+                return getDefaultInfoContent(marker, mapContext)
             }
             return null
         }
-        return infoWindowView.applyAndRemove(false,markerNode.compositionContext) {
+        return applyAndRemove(false ,markerNode.compositionContext) {
             infoContent(marker)
         }
     }
@@ -74,12 +63,12 @@ internal class ComposeInfoWindowAdapter(
     override fun getInfoWindow(marker: Marker): View? {
         // https://lbs.amap.com/api/android-sdk/guide/draw-on-map/draw-marker
         // 当实现此方法并返回有效值时（返回值不为空，则视为有效）,SDK 将不会使用默认的样式，而采用此方法返回的样式
-        val markerNode = markerNodeFinder(marker) ?: return Space(mapView.context)
+        val markerNode = markerNodeFinder(marker) ?: return Space(mapContext)
         val infoWindow  = markerNode.infoWindow
         if (infoWindow == null) { // 这里返回null，是处理getInfoContents这2个方法谁返回视图的并显示冲突的问题
             return null
         }
-        return infoWindowView.applyAndRemove(true,markerNode.compositionContext) {
+        return applyAndRemove(true,markerNode.compositionContext) {
             infoWindow(marker)
         }
     }
@@ -107,22 +96,28 @@ internal class ComposeInfoWindowAdapter(
         }
     }
 
-    private fun ComposeView.applyAndRemove(
+    private fun applyAndRemove(
         fromInfoWindow: Boolean,
         parentContext: CompositionContext,
         content: @Composable () -> Unit
-    ): ComposeView {
-        val result = this.apply {
-            setParentCompositionContext(parentContext)
-            setContent {
-                if(fromInfoWindow) {
-                    // 去除地图默认气泡背景, 如果是InfoContent，则只定制内容，不修改窗口背景和样式
-                    setBackgroundColor(Color.TRANSPARENT)
-                }
-                content.invoke()
+    ): ViewGroup {
+        return FrameLayout(mapContext).apply {
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+            if(fromInfoWindow) {
+                // 去除地图默认气泡背景, 如果是InfoContent，则只定制内容，不修改窗口背景和样式
+                setBackgroundColor(Color.TRANSPARENT)
             }
+            addView(
+                ComposeView(mapContext).apply {
+                    setParentCompositionContext(parentContext)
+                    setContent {
+                        content.invoke()
+                    }
+                }
+            )
         }
-        (this.parent as? MapView)?.removeView(this)
-        return result
     }
 }
\ No newline at end of file
diff --git a/gradle_map.properties b/gradle_map.properties
index 233dd15..6b4b309 100644
--- a/gradle_map.properties
+++ b/gradle_map.properties
@@ -10,4 +10,4 @@ MIN_SDK_VERSION = 21
 HUAWEI_MIN_SDK_VERSION = 24
 
 # publish maven central library version_name
-LIB_VERSION_NAME = 1.0.4
\ No newline at end of file
+LIB_VERSION_NAME = 1.0.5
\ No newline at end of file
diff --git a/sample-baidu/build.gradle b/sample-baidu/build.gradle
index 8a5b610..7860b92 100644
--- a/sample-baidu/build.gradle
+++ b/sample-baidu/build.gradle
@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdk rootProject.ext.libraryInfo.minSdk
         targetSdk rootProject.ext.libraryInfo.targetSdk
-        versionCode 104
-        versionName "1.0.4"
+        versionCode 105
+        versionName "1.0.5"
 
         vectorDrawables {
             useSupportLibrary true
@@ -46,26 +46,30 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
-
-    android.applicationVariants.all { variant ->
-        variant.outputs.all {
+    lint {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+    android.applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach {
             outputFileName = "baidu_${defaultConfig.versionName}_${formattedDate}-${variant.buildType.name}.apk"
         }
     }
@@ -83,5 +87,6 @@ dependencies {
     implementation 'com.baidu.lbsyun:BaiduMapSDK_Search:7.5.8'
     // 工具组件
     implementation 'com.baidu.lbsyun:BaiduMapSDK_Util:7.5.8'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
 }
\ No newline at end of file
diff --git a/sample-common/build.gradle b/sample-common/build.gradle
index 12735dd..de04a4b 100644
--- a/sample-common/build.gradle
+++ b/sample-common/build.gradle
@@ -24,14 +24,15 @@ android {
         compose true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     composeOptions {
         kotlinCompilerExtensionVersion "1.3.2"
+        kotlinCompilerVersion "1.7.10"
     }
     packagingOptions {
         resources {
@@ -43,9 +44,9 @@ android {
 dependencies {
     api "androidx.compose.runtime:runtime:$compose_version"
     api 'androidx.core:core-ktx:1.8.0'
-    api 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    api 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
-    api 'androidx.activity:activity-compose:1.5.1'
-    api "com.google.accompanist:accompanist-permissions:0.26.2-beta"
-    api "androidx.startup:startup-runtime:1.2.0-alpha01"
+    api 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    api 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
+    api 'androidx.activity:activity-compose:1.6.1'
+    api "com.google.accompanist:accompanist-permissions:0.31.5-beta"
+    api "androidx.startup:startup-runtime:1.2.0-alpha02"
 }
\ No newline at end of file
diff --git a/sample-gaode/build.gradle b/sample-gaode/build.gradle
index 7b52a6d..a0b0459 100644
--- a/sample-gaode/build.gradle
+++ b/sample-gaode/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.melody.map.myapplication"
         minSdk rootProject.ext.libraryInfo.minSdk
         targetSdk rootProject.ext.libraryInfo.targetSdk
-        versionCode 104
-        versionName "1.0.4"
+        versionCode 105
+        versionName "1.0.5"
 
         vectorDrawables {
             useSupportLibrary true
@@ -46,26 +46,30 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
-
-    android.applicationVariants.all { variant ->
-        variant.outputs.all {
+    lint {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+    android.applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach {
             outputFileName = "gaode_${defaultConfig.versionName}_${formattedDate}-${variant.buildType.name}.apk"
         }
     }
@@ -75,4 +79,5 @@ dependencies {
     implementation project(path: ':sample-common')
     implementation project(path: ':sample-ui-components')
     implementation project(path: ':gd-map-compose')
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 }
\ No newline at end of file
diff --git a/sample-google/build.gradle b/sample-google/build.gradle
index fe71c8d..6046ea2 100644
--- a/sample-google/build.gradle
+++ b/sample-google/build.gradle
@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdk rootProject.ext.libraryInfo.minSdk
         targetSdk rootProject.ext.libraryInfo.targetSdk
-        versionCode 104
-        versionName "1.0.4"
+        versionCode 105
+        versionName "1.0.5"
 
         vectorDrawables {
             useSupportLibrary true
@@ -46,17 +46,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     packagingOptions {
         resources {
diff --git a/sample-huawei/build.gradle b/sample-huawei/build.gradle
index 9134378..67ed016 100644
--- a/sample-huawei/build.gradle
+++ b/sample-huawei/build.gradle
@@ -46,17 +46,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     packagingOptions {
         resources {
diff --git a/sample-tencent/build.gradle b/sample-tencent/build.gradle
index 83a9b02..99331d4 100644
--- a/sample-tencent/build.gradle
+++ b/sample-tencent/build.gradle
@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdk rootProject.ext.libraryInfo.minSdk
         targetSdk rootProject.ext.libraryInfo.targetSdk
-        versionCode 104
-        versionName "1.0.4"
+        versionCode 105
+        versionName "1.0.5"
 
         vectorDrawables {
             useSupportLibrary true
@@ -47,26 +47,30 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
-
-    android.applicationVariants.all { variant ->
-        variant.outputs.all {
+    lint {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+    android.applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach {
             outputFileName = "tencent_${defaultConfig.versionName}_${formattedDate}-${variant.buildType.name}.apk"
         }
     }
@@ -78,5 +82,6 @@ dependencies {
     implementation project(path: ':tencent-map-compose')
     // 定位SDK
     implementation 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.5.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
 }
\ No newline at end of file
diff --git a/sample-ui-components/build.gradle b/sample-ui-components/build.gradle
index c788e30..0532273 100644
--- a/sample-ui-components/build.gradle
+++ b/sample-ui-components/build.gradle
@@ -24,14 +24,15 @@ android {
         compose true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     composeOptions {
         kotlinCompilerExtensionVersion "1.3.2"
+        kotlinCompilerVersion "1.7.10"
     }
     packagingOptions {
         resources {
diff --git a/tencent-map-compose/build.gradle b/tencent-map-compose/build.gradle
index 9860f19..ff88257 100644
--- a/tencent-map-compose/build.gradle
+++ b/tencent-map-compose/build.gradle
@@ -26,25 +26,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+    composeOptions  {
+        kotlinCompilerExtensionVersion "1.3.2" 
+        kotlinCompilerVersion "1.7.10"
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
     lint {
+        checkReleaseBuilds false
         abortOnError false
     }
 }
 
 dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
 
     // 地图库
     api 'com.tencent.map:tencent-map-vector-sdk:5.1.0'
diff --git a/tencent-map-compose/src/main/java/com/melody/map/tencent_compose/TXMap.kt b/tencent-map-compose/src/main/java/com/melody/map/tencent_compose/TXMap.kt
index 28f2b76..ca68211 100644
--- a/tencent-map-compose/src/main/java/com/melody/map/tencent_compose/TXMap.kt
+++ b/tencent-map-compose/src/main/java/com/melody/map/tencent_compose/TXMap.kt
@@ -87,7 +87,10 @@ fun TXMap(
     val mapView = remember {
         MapView(context, tMapOptionsFactory())
     }
-    AndroidView(modifier = modifier, factory = { mapView })
+    AndroidView(modifier = modifier, factory = { mapView }, onRelease = {
+        it.onDestroy()
+        it.removeAllViews()
+    })
     MapLifecycle(mapView)
     val mapClickListeners = remember { MapClickListeners() }.also {
         it.onMapLoaded = onMapLoaded
@@ -168,11 +171,6 @@ private fun MapView.lifecycleObserver(/*previousState: MutableState<Lifecycle.Ev
             Lifecycle.Event.ON_RESUME -> this.onResume()
             Lifecycle.Event.ON_PAUSE -> this.onPause()
             Lifecycle.Event.ON_STOP -> this.onStop()
-            Lifecycle.Event.ON_DESTROY -> {
-                // fix memory leak
-                this.onDestroy()
-                this.removeAllViews()
-            }
             else -> { /* ignore */ }
         }
         //previousState.value = event