honghengqiang 1 year ago
parent
commit
67e6d30a96

+ 2 - 2
app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.swago.app"
         applicationId "com.swago.app"
         minSdkVersion 21
         minSdkVersion 21
         targetSdkVersion 31
         targetSdkVersion 31
-        versionCode 1190
-        versionName "1.1.9.0"
+        versionCode 1191
+        versionName "1.1.9.1"
         multiDexEnabled true
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 

File diff suppressed because it is too large
+ 310 - 252
app/mapping.txt


+ 2 - 2
app/src/main/java/com/swago/app/SplashVm.kt

@@ -106,9 +106,9 @@ class SplashVm(application: Application) : BaseViewModel(application) {
 
 
     private fun setBaseUrl(baseUrl: String) {
     private fun setBaseUrl(baseUrl: String) {
         if (BuildConfig.DEBUG) {
         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 =   "http:huawei.swago.cn"
-//            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
+            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
         } else {
         } else {
             UrlConstant.BASE_URL = baseUrl
             UrlConstant.BASE_URL = baseUrl
         }
         }

+ 2 - 2
baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

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

+ 1 - 0
room/src/main/java/com/swago/room/user/UserRoomActivity.kt

@@ -307,6 +307,7 @@ class UserRoomActivity : AbsUserActivity<ActivityAbsRoomUserBinding, UserRoomMod
                         if (!isRobot) {
                         if (!isRobot) {
                             flRoot?.let {
                             flRoot?.let {
                                 //这里加个延迟是因为第一次进入直播间的时候布局未完全加载成功导致部分布局无法显示
                                 //这里加个延迟是因为第一次进入直播间的时候布局未完全加载成功导致部分布局无法显示
+                                delay(600)
                                 AgoraManager.setupRemoteVideo(
                                 AgoraManager.setupRemoteVideo(
                                     this@UserRoomActivity,
                                     this@UserRoomActivity,
                                     iRoomInfo.getAnchorId().toInt(), it
                                     iRoomInfo.getAnchorId().toInt(), it

Some files were not shown because too many files changed in this diff