Merge branch 'google' into qiye

baseswago/build.gradle

@@ -106,7 +106,7 @@ dependencies {
     //im
     api 'com.tencent.imsdk:imsdk-plus:5.9.1872'
     //agora
-    api 'com.github.agorabuilder:native-full-sdk:3.6.0.1'
+    api "io.agora.rtc:full-rtc-basic:3.7.0.2"
     //支付
     api 'com.android.billingclient:billing:3.0.3'
     //抓包

room/src/main/java/com/swago/room/anchor/AnchorRoomActivity.kt

@@ -2,6 +2,7 @@ package com.swago.room.anchor
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
@@ -151,11 +152,9 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
         })
         binding.tvStartLive.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
-                if (roomVm.currentGameType != -1) {
-                    binding.tvStartLive.isEnabled = false
-                    val userModel = UserRoomModel()
-                    SwagoRoomManager.changeRoom(userModel)
-                }
+                binding.tvStartLive.isEnabled = false
+                val userModel = UserRoomModel()
+                SwagoRoomManager.changeRoom(userModel)
             }
         })
         binding.ivClose.setOnClickListener(object : NoDoubleClickListener() {
@@ -296,7 +295,7 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
     }
 
     override fun onChannelMediaRelayStateChanged(state: Int, code: Int) {
-        if (PKStateManager.roomState == PKStateManager.PK&&state==2&&code==0){
+        if (PKStateManager.roomState == PKStateManager.PK && state == 2 && code == 0) {
             pkVm.pkSure(PKStateManager.pkId)
         }
     }
@@ -309,16 +308,16 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
     //对方主播id
     private var peerAnchorId = 0
     override fun startPK(startPKModel: StartPKModel, isGetDataFromIM: Boolean) {
-            peerAnchorId = startPKModel.oppositeUserId.toInt()
-            AgoraManager.startPK(
-                startPKModel.roomId,
-                startPKModel.oppositeRoomId,
-                startPKModel.userId.toInt(),
-                startPKModel.sourceToken,
-                startPKModel.destToken
-            )
-            setPKLayoutParams(binding.flLocal, true)
-            AgoraManager.setupRemoteVideo(this@AnchorRoomActivity, peerAnchorId, binding.peerFl)
+        peerAnchorId = startPKModel.oppositeUserId.toInt()
+        AgoraManager.startPK(
+            startPKModel.roomId,
+            startPKModel.oppositeRoomId,
+            startPKModel.userId.toInt(),
+            startPKModel.sourceToken,
+            startPKModel.destToken
+        )
+        setPKLayoutParams(binding.flLocal, true)
+        AgoraManager.setupRemoteVideo(this@AnchorRoomActivity, peerAnchorId, binding.peerFl)
 
     }
 
@@ -332,7 +331,7 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
 
     }
 
-    override fun processChangePK(processPKModel: ProcessPKModel,isGetDataFromIM: Boolean) {
+    override fun processChangePK(processPKModel: ProcessPKModel, isGetDataFromIM: Boolean) {
 
     }
 

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

@@ -24,7 +24,7 @@ import com.swago.room.user.UserRoomActivity
 class RoomVm(application: Application) : AbsRoomVm(application) {
 
     //当前选中的游戏
-    var currentGameType = -1
+    var currentGameType = 1
 
     val roomClosedLiveData by lazy {
         MutableLiveData<AnchorRoomClosedBean>()