修改bug

app/build.gradle

@@ -50,20 +50,20 @@ android {
     signingConfigs {
         debug {
             //3D高清街景
-//            storeFile file(RELEASE_STORE_FILE)
-//            storePassword RELEASE_STORE_PASSWORD
-//            keyAlias RELEASE_KEY_ALIAS
-//            keyPassword RELEASE_KEY_PASSWORD
+            storeFile file(RELEASE_STORE_FILE)
+            storePassword RELEASE_STORE_PASSWORD
+            keyAlias RELEASE_KEY_ALIAS
+            keyPassword RELEASE_KEY_PASSWORD
             //5G世界
 //            storeFile file(FIVEWORLD_RELEASE_STORE_FILE)
 //            storePassword FIVEWORLD_RELEASE_STORE_PASSWORD
 //            keyAlias FIVEWORLD_RELEASE_KEY_ALIAS
 //            keyPassword FIVEWORLD_RELEASE_KEY_PASSWORD
             //自由世界
-            storeFile file(FREEWORLD_RELEASE_STORE_FILE)
-            storePassword FREEWORLD_RELEASE_STORE_PASSWORD
-            keyAlias FREEWORLD_RELEASE_KEY_ALIAS
-            keyPassword FREEWORLD_RELEASE_KEY_PASSWORD
+//            storeFile file(FREEWORLD_RELEASE_STORE_FILE)
+//            storePassword FREEWORLD_RELEASE_STORE_PASSWORD
+//            keyAlias FREEWORLD_RELEASE_KEY_ALIAS
+//            keyPassword FREEWORLD_RELEASE_KEY_PASSWORD
         }
 
         release {

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

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

app/src/main/java/com/mints/street/main/MainActivity.kt

@@ -109,11 +109,10 @@ private fun ViewPager2.initMain(activity: MainActivity): ViewPager2 {
     //是否可滑动
     this.isUserInputEnabled = false
     //预加载
-     this.offscreenPageLimit = 2
+     this.offscreenPageLimit = 3
     //设置适配器
     adapter = object : FragmentStateAdapter(activity) {
         override fun createFragment(position: Int): Fragment {
-            KLog.e("sdfsdfsa",position)
             return when (position) {
                 0 -> {
                     //首页
@@ -136,13 +135,7 @@ private fun ViewPager2.initMain(activity: MainActivity): ViewPager2 {
 
         }
 
-        override fun getItemCount() = 4
-    }
-    if (UserManager.INSTANCE.userIsLogin() && UserManager.INSTANCE.getVipFlag()) {
-        this.setCurrentItem(3, false)
-
-    } else {
-        this.setCurrentItem(0, false)
+        override fun getItemCount() = 3
     }
     return this
 }

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

@@ -33,7 +33,6 @@ import me.goldze.mvvmhabit.utils.ToastUtils
 
 class OpenvipActivity : BaseActivity<ActivityOpenvipBinding, OpenvipViewModel>(), View.OnClickListener {
 
-    private val userManager by lazy { UserManager.INSTANCE }
     private var vLayout: VirtualLayoutManager? = null
     private var mAdapter: DelegateAdapter? = null
     private var gridPaymentAdapter: GridPaymentAdapter? = null

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

@@ -170,8 +170,8 @@ class OpenvipViewModel(application: Application) : BaseViewModel(application) {
      * 返回是否显示推出支付弹窗
      */
     fun isbackVipDialogTip() {
-        val vo = hashMapOf<String, Any>()
-        vo["deviceId"] = DeviceUuidFactory().deviceUuid
+        val vo = hashMapOf<String, String?>()
+        vo["deviceId"] = DeviceUuidFactory().deviceUuid.toString()
         ApiModel.isbackvipdialogtip(lifecycleProvider, vo).safeSubscribe(
                 object : HttpSubscribeImpl<BaseResponse<IsBackVipBean>>(
                         this@OpenvipViewModel, true) {

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

@@ -47,7 +47,7 @@ object ApiModel {
     /**
      * 是否弹窗
      */
-    fun isbackvipdialogtip(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, Any>):Observable<Response<BaseResponse<IsBackVipBean>>>{
+    fun isbackvipdialogtip(lifecycleProvider: LifecycleProvider<Any>?, map: Map<String, String?>):Observable<Response<BaseResponse<IsBackVipBean>>>{
         return HttpManager.getInstance().execute(lifecycleProvider,MainApi.newInstance().isbackvipdialogtip(map))
     }
 

config.gradle

@@ -12,8 +12,8 @@ ext {
             applicationId    : "com.mints.street",
             minSdkVersion    : 21,
             targetSdkVersion : 30,
-            versionCode      : 1,
-            versionName      : "1.1.0",
+            versionCode      : buildVersionCode(),
+            versionName      : "1.1.1",
     ]
 
     java_version = [