6061

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.swago.app"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 6060
-        versionName "6.0.6.0"
+        versionCode 6061
+        versionName "6.0.6.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/com/swago/app/SplashVm.kt

@@ -112,9 +112,9 @@ class SplashVm(application: Application) : BaseViewModel(application) {
 
     private fun setBaseUrl(baseUrl: String) {
         if (BuildConfig.DEBUG) {
-            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
+//            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
 //            UrlConstant.BASE_URL =   "http:huawei.swago.cn"
-//            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
+            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
         } else {
             UrlConstant.BASE_URL = baseUrl
         }

baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -14,9 +14,9 @@ import java.io.File
 object UrlConstant {
 
     var BASE_URL = if (BuildConfig.DEBUG) {
-            "http:test-api.swago.cn"
+//            "http:test-api.swago.cn"
 //            "http:huawei.swago.cn"
-//        "https://pro-api.swago.cn"
+        "https://pro-api.swago.cn"
     } else {
             "https://pro-api.swago.cn"
         }

room/src/main/java/com/swago/room/vm/RoomOtherVm.kt

@@ -22,6 +22,7 @@ import com.swago.baseswago.model.live.audio.AudioSendGiftModel
 import com.swago.baseswago.model.live.game.GameListModel
 import com.swago.baseswago.model.live.gift.GiftSendModel
 import com.swago.baseswago.util.*
+import com.swago.room.bean.UserRoomModel
 import com.swago.room.pk.PKStateManager
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -333,9 +334,9 @@ class RoomOtherVm(application: Application) : BaseViewModel(application) {
                 SwagoRoomManager.iRoomInfo?.let {
                     ApiManager.roomApi.joinFanClub(it.getRoomId())
                     SwagoLoading.cancelLoadingDialog()
-                    joinClubResultLiveData.value = true
-                    (it as RoomModel).is_fans = 1
+                    (it as UserRoomModel).roomModel?.is_fans = 1
                     isFansLiveData.value = 1
+                    joinClubResultLiveData.value = true
                 }
             }
             requestError {