完善原生demo

.idea/modules.xml

@@ -2,14 +2,14 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/Demo/Demo.iml" filepath="$PROJECT_DIR$/Demo/Demo.iml" group="YCVideoPlayer/Demo" />
       <module fileurl="file://$PROJECT_DIR$/GitHub-YCVideoPlayer.iml" filepath="$PROJECT_DIR$/GitHub-YCVideoPlayer.iml" group="YCVideoPlayer" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/VideoCache/VideoCache.iml" filepath="$PROJECT_DIR$/.idea/modules/VideoCache/VideoCache.iml" group="YCVideoPlayer/VideoCache" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/VideoBarrage/VideoKernel.iml" filepath="$PROJECT_DIR$/.idea/modules/VideoBarrage/VideoKernel.iml" group="YCVideoPlayer/VideoKernel" />
       <module fileurl="file://$PROJECT_DIR$/VideoPlayer/VideoPlayer.iml" filepath="$PROJECT_DIR$/VideoPlayer/VideoPlayer.iml" group="YCVideoPlayer/VideoPlayer" />
       <module fileurl="file://$PROJECT_DIR$/.idea/YCVideoPlayer.iml" filepath="$PROJECT_DIR$/.idea/YCVideoPlayer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/YCVideoPlayer-app.iml" filepath="$PROJECT_DIR$/app/YCVideoPlayer-app.iml" group="YCVideoPlayer/app" />
       <module fileurl="file://$PROJECT_DIR$/VideoPlayer/YCVideoPlayerLib.iml" filepath="$PROJECT_DIR$/VideoPlayer/YCVideoPlayerLib.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Demo/app.iml" filepath="$PROJECT_DIR$/Demo/app.iml" />
     </modules>
   </component>
 </project>

app/build.gradle → Demo/build.gradle

@@ -52,6 +52,7 @@ dependencies {
 
     //exo的UI库
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.3'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.11.3'
 
     //弹幕
     implementation 'com.github.ctiao:DanmakuFlameMaster:0.9.25'

app/src/main/java/org/yczbj/ycvideoplayer/newPlayer/activity/NormalActivity.java → Demo/src/main/java/org/yczbj/ycvideoplayer/newPlayer/activity/NormalActivity.java

@@ -27,6 +27,9 @@ public class NormalActivity extends AppCompatActivity implements View.OnClickLis
     private Button mBtnScaleNormal;
     private Button mBtnScale169;
     private Button mBtnScale43;
+    private Button mBtnScaleFull;
+    private Button mBtnScaleOriginal;
+    private Button mBtnScaleCrop;
     private Button mBtnCrop;
     private Button mBtnGif;
     private BasisVideoController controller;
@@ -34,7 +37,7 @@ public class NormalActivity extends AppCompatActivity implements View.OnClickLis
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_normal_video);
+        setContentView(R.layout.activity_video);
         initFindViewById();
         initVideoPlayer();
         initListener();
@@ -81,6 +84,9 @@ public class NormalActivity extends AppCompatActivity implements View.OnClickLis
         mBtnScaleNormal = findViewById(R.id.btn_scale_normal);
         mBtnScale169 = findViewById(R.id.btn_scale_169);
         mBtnScale43 = findViewById(R.id.btn_scale_43);
+        mBtnScaleFull = findViewById(R.id.btn_scale_full);
+        mBtnScaleOriginal = findViewById(R.id.btn_scale_original);
+        mBtnScaleCrop = findViewById(R.id.btn_scale_crop);
         mBtnCrop = findViewById(R.id.btn_crop);
         mBtnGif = findViewById(R.id.btn_gif);
     }
@@ -109,6 +115,9 @@ public class NormalActivity extends AppCompatActivity implements View.OnClickLis
         mBtnScaleNormal.setOnClickListener(this);
         mBtnScale169.setOnClickListener(this);
         mBtnScale43.setOnClickListener(this);
+        mBtnScaleFull.setOnClickListener(this);
+        mBtnScaleOriginal.setOnClickListener(this);
+        mBtnScaleCrop.setOnClickListener(this);
         mBtnCrop.setOnClickListener(this);
         mBtnGif.setOnClickListener(this);
     }
@@ -122,7 +131,13 @@ public class NormalActivity extends AppCompatActivity implements View.OnClickLis
             mVideoPlayer.setScreenScaleType(ConstantKeys.PlayerScreenScaleType.SCREEN_SCALE_DEFAULT);
         }else if (v == mBtnScale43){
             mVideoPlayer.setScreenScaleType(ConstantKeys.PlayerScreenScaleType.SCREEN_SCALE_4_3);
-        } else if (v == mBtnCrop){
+        } else if (v == mBtnScaleFull){
+            mVideoPlayer.setScreenScaleType(ConstantKeys.PlayerScreenScaleType.SCREEN_SCALE_MATCH_PARENT);
+        }else if (v == mBtnScaleOriginal){
+            mVideoPlayer.setScreenScaleType(ConstantKeys.PlayerScreenScaleType.SCREEN_SCALE_ORIGINAL);
+        }else if (v == mBtnScaleCrop){
+            mVideoPlayer.setScreenScaleType(ConstantKeys.PlayerScreenScaleType.SCREEN_SCALE_CENTER_CROP);
+        }else if (v == mBtnCrop){
 
         } else if (v == mBtnGif){
 

Demo/src/main/res/layout/activity_video.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:background="@color/whiteBg">
+
+    <org.yczbj.ycvideoplayerlib.player.VideoPlayer
+        android:id="@+id/video_player"
+        android:layout_width="match_parent"
+        android:layout_height="240dp"/>
+
+    <Button
+        android:id="@+id/btn_scale_normal"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="正常的" />
+
+    <Button
+        android:id="@+id/btn_scale_169"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="16:9" />
+
+    <Button
+        android:id="@+id/btn_scale_43"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="4:3" />
+
+    <Button
+        android:id="@+id/btn_scale_full"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="充满整个控件" />
+
+    <Button
+        android:id="@+id/btn_scale_original"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="原始类型" />
+
+    <Button
+        android:id="@+id/btn_scale_crop"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="剧中裁剪类型" />
+
+    <Button
+        android:id="@+id/btn_crop"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="视频截图" />
+
+    <Button
+        android:id="@+id/btn_gif"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="视频截图gif" />
+
+</LinearLayout>