honghengqiang 2 years ago
parent
commit
055657da13

+ 0 - 3
baseswago/src/main/java/com/swago/baseswago/PayVm.kt

@@ -1,11 +1,8 @@
 package com.swago.baseswago
 
 import android.app.Application
-import android.widget.Toast
 import androidx.lifecycle.MutableLiveData
 import com.android.billingclient.api.Purchase
-import com.google.protobuf.Api
-import com.swago.baseswago.http.SwagoException
 import com.swago.baseswago.inter.ApiManager
 import com.swago.baseswago.libpay.PayManager
 import com.swago.baseswago.model.BenefitModel

+ 11 - 6
room/src/main/java/com/swago/room/anchor/AnchorRoomActivity.kt

@@ -45,12 +45,6 @@ import com.swago.room.service.AgoraForegroundService.ACTION_STOP_FOREGROUND_SERV
 import com.swago.room.vm.MsgVm
 import com.swago.room.vm.RoomOtherVm
 import com.swago.room.vm.RoomVm
-import com.tencent.qcloud.tim.uikit.TUIKitImpl
-import com.tencent.qcloud.tim.uikit.base.IMEventListener
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import java.util.*
 
 /**
  *@date 2021/10/6 10:35
@@ -154,6 +148,17 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
                     val adapter = GameAdapter()
                     binding.rvGame.adapter = adapter
                     adapter.setNewData(data)
+
+                    adapter.setOnItemClickListener { _, _, position ->
+                        if (adapter.data.size > position) {
+                            adapter.data.forEach {
+                                it.selected = false
+                            }
+                            adapter.data[position].selected = true
+                            roomVm.currentGameType = adapter.data[position].game_type
+                            adapter.notifyDataSetChanged()
+                        }
+                    }
                 }
             }
         }

+ 11 - 18
room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -359,25 +359,18 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
 
     fun openGameDialog() {
         SwagoRoomManager.iRoomInfo?.let {
-            when(it.getGameType()){
-               1,2 -> {
-                   val download = checkGameVersion(
-                       it.getGameType().toString(),
-                       it.getGameDownLoadUrl(),
-                       it.getGameVersion().toString()
-                   )
-                   if (download) {
-                       gameDialog =
-                           GamePlayDialog.newInstance("file://" + UrlConstant.appGameRootPath + File.separator + it.getGameType() + File.separator + "index.html")
-                   } else {
-                       gameDialog = GamePlayDialog.newInstance(it.getGameUrl())
-                   }
-                   gameDialog?.show(childFragmentManager, "GamePlayDialog")
-               }
-               else -> {
-                   Toast.makeText(AppContext.getContext(), AppContext.getContext().resources.getString(R.string.please_update), Toast.LENGTH_SHORT).show()
-               }
+            val download = checkGameVersion(
+                it.getGameType().toString(),
+                it.getGameDownLoadUrl(),
+                it.getGameVersion().toString()
+            )
+            if (download) {
+                gameDialog =
+                    GamePlayDialog.newInstance("file://" + UrlConstant.appGameRootPath + File.separator + it.getGameType() + File.separator + "index.html")
+            } else {
+                gameDialog = GamePlayDialog.newInstance(it.getGameUrl())
             }
+            gameDialog?.show(childFragmentManager, "GamePlayDialog")
         }
     }