Merge branch 'dev_1.1.0' of http://gitlab.mints-id.com/android/android_street into branch_zsf_2

app/src/main/java/com/mints/street/main/googlemap/GoogleMapFragment.kt

@@ -28,6 +28,7 @@ import com.mints.street.widget.ScrollLayout
 import com.mints.street.widget.dialog.DialogMapStyle
 import com.mints.street.widget.dialog.DialogUtils.showupgradevipDialog
 import com.mints.street.widget.dialog.HotViewDialog
+import com.mints.street.widget.dialog.UpgradeVipDialog
 import com.mints.street.widget.dialog.ViewRecommedDialog
 import me.goldze.mvvmhabit.base.AppManager
 import me.goldze.mvvmhabit.utils.CommonDialogUtils
@@ -212,7 +213,7 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
         //android->js调起升级的弹出框
         binding.webview.registerHandler("needPayPopup") { _, _ ->
             if(!UserManager.INSTANCE.getVipFlag()){
-                showupgradevipDialog(this.context)
+                showUpgradeVipDialog()
             }
         }
         //使地图缩放级别增大一级
@@ -231,6 +232,14 @@ class GoogleMapFragment() : BaseFragment<ActivityGoogleMapBinding, HomeViewModel
         }
     }
 
+    private var upgradeVipDialog: UpgradeVipDialog?=null
+    private fun showUpgradeVipDialog(){
+        if (upgradeVipDialog== null){
+            upgradeVipDialog =  showupgradevipDialog(this.context)
+        }
+        upgradeVipDialog?.show()
+    }
+
     /**
      * 调用JS
      */

app/src/main/java/com/mints/street/widget/dialog/DialogUtils.kt

@@ -22,10 +22,10 @@ object DialogUtils {
         dialogListener.setDialog(bonusDialog)
     }
 
-    fun showupgradevipDialog(ctx: Context?){
+
+    fun showupgradevipDialog(ctx: Context?):UpgradeVipDialog{
         val weakReference = WeakReference<Context>(ctx)
-        val bonusDialog = UpgradeVipDialog(weakReference.get()!!)
-        bonusDialog.show()
+        return  UpgradeVipDialog(weakReference.get()!!)
     }