.idea/misc.xml

@@ -22,12 +22,17 @@
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_test.xml" value="0.18" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_test2.xml" value="0.17" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_umeng_login.xml" value="0.1" />
+        <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_video_demand.xml" value="0.12291666666666666" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_view.xml" value="0.25" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/activity_web.xml" value="0.1816123188405797" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/demo_activity.xml" value="0.18020833333333333" />
+        <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/fragment_video_demand.xml" value="0.12291666666666666" />
         <entry key="..\:/Progect/gitee/EffectDemo/app/src/main/res/layout/item_word_sound.xml" value="0.10190217391304347" />
         <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/drawable/drag_error_bg.xml" value="0.174" />
         <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/layout/activity_map_challenge.xml" value="0.36886005560704355" />
+        <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/layout/activity_role_play.xml" value="0.5324675324675324" />
+        <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/layout/activity_video_play.xml" value="0.11399443929564411" />
+        <entry key="..\:/work/mozhi/qiqu/EffectDemo/app/src/main/res/layout/fragment_video_demand.xml" value="0.11399443929564411" />
       </map>
     </option>
   </component>

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?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.xunao.effectdemo" >
+    package="com.xunao.effectdemo">
 
     <uses-sdk tools:overrideLibrary="com.qmuiteam.qmui" />
 
@@ -31,8 +31,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true" >
-        <activity android:name=".activity.MainActivity" >
+        android:usesCleartextTraffic="true">
+        <activity android:name=".activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -77,7 +77,7 @@
             android:name=".receiver.MyService"
             android:enabled="true"
             android:exported="false"
-            android:process=":pushcore" >
+            android:process=":pushcore">
             <intent-filter>
                 <action android:name="cn.jiguang.user.service.action" />
             </intent-filter>
@@ -86,7 +86,7 @@
         <receiver
             android:name=".receiver.PushMessageReceiver"
             android:enabled="true"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
 
@@ -98,7 +98,7 @@
             android:name="cn.jiguang.union.ads.service.JAdFileProvider"
             android:authorities="${applicationId}.JAdFileProvider"
             android:exported="false"
-            android:grantUriPermissions="true" >
+            android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/jpush_file_paths" />
@@ -144,7 +144,10 @@
         <activity
             android:name=".activity.DragActivity"
             android:screenOrientation="landscape" />
-        <activity android:name=".activity.NewSongLyricActivity"/>
+        <activity
+            android:name=".activity.VideoPlayActivity"
+            android:screenOrientation="landscape"  />
+        <activity android:name=".activity.NewSongLyricActivity" />
     </application>
 
 </manifest>

app/src/main/java/com/xunao/effectdemo/activity/InClassActivity.java

@@ -0,0 +1,11 @@
+package com.xunao.effectdemo.activity;
+
+/**
+ * author : 程中强
+ * e-mail : 740479946@qq.com
+ * date : 2022/9/2617:17
+ * desc :
+ * version: 1.0
+ */
+public class InClassActivity {
+}

app/src/main/java/com/xunao/effectdemo/activity/MapChallengeActivity.java

@@ -65,6 +65,10 @@ public class MapChallengeActivity extends Activity {
         llMapBg = findViewById(R.id.ll_map_bg);
         rlMapBg = findViewById(R.id.rl_map_bg);
         btnMap1 = findViewById(R.id.btn_map_1);
+        btnMap1.setOnClickListener(v -> {
+            intent = new Intent(MapChallengeActivity.this, VideoPlayActivity.class);
+            startActivity(intent);
+        });
         btnMap2 = findViewById(R.id.btn_map_2);
         btnMap2.setOnClickListener(v -> {
             intent = new Intent(MapChallengeActivity.this, AudioActivity.class);

app/src/main/java/com/xunao/effectdemo/activity/RolePlayActivity.java

@@ -5,6 +5,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -24,10 +25,11 @@ public class RolePlayActivity extends Activity {
     private static final String TAG = "RolePlayActivity";
 
     private Button btnStart;
+    private Button btnGo;
     private RecyclerView rvMarquee;
     private RolePlayAdapter rolePlayAdapter;
     private List<String> roleList = new ArrayList<>();
-    private String currentRole;  // 拿到随机选中的角色
+    private String currentRole = "角色1";  // 拿到随机选中的角色
 
     // 跑马灯
     private boolean isGameRunning = false; //是否处于转动
@@ -49,6 +51,14 @@ public class RolePlayActivity extends Activity {
     }
 
     private void initView(){
+        btnGo = findViewById(R.id.btn_go);
+        btnGo.setOnClickListener(v -> {
+            Intent intent = new Intent(RolePlayActivity.this, VideoPlayActivity.class);
+            intent.putExtra("role", currentRole);
+
+            Log.i(TAG, "传的角色："+currentRole);
+            startActivity(intent);
+        });
         btnStart = findViewById(R.id.btn_start);
         btnStart.setOnClickListener(v -> {
             int stayIndex = new Random().nextInt(roleList.size());

app/src/main/java/com/xunao/effectdemo/activity/VideoPlayActivity.java

@@ -0,0 +1,50 @@
+package com.xunao.effectdemo.activity;
+
+import static android.view.View.GONE;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.xunao.effectdemo.R;
+import com.xunao.effectdemo.view.VideoPreviewPlay;
+
+public class VideoPlayActivity extends Activity {
+    private static final String TAG = "VideoPlayActivity";
+
+    private VideoPreviewPlay videoPlay;
+    private String url = "http://v3.cztv.com/cztv/vod/2018/06/28/7c45987529ea410dad7c088ba3b53dac/h264_1500k_mp4.mp4";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_video_play);
+        Intent intent = getIntent();
+        if(intent != null){
+            String data = intent.getStringExtra("role");
+            if(data != null){
+                Log.i(TAG, data);
+                LinearLayout llRole = findViewById(R.id.ll_role);
+                TextView tvRoleName = findViewById(R.id.tv_role_name);
+                tvRoleName.setText(data);
+                llRole.setVisibility(View.VISIBLE);
+            }else{
+                Log.i(TAG, "null");
+            }
+        }else{
+            Log.i(TAG, "intent null");
+        }
+        videoPlay = findViewById(R.id.video_play);
+        videoPlay.setUp(url, true, "null");
+        videoPlay.getTitleTextView().setVisibility(View.GONE);
+        videoPlay.getFullscreenButton().setVisibility(View.GONE);
+        videoPlay.getBackButton().setVisibility(GONE);
+        videoPlay.startPlayLogic();
+    }
+}

app/src/main/java/com/xunao/effectdemo/fragment/VideoDemandFragment.java

@@ -42,6 +42,8 @@ public class VideoDemandFragment extends Fragment {
         videoFront = view.findViewById(R.id.video_front);
         videoFront.setUp(url, true, "null");
         videoFront.getTitleTextView().setVisibility(View.GONE);
+        videoFront.setIsTouchWigetFull(false);
+        videoFront.setIsTouchWiget(false);
         videoFront.getFullscreenButton().setVisibility(View.GONE);
         videoFront.getBackButton().setVisibility(GONE);
         videoFront.setGSYVideoProgressListener(new GSYVideoProgressListener() {

app/src/main/java/com/xunao/effectdemo/view/VideoPreviewPlay.java

@@ -194,9 +194,6 @@ public class VideoPreviewPlay extends StandardGSYVideoPlayer {
 			}
 		});
 
-
-
-
 		initCast();
 	}
 
@@ -492,9 +489,4 @@ public class VideoPreviewPlay extends StandardGSYVideoPlayer {
 		};
 	}
 
-
-
-
-
-
 }

app/src/main/res/layout/activity_role_play.xml

@@ -21,6 +21,7 @@
         android:layout_alignParentBottom="true"
         android:text="重置"/>
     <Button
+        android:id="@+id/btn_go"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

app/src/main/res/layout/activity_video_demand.xml

@@ -11,11 +11,12 @@
         android:layout_height="64dp"
         android:src="@drawable/previous_icon"
         android:layout_centerVertical="true"/>
+
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="400dp"
-        android:layout_height="300dp"
-        android:layout_centerInParent="true"/>
+        android:layout_height="250dp"
+        android:layout_centerInParent="true" />
     <ImageView
         android:id="@+id/tv_next"
         android:layout_width="64dp"

app/src/main/res/layout/activity_video_play.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.VideoPlayActivity"
+    android:orientation="horizontal">
+    <com.xunao.effectdemo.view.VideoPreviewPlay
+        android:id="@+id/video_play"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"/>
+    <LinearLayout
+        android:id="@+id/ll_role"
+        android:layout_width="120dp"
+        android:layout_height="160dp"
+        android:layout_marginHorizontal="20dp"
+        android:background="@drawable/role_bg"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/tv_role_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:textColor="@color/exo_white"/>
+    </LinearLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_video_demand.xml

@@ -5,8 +5,9 @@
     android:layout_height="match_parent">
     <com.xunao.effectdemo.view.VideoPreviewPlay
         android:id="@+id/video_front"
+        android:layout_centerInParent="true"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="wrap_content"/>
     <TextView
         android:id="@+id/tv_back"
         android:layout_width="match_parent"