Merge branch 'czq'

.idea/misc.xml

@@ -22,9 +22,11 @@
         <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" />

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/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_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/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"