Prechádzať zdrojové kódy

1.添加游戏结算页面

王鹏鹏 2 rokov pred
rodič
commit
d0e5e36a17

+ 2 - 1
.idea/misc.xml

@@ -497,9 +497,10 @@
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_record.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_score.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_title.xml" value="0.151" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_type.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_scientific_principle.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_start_game.xml" value="0.151" />
-        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.49672489082969434" />
+        <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_introduction.xml" value="0.4055258467023173" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_loading.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_game_settlement.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/layout/activity_main.xml" value="0.23697916666666666" />

+ 12 - 0
game/src/main/java/com/yingyangfly/game/introduction/GameIntroductionActivity.kt

@@ -67,6 +67,7 @@ class GameIntroductionActivity :
 
     override fun initData() {
         binding {
+            Log.e("wpp", videoUrl)
             val model = SuperPlayerModel()
             model.appId = AccountConfig.TENCENT_APPID // 配置 AppId
             model.url = videoUrl // 配置您的播放视频 url
@@ -78,6 +79,7 @@ class GameIntroductionActivity :
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         isEnterGame = true
+        binding.playTxCloudView.onResume()
     }
 
     override fun onResume() {
@@ -85,6 +87,16 @@ class GameIntroductionActivity :
         getGameDetailByCode()
     }
 
+    override fun onDestroy() {
+        binding.playTxCloudView.resetPlayer()
+        super.onDestroy()
+    }
+
+    override fun onPause() {
+        binding.playTxCloudView.onPause()
+        super.onPause()
+    }
+
     /**
      * 获取游戏信息
      */

+ 1 - 2
game/src/main/java/com/yingyangfly/game/loading/GameLoadingActivity.kt

@@ -21,7 +21,6 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
     private var videoUrl: String = ""
     private lateinit var rxTimer: RxTimer
     private var time: Long = 3
-    private var gameVideoUrl = ""
     private var gameInbetweenImage = ""
     private var gameBackgroundImage = ""
 
@@ -55,7 +54,7 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
                 ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
                     .withString("gameCode", gameCode)
                     .withString("playClass", playClass)
-                    .withString("videoUrl", gameVideoUrl)
+                    .withString("videoUrl", videoUrl)
                     .withString("gameInbetweenImage", gameInbetweenImage)
                     .withString("gameBackgroundImage", gameBackgroundImage)
                     .withTransition(R.anim.leftin, R.anim.leftout)

+ 0 - 1
game/src/main/java/com/yingyangfly/game/play/PlayGameActivity.kt

@@ -27,7 +27,6 @@ import com.yingyangfly.game.R
 import com.yingyangfly.game.databinding.ActivityPlayGameBinding
 import com.yingyangfly.game.dialog.CountdownDialog
 import com.yingyangfly.game.dialog.GameResultDialog
-import com.yingyangfly.game.entity.GameBean
 import com.yingyangfly.game.entity.GameDataBean
 import com.yingyangfly.game.utils.AndroidToJs
 import gorden.rxbus2.RxBus

+ 7 - 0
game/src/main/res/drawable/bg_game_type.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_8px" />
+    <solid android:color="@color/color_70FFD979" />
+</shape>

+ 14 - 9
game/src/main/res/layout/activity_game_introduction.xml

@@ -112,8 +112,7 @@
                             <com.tencent.liteav.demo.superplayer.SuperPlayerView
                                 android:id="@+id/play_tx_cloud_view"
                                 android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center" />
+                                android:layout_height="match_parent" />
 
                         </androidx.cardview.widget.CardView>
 
@@ -167,24 +166,30 @@
                                     android:layout_width="@dimen/divider_180px"
                                     android:layout_height="@dimen/divider_53px"
                                     android:layout_marginTop="@dimen/divider_18px"
+                                    android:layout_marginBottom="@dimen/divider_29px"
                                     android:background="@drawable/bg_scientific_principle"
                                     android:gravity="center"
                                     android:text="@string/training_skill"
                                     android:textColor="@color/color_FFA54A0B"
                                     android:textSize="@dimen/divider_28px"
                                     android:textStyle="bold"
-                                    app:layout_constraintBottom_toTopOf="@+id/rvSkill"
+                                    app:layout_constraintBottom_toTopOf="@+id/tvGameType"
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toStartOf="parent" />
 
-                                <androidx.recyclerview.widget.RecyclerView
-                                    android:id="@+id/rvSkill"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="@dimen/divider_29px"
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/tvGameType"
+                                    android:layout_width="@dimen/divider_146px"
+                                    android:layout_height="@dimen/divider_46px"
+                                    android:layout_marginStart="@dimen/divider_41px"
                                     android:layout_marginBottom="@dimen/divider_52px"
+                                    android:background="@drawable/bg_game_type"
+                                    android:gravity="center"
+                                    android:text="@{data.gameType}"
+                                    android:textColor="@color/color_FFA54A0B"
+                                    android:textSize="@dimen/divider_28px"
+                                    android:textStyle="bold"
                                     app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toStartOf="parent" />
 
                             </androidx.constraintlayout.widget.ConstraintLayout>