1.修改游戏介绍页面获取游戏详情接口传参

game/src/main/java/com/yingyangfly/game/entity/GetGameDetailByIdBean.kt

@@ -0,0 +1,6 @@
+package com.yingyangfly.game.entity
+
+class GetGameDetailByIdBean {
+    var id: String = ""
+    var playClass: String = ""
+}

game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -39,6 +39,7 @@ class GameIntroductionActivity :
     BaseMVVMActivity<ActivityGameIntroductionBinding, GameIntroductionViewModel>(),
     View.OnTouchListener {
 
+    private var id = ""
     private var desn = ""
     private var isEnterGame = false
     private var gameCode: String = ""
@@ -54,6 +55,7 @@ class GameIntroductionActivity :
     private var voicePlayer: VoicePlayer? = null
 
     override fun initViews() {
+        id = intent.getStringExtra("id") ?: ""
         desn = intent.getStringExtra("desn") ?: ""
         gameCode = intent.getStringExtra("gameCode") ?: ""
         playClass = intent.getStringExtra("playClass") ?: ""
@@ -138,7 +140,7 @@ class GameIntroductionActivity :
      * 获取游戏信息
      */
     private fun getGameDetailByCode() {
-        viewModel.getGameDetailByCode(gameCode, playClass, fail = {
+        viewModel.getGameDetailByCode(id, playClass, fail = {
             val str = "获取游戏信息失败$it"
             str.toast()
         }, success = {

game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionViewModel.kt

@@ -6,7 +6,7 @@ import com.yingyangfly.baselib.mvvm.BaseViewModel
 import com.yingyangfly.baselib.net.XUtils
 import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.game.entity.GameBean
-import com.yingyangfly.game.entity.GetGameDetailByCodeBean
+import com.yingyangfly.game.entity.GetGameDetailByIdBean
 import com.yingyangfly.game.net.GAME_API
 
 /**
@@ -18,20 +18,19 @@ class GameIntroductionViewModel : BaseViewModel() {
      * 获取游戏详情
      */
     fun getGameDetailByCode(
-        code: String,
+        gameId: String,
         playClasses: String,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: GameBean?) -> Unit)? = null,
     ) = launchFlow(false) {
-        val requestBean = GetGameDetailByCodeBean().apply {
-            gameCode = code
+        val requestBean = GetGameDetailByIdBean().apply {
+            id = gameId
             playClass = playClasses
         }
         val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
         GAME_API.getGameDetailByCode(body)
     }.runUI(
-        success,
-        fail
+        success, fail
     )
 
     /**
@@ -44,8 +43,7 @@ class GameIntroductionViewModel : BaseViewModel() {
     ) = launchFlow(false) {
         GAME_API.getVoiceUrl(msg)
     }.runUI(
-        success,
-        fail
+        success, fail
     )
 
     /**
@@ -61,7 +59,6 @@ class GameIntroductionViewModel : BaseViewModel() {
         val body = XUtils.createJson(GsonUtil.GsonString(requestBean))
         GAME_API.getGameVoice(body)
     }.runUI(
-        success,
-        fail
+        success, fail
     )
 }

game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -69,6 +69,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
      */
     private var countdownSuccess = false
     private var gameCode: String = ""
+    private var id: String = ""
     private var playClass: String = ""
     private var gameType: String = ""
     private var url: String = ""
@@ -97,6 +98,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     private var gameTimeOut = ""
 
     override fun initViews() {
+        id = intent.getStringExtra("id") ?: ""
         gameCode = intent.getStringExtra("gameCode") ?: ""
         playClass = intent.getStringExtra("playClass") ?: ""
         url = intent.getStringExtra("url") ?: ""
@@ -268,6 +270,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                     v.startAnimation(getScaleAnimation())
                 }
             }
+
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
                 when (v.id) {
@@ -283,6 +286,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                                     Log.e("wpp", "游戏暂停成功跳转介绍")
                                     ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
                                         .withString("gameCode", gameCode)
+                                        .withString("id", id)
                                         .withString("playClass", playClass)
                                         .withTransition(R.anim.leftin, R.anim.leftout)
                                         .navigation(mContext)
@@ -290,6 +294,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                             }
                         }
                     }
+
                     R.id.tvFullScreen -> {
                         runOnUiThread {
                             if (TextUtils.equals("0", fullFlag)) {
@@ -304,6 +309,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                     }
                 }
             }
+
             MotionEvent.ACTION_CANCEL -> {
                 if (v.id == R.id.imagePause || v.id == R.id.tvFullScreen) {
                     v.startAnimation(getEndAnimation())
@@ -326,18 +332,23 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                                 "one" -> {
                                     oneStep = it.voiceUrl
                                 }
+
                                 "two" -> {
                                     twoStep = it.voiceUrl
                                 }
+
                                 "three" -> {
                                     threeStep = it.voiceUrl
                                 }
+
                                 "fail" -> {
                                     gameFailed = it.voiceUrl
                                 }
+
                                 "success" -> {
                                     gameSuccess = it.voiceUrl
                                 }
+
                                 "timeout" -> {
                                     gameTimeOut = it.voiceUrl
                                 }
@@ -470,6 +481,7 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
                             "2", "4" -> {
                                 gameDataBean.isPass = "1"
                             }
+
                             "3" -> {
                                 gameDataBean.isPass = "0"
                             }

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -359,6 +359,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
      */
     private fun jumpWebView(bean: Record) {
         ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
+            .withString("id", bean.id)
             .withString("gameCode", bean.gameCode)
             .withString("playClass", bean.playClass)
             .withString("videoUrl", bean.gameVideoUrl)
@@ -567,6 +568,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
     private fun gameLoading(bean: Record) {
         ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
             .withString("gameCode", bean.gameCode)
+            .withString("id", bean.id)
             .withString("playClass", "A")
             .withString("videoUrl", bean.gameVideoUrl)
             .withString("desn", bean.desn)

workbenches/src/main/java/com/yingyang/workbenches/freetraining/FreeTrainActivity.kt

@@ -113,6 +113,7 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
             .withString("gameCode", bean.gameCode)
             .withString("playClass", bean.playClass)
             .withString("videoUrl", bean.gameVideoUrl)
+            .withString("id", bean.id)
             .withString("desn", bean.desn)
             .withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)