1.添加游戏结算页面

.idea/misc.xml

@@ -541,6 +541,8 @@
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/activity_messge_list.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/item_push_list.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/push/src/main/res/layout/item_push_type.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/superplayerkit/src/main/res/layout/superplayer_vod_player_fullscreen.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pads/superplayerkit/src/main/res/layout/superplayer_vod_view.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_bridge_web.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_tencent_webview.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_webview.xml" value="0.23697916666666666" />

baselib/build.gradle

@@ -86,6 +86,7 @@ dependencies {
 
     api fileTree(exclude: '*.bak', dir: 'libs')
     api project(path: ':imageselector')
+    api project(path: ':superplayerkit')
     implementation(rootProject.ext.androidx.kotlin_lib)
     implementation(rootProject.ext.androidx.kotlin_core)
     implementation(rootProject.ext.androidx.appcompat)

game/build.gradle

@@ -22,8 +22,4 @@ dependencies {
     implementation(rootProject.ext.androidx.appcompat)
     implementation(rootProject.ext.androidx.material)
     implementation(rootProject.ext.androidx.constraintlayout)
-    implementation(rootProject.ext.dependencies.rxjava)
-    implementation(rootProject.ext.dependencies.rxandroid)
-    implementation(rootProject.ext.dependencies.rxkotlin)
-    implementation(rootProject.ext.dependencies.Zxing)
 }

game/src/main/AndroidManifest.xml

@@ -2,7 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.yingyangfly.game">
 
-    <application>
+    <!--网络权限-->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!--点播播放器悬浮窗权限-->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <!--存储-->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <application android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name="com.yingyangfly.game.loading.GameLoadingActivity"

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

@@ -30,6 +30,7 @@ class GameIntroductionActivity :
     BaseMVVMActivity<ActivityGameIntroductionBinding, GameIntroductionViewModel>(),
     View.OnTouchListener {
 
+    private var videoUrl = ""
     private var isEnterGame = false
     private var gameCode: String = ""
     private var playClass: String = ""
@@ -38,6 +39,7 @@ class GameIntroductionActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         gameCode = intent.getStringExtra("gameCode") ?: ""
         playClass = intent.getStringExtra("playClass") ?: ""
+        videoUrl = intent.getStringExtra("videoUrl") ?: ""
         super.onCreate(savedInstanceState)
     }
 
@@ -112,7 +114,9 @@ class GameIntroductionActivity :
                             gameBean!!.gameUrl + "?startLv=" + gameBean!!.gameLevel + "&maxLv=" +
                                     gameBean!!.totalNum + "&gameSetTime=" + gameBean!!.gameDuration +
                                     "&difficultyRate=" + gameBean!!.gameDifficultyRate + "&totalTime=" +
-                                    gameBean!!.gameTotalTime + "&totalScore=" + gameBean!!.gameTotalScore
+                                    gameBean!!.gameTotalTime + "&totalScore=" + gameBean!!.gameTotalScore +
+                                    "&playClass=" + playClass
+                        Log.e("wpp", url)
                         ARouter.getInstance().build(RouterUrlCommon.playGame)
                             .withString("gameCode", gameCode)
                             .withString("playClass", playClass)
@@ -138,7 +142,6 @@ class GameIntroductionActivity :
     }
 
     override fun finish() {
-        Log.e("wpp", "----------------------------1")
         super.finish()
     }
 }

game/src/main/java/com/yingyangfly/game/loading/GameLoadingActivity.kt

@@ -18,12 +18,14 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
 
     private var gameCode: String = ""
     private var playClass: String = ""
+    private var videoUrl: String = ""
     private lateinit var rxTimer: RxTimer
     private var time: Long = 3
 
     override fun onCreate(savedInstanceState: Bundle?) {
         gameCode = intent.getStringExtra("gameCode") ?: ""
         playClass = intent.getStringExtra("playClass") ?: ""
+        videoUrl = intent.getStringExtra("videoUrl") ?: ""
         super.onCreate(savedInstanceState)
     }
 
@@ -36,6 +38,7 @@ class GameLoadingActivity : BaseActivity<ActivityGameLoadingBinding>() {
                 ARouter.getInstance().build(RouterUrlCommon.gameIntroduction)
                     .withString("gameCode", gameCode)
                     .withString("playClass", playClass)
+                    .withString("videoUrl", videoUrl)
                     .withTransition(R.anim.leftin, R.anim.leftout)
                     .navigation(mContext)
                 finish()

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

@@ -346,7 +346,6 @@ class PlayGameActivity : BaseMVVMActivity<ActivityPlayGameBinding, PlayGameViewM
     }
 
     override fun finish() {
-        Log.e("wpp", "----------------------------2")
         super.finish()
     }
 }

game/src/main/manifest/AndroidManifest.xml

@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.yingyangfly.game">
 
-    <application>
+    <!--网络权限-->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!--点播播放器悬浮窗权限-->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <!--存储-->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <application android:networkSecurityConfig="@xml/network_security_config"
+        tools:targetApi="n">
         <activity
             android:name="com.yingyangfly.game.loading.GameLoadingActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

game/src/main/res/layout/activity_game_introduction.xml

@@ -60,7 +60,7 @@
                 android:layout_height="match_parent"
                 android:orientation="horizontal">
 
-                <com.google.android.material.card.MaterialCardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_marginStart="@dimen/divider_27px"
@@ -68,7 +68,6 @@
                     android:layout_marginEnd="@dimen/divider_15px"
                     android:layout_marginBottom="@dimen/divider_33px"
                     android:layout_weight="1"
-                    android:theme="@style/Theme.MaterialComponents.NoActionBar"
                     app:cardBackgroundColor="@android:color/white"
                     app:cardCornerRadius="@dimen/divider_26px"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -76,7 +75,7 @@
                     app:layout_constraintTop_toTopOf="parent">
 
 
-                </com.google.android.material.card.MaterialCardView>
+                </androidx.cardview.widget.CardView>
 
 
                 <com.google.android.material.card.MaterialCardView

game/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource,ResourceName">
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">127.0.0.1</domain>
+    </domain-config>
+</network-security-config>

livebroadcast/build.gradle

@@ -19,7 +19,6 @@ android {
 
 dependencies {
     implementation project(path: ':baselib')
-    api project(path: ':superplayerkit')
     implementation(rootProject.ext.androidx.kotlin_lib)
     implementation(rootProject.ext.androidx.kotlin_core)
     implementation(rootProject.ext.androidx.appcompat)

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

@@ -79,6 +79,7 @@ class FreeTrainActivity : BaseMVVMActivity<ActivityFreeTrainBinding, FreeTrainVi
                 ARouter.getInstance().build(RouterUrlCommon.gameLoading)
                     .withString("gameCode", bean.gameCode)
                     .withString("playClass", bean.playClass)
+                    .withString("videoUrl", bean.gameVideoUrl)
                     .withTransition(R.anim.leftin, R.anim.leftout)
                     .navigation(mContext)
             }