1.优化代码

game/src/main/java/com/yingyangfly/game/entity/GameBean.java

@@ -30,6 +30,8 @@ public class GameBean implements Serializable {
     private String totalNum;
     private String gameInbetweenImage;
     private String gameShortDesn;
+    private String fullFlag;//0全屏  1非全屏
+    private String frameImg;
 
     public String getDesn() {
         return desn;
@@ -207,6 +209,22 @@ public class GameBean implements Serializable {
         this.gameShortDesn = gameShortDesn;
     }
 
+    public String getFullFlag() {
+        return fullFlag;
+    }
+
+    public void setFullFlag(String fullFlag) {
+        this.fullFlag = fullFlag;
+    }
+
+    public String getFrameImg() {
+        return frameImg;
+    }
+
+    public void setFrameImg(String frameImg) {
+        this.frameImg = frameImg;
+    }
+
     public String gameDifficultyInfo() {
         if (TextUtils.equals("A", gameDifficulty)) {
             return "简单";

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

@@ -41,13 +41,13 @@ class GameIntroductionActivity :
     private var gameInbetweenImage: String = ""
     private var gameBackgroundImage: String = ""
     private var gameBean: GameBean? = null
+    private var fullFlag = ""//0全屏  1非全屏
+    private var frameImg: String = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         desn = intent.getStringExtra("desn") ?: ""
         gameCode = intent.getStringExtra("gameCode") ?: ""
         playClass = intent.getStringExtra("playClass") ?: ""
-        gameInbetweenImage = intent.getStringExtra("gameInbetweenImage") ?: ""
-        gameBackgroundImage = intent.getStringExtra("gameBackgroundImage") ?: ""
         super.onCreate(savedInstanceState)
     }
 
@@ -107,6 +107,11 @@ class GameIntroductionActivity :
             if (it != null) {
                 gameBean = it
                 binding.data = it
+                desn = it.desn
+                gameInbetweenImage = it.gameInbetweenImage
+                gameBackgroundImage = it.gameBackgroundImage
+                fullFlag = it.fullFlag
+                frameImg = it.frameImg
                 if (TextUtils.isEmpty(it.gameVideoUrl).not()) {
                     loadVideo(it.gameVideoUrl)
                 }
@@ -182,6 +187,8 @@ class GameIntroductionActivity :
                             .withString("gameInbetweenImage", gameInbetweenImage)
                             .withString("gameBackgroundImage", gameBackgroundImage)
                             .withString("gameShortDesn", gameBean!!.gameShortDesn)
+                            .withString("fullFlag", fullFlag)
+                            .withString("frameImg", frameImg)
                             .withTransition(R.anim.leftin, R.anim.leftout)
                             .navigation(mContext)
                     }

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

@@ -67,7 +67,8 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     private var gameShortDesn = ""
     private lateinit var webSettings: WebSettings
     private var gameResultDialog: GameResultDialog? = null
-
+    private var fullFlag = ""//0全屏  1非全屏
+    private var frameImg: String = ""
     var mWebViewHeight = 0
     var mWebViewWidth = 0
     private var mConstrainSet_one: ConstraintSet? = ConstraintSet()
@@ -81,6 +82,8 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         gameInbetweenImage = intent.getStringExtra("gameInbetweenImage") ?: ""
         gameBackgroundImage = intent.getStringExtra("gameBackgroundImage") ?: ""
         gameShortDesn = intent.getStringExtra("gameShortDesn") ?: ""
+        fullFlag = intent.getStringExtra("fullFlag") ?: ""
+        frameImg = intent.getStringExtra("frameImg") ?: ""
         super.onCreate(savedInstanceState)
     }
 
@@ -89,10 +92,12 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
             initWebView(url)
         }
         ImgUtil.loadGameBackground(mContext, gameInbetweenImage, binding.imageBg)
+        ImgUtil.loadGameBackground(mContext, frameImg, binding.gameFrameImage)
         if (TextUtils.isEmpty(gameShortDesn).not()) {
             binding.tvPlay.text = gameShortDesn
             binding.tvIntroduce.text = gameShortDesn
         }
+        binding.tvFullScreen.show(TextUtils.equals("0", fullFlag))
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -429,7 +434,9 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
         //游戏设置全屏
         LiveEventBusUtil.observer<String>(this, RxBusCodes.GAMEFULLSCREEN) {
             binding.webView.post {
-                setReduce(false)
+                if (TextUtils.equals("0", fullFlag)) {
+                    setReduce(false)
+                }
             }
         }
         //播放音乐

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

@@ -412,8 +412,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
             .withString("gameCode", bean.gameCode)
             .withString("playClass", "A")
             .withString("videoUrl", bean.gameVideoUrl)
-            .withString("gameInbetweenImage", bean.gameInbetweenImage)
-            .withString("gameBackgroundImage", bean.gameBackgroundImage)
             .withString("desn", bean.desn)
             .withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)
@@ -622,8 +620,6 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
             .withString("gameCode", bean.gameCode)
             .withString("playClass", "A")
             .withString("videoUrl", bean.gameVideoUrl)
-            .withString("gameInbetweenImage", bean.gameInbetweenImage)
-            .withString("gameBackgroundImage", bean.gameBackgroundImage)
             .withString("desn", bean.desn)
             .withTransition(R.anim.leftin, R.anim.leftout)
             .navigation(mContext)
@@ -707,6 +703,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(),
                 }
                 if (voicePlayer != null) {
                     voicePlayer?.play(it) {
+                        LiveEventBusUtil.send(RxBusCodes.STARTMUSIC, "")
                     }
                 }
             }

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

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