完成返回开通会员提示弹窗可配置；更改首页地图样式icon

app/src/main/java/com/mints/street/api/MainApi.kt

@@ -47,6 +47,11 @@ interface MainApi {
     @POST("api/saveTerminalInfo")
     fun saveTerminalInfo(@Body vo: @JvmSuppressWildcards Map<String, Any>): Observable<Response<BaseResponse<Any>>>
 
+    /**
+     *是否显示继续支付弹窗
+     */
+    @POST("na/backVipDialogTip")
+    fun isbackvipdialogtip(@Body vo: @JvmSuppressWildcards Map<String, Any>): Observable<Response<BaseResponse<IsBackVipBean>>>
     /**
      * 开通vip
      */

app/src/main/java/com/mints/street/bean/IsBackVipBean.kt

+package com.mints.street.bean
+
+import java.io.Serializable
+
+class IsBackVipBean : Serializable {
+    val isPopup: Int? = null
+}
\ No newline at end of file

app/src/main/java/com/mints/street/main/my/OpenvipActivity.kt

@@ -51,6 +51,8 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
 
     override fun initData() {
         super.initData()
+        //是否提示继续支付弹窗
+        viewModel.isbackVipDialogTip()
         //获取vip福利信息
         viewModel.getVipProductsByType()
         //获取支付方式
@@ -173,13 +175,13 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
             vipList = it.list as MutableList<VipBean.ListBean>?
             var isActivityType = true
             for (index in it?.list!!) {
-                if (index.activityType!=0){
-                    index?.isSelect =true
+                if (index.activityType != 0) {
+                    index?.isSelect = true
                     isActivityType = false
                     break
                 }
             }
-            if (isActivityType){
+            if (isActivityType) {
                 it?.list?.get(0)?.isSelect = true
             }
             //展示 推荐套餐内容
@@ -256,7 +258,9 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         when (keyCode) {
             KeyEvent.KEYCODE_BACK -> {
-                backvipDialog()
+                if (viewModel.isbackvipdata.value?.isPopup == 1) {
+                    backvipDialog()
+                } else finish()
             }
         }
         return true
@@ -266,7 +270,9 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
     override fun onClick(v: View?) {
         when (v?.id) {
             R.id.iv_left_icon -> {
-                backvipDialog()
+                if (viewModel.isbackvipdata.value?.isPopup == 1) {
+                    backvipDialog()
+                } else finish()
             }
             R.id.ly_payfirst -> {
                 //设置选中样式
@@ -301,12 +307,13 @@ class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>()
             if (TextUtils.equals("WEIXIN", currentPayType)) {
                 viewModel.getVipPayParams("WEIXIN", gridPaymentAdapter?.getPid())
             } else {
-               viewModel.getVipPayParams("ALIPAY",  gridPaymentAdapter?.getPid())
+                viewModel.getVipPayParams("ALIPAY", gridPaymentAdapter?.getPid())
             }
         }
     }
 
     private fun backvipDialog() {
+
         DialogUtils.showbackvipDialog(this, object : DialogListener() {
             override fun onClick(dialog: Dialog?, v: View?) {
                 if (dialog != null && dialog.isShowing) {

app/src/main/java/com/mints/street/main/my/OpenvipViewModel.kt

@@ -12,7 +12,7 @@ import com.mints.street.netwrok.base.HttpSubscribeImpl
 import com.mints.street.utils.DeviceUuidFactory
 import me.goldze.mvvmhabit.base.BaseViewModel
 import me.goldze.mvvmhabit.utils.KLog
-import java.util.HashMap
+import java.util.*
 
 class OpenvipViewModel(application: Application) : BaseViewModel(application) {
 
@@ -73,7 +73,7 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
     /**
      * 获取支付参数
      */
-    fun getVipPayParams(payChannel:String,pid: String?) {
+    fun getVipPayParams(payChannel: String, pid: String?) {
         val vo = HashMap<String, Any?>()
         vo["payChannel"] = payChannel
         vo["pid"] = pid
@@ -86,7 +86,7 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
 
                     override fun onError(e: Throwable) {
                         KLog.e("getVipPayParams", e.printStackTrace())
-                    }   
+                    }
                 }
         )
     }
@@ -116,23 +116,23 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
         vo["wxInfo"] = wxInfo
 //        vo["shumeiId"] = ShumeiManager.getInstance().shumeiDeviceId
         vo["device"] = DeviceUuidFactory().deviceUuid.toString()
-        ApiModel.wechatlogin(lifecycleProvider,vo).safeSubscribe(object : HttpSubscribeImpl<BaseResponse<UserBean>>(
+        ApiModel.wechatlogin(lifecycleProvider, vo).safeSubscribe(object : HttpSubscribeImpl<BaseResponse<UserBean>>(
                 this@OpenvipViewModel, true) {
             override fun onBusinessSuccess(response: BaseResponse<UserBean>) {
                 //保存用户信息到Usermanager
                 UserManager.INSTANCE.saveUserInfo(response.result)
 
                 this@OpenvipViewModel.saveTerminalInfo()//提交设备信息
-                KLog.e("wechatlogin","微信登录接口成功")
+                KLog.e("wechatlogin", "微信登录接口成功")
 
                 ToastUtils.showLong("登录成功")
-                isloginSuc.value=true
+                isloginSuc.value = true
             }
 
             override fun onError(e: Throwable) {
                 super.onError(e)
                 KLog.e("wechatlogin", "微信登录接口失败")
-                isloginSuc.value=false
+                isloginSuc.value = false
             }
         })
     }
@@ -163,4 +163,22 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
                     }
                 })
     }
+
+    //接受参数
+    var isbackvipdata: MutableLiveData<IsBackVipBean> = MutableLiveData()
+    /**
+     * 返回是否显示推出支付弹窗
+     */
+    fun isbackVipDialogTip() {
+        val vo = hashMapOf<String, Any>()
+        vo["deviceId"] = DeviceUuidFactory().deviceUuid
+        ApiModel.isbackvipdialogtip(lifecycleProvider, vo).safeSubscribe(
+                object : HttpSubscribeImpl<BaseResponse<IsBackVipBean>>(
+                        this@OpenvipViewModel, true) {
+                    override fun onBusinessSuccess(response: BaseResponse<IsBackVipBean>) {
+                        isbackvipdata.value=response.result
+                        KLog.e("isbackvipdialogtip", response.result.toString())
+                    }
+                })
+    }
 }

app/src/main/java/com/mints/street/model/ApiModel.kt

@@ -44,6 +44,12 @@ object ApiModel {
                 .execute(lifecycleProvider, MainApi.newInstance().saveTerminalInfo(map))
     }
 
+    /**
+     * 是否弹窗
+     */
+    fun isbackvipdialogtip(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, Any>):Observable<Response<BaseResponse<IsBackVipBean>>>{
+        return HttpManager.getInstance().execute(lifecycleProvider,MainApi.newInstance().isbackvipdialogtip(map))
+    }
 
     /**
      * 开通会员

app/src/main/res/layout/activity_google_map.xml

@@ -46,6 +46,7 @@
             android:layout_height="40dp"
             android:layout_marginTop="40dp"
             android:layout_marginBottom="220dp"
+            android:padding="3dp"
             android:src="@mipmap/map_change_icon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -56,6 +57,7 @@
             android:layout_height="40dp"
             android:layout_marginTop="10dp"
             android:padding="3dp"
+
             android:src="@mipmap/icon_hotview"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/image_map_change_icon" />

app/src/main/res/layout/fragment_home.xml

@@ -150,6 +150,7 @@
             android:layout_height="40dp"
             android:layout_marginTop="35dp"
             android:layout_marginBottom="220dp"
+            android:padding="3dp"
             android:src="@mipmap/map_change_icon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />