完善视频播放器内核库

Demo/build.gradle

@@ -1,12 +1,13 @@
 apply plugin: 'com.android.application'
+apply from: rootProject.projectDir.absolutePath + "/VideoGradle/video.gradle"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.0'
+    compileSdkVersion project.ext.androidCompileSdkVersion
+    buildToolsVersion project.ext.androidBuildToolsVersion
     defaultConfig {
-        applicationId "org.yczbj.ycvideoplayer"
-        minSdkVersion 17
-        targetSdkVersion 29
+        applicationId "com.yc.ycvideoplayer"
+        minSdkVersion project.ext.androidMinSdkVersion
+        targetSdkVersion project.ext.androidTargetSdkVersion
         versionCode 28
         versionName "2.8.0"
         // dex突破65535的限制
@@ -67,23 +68,25 @@ dependencies {
     implementation 'com.github.ctiao:DanmakuFlameMaster:0.9.25'
     implementation 'com.github.ctiao:ndkbitmap-armv7a:0.9.21'
 
-    implementation 'com.github.yangchong211.YCVideoPlayer:VideoCache:v1.0.0'
-    implementation 'com.github.yangchong211.YCVideoPlayer:VideoPlayer:v1.0.0'
-    implementation 'com.github.yangchong211.YCVideoPlayer:VideoKernel:v1.0.0'
-    implementation 'com.github.yangchong211.YCVideoPlayer:VideoView:v1.0.0'
-    implementation 'com.github.yangchong211.YCVideoPlayer:MusicPlayer:v1.0.0'
-    implementation 'com.github.yangchong211.YCVideoPlayer:VideoM3u8:v1.0.0'
-    implementation 'com.github.yangchong211.YCVideoPlayer:VideoSqlLite:v1.0.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:VideoPlayer:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:VideoKernel:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:VideoView:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:MusicPlayer:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:VideoM3u8:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:VideoSqlLite:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:AudioPlayer:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:VideoTool:1.1.0'
+    implementation 'com.github.yangchong211.YCVideoPlayer:VideoCache:1.1.0'
 
-    implementation project(path: ':VideoCache')
-    implementation project(path: ':VideoPlayer')
-    implementation project(path: ':VideoKernel')
-    implementation project(path: ':VideoView')
-    implementation project(path: ':MusicPlayer')
-    implementation project(path: ':VideoM3u8')
-    implementation project(path: ':VideoSqlLite')
-    implementation project(path: ':AudioPlayer')
-    implementation project(path: ':VideoTool')
+//    implementation project(path: ':VideoCache')
+//    implementation project(path: ':VideoPlayer')
+//    implementation project(path: ':VideoKernel')
+//    implementation project(path: ':VideoView')
+//    implementation project(path: ':MusicPlayer')
+//    implementation project(path: ':VideoM3u8')
+//    implementation project(path: ':VideoSqlLite')
+//    implementation project(path: ':AudioPlayer')
+//    implementation project(path: ':VideoTool')
 
     //自己封装的库，都有对应的案例项目【欢迎star】：https://github.com/yangchong211
     implementation 'cn.yc:YCStatusBarLib:1.5.0'

Demo/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="org.yc.ycvideoplayer">
+    package="com.yc.ycvideoplayer">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -73,19 +73,6 @@
         <activity android:name="com.yc.ycvideoplayer.video.pip.PipListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.demo.DemoActivity"/>
-        <activity android:name="com.yc.ycvideoplayer.demo.IjkActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.demo.MediaActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.demo.MediaActivity2"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.yc.ycvideoplayer.demo.ExoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"/>
         <activity android:name="com.yc.ycvideoplayer.music.MusicPlayerActivity"/>
         <activity android:name="com.yc.ycvideoplayer.m3u8.M3u8Activity"/>
         <activity android:name="com.yc.ycvideoplayer.audio.AudioActivity"/>

Demo/src/main/java/com/yc/ycvideoplayer/MainActivity.java

@@ -18,7 +18,6 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
-import org.yc.ycvideoplayer.R;
 import com.yc.music.model.AudioBean;
 import com.yc.music.service.PlayAudioService;
 import com.yc.music.tool.BaseAppHelper;
@@ -29,7 +28,6 @@ import com.yc.videoview.MoveType;
 import com.yc.videoview.WindowScreen;
 import com.yc.videoview.WindowUtil;
 import com.yc.ycvideoplayer.audio.AudioActivity;
-import com.yc.ycvideoplayer.demo.DemoActivity;
 import com.yc.ycvideoplayer.m3u8.M3u8Activity;
 import com.yc.ycvideoplayer.music.MusicPlayerActivity;
 import com.yc.ycvideoplayer.video.activity.TypeActivity;
@@ -97,7 +95,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.tv_1:
-                startActivity(DemoActivity.class);
                 break;
             case R.id.tv_2:
                 startActivity(TypeActivity.class);

Demo/src/main/java/com/yc/ycvideoplayer/audio/AudioActivity.java

@@ -13,7 +13,7 @@ import com.yc.audioplayer.service.AudioService;
 import com.yc.audioplayer.bean.AudioPlayData;
 import com.yc.audioplayer.bean.AudioTtsPriority;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 public class AudioActivity extends AppCompatActivity implements View.OnClickListener {
 

Demo/src/main/java/com/yc/ycvideoplayer/audio/TTSAudioActivity.java

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import com.yc.videotool.VideoLogUtils;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 import java.util.Locale;
 

Demo/src/main/java/com/yc/ycvideoplayer/demo/DemoActivity.java

@@ -1,59 +0,0 @@
-package com.yc.ycvideoplayer.demo;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import org.yc.ycvideoplayer.R;
-
-public class DemoActivity extends AppCompatActivity implements View.OnClickListener {
-
-    private TextView mTv1;
-    private TextView mTv12;
-    private TextView mTv2;
-    private TextView mTv3;
-
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_demo_player);
-
-        mTv1 = findViewById(R.id.tv_1);
-        mTv12 = findViewById(R.id.tv_1_2);
-        mTv2 = findViewById(R.id.tv_2);
-        mTv3 = findViewById(R.id.tv_3);
-
-        mTv1.setOnClickListener(this);
-        mTv12.setOnClickListener(this);
-        mTv2.setOnClickListener(this);
-        mTv3.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.tv_1:
-                startActivity(MediaActivity.class);
-                break;
-            case R.id.tv_1_2:
-                startActivity(MediaActivity2.class);
-                break;
-            case R.id.tv_2:
-                startActivity(IjkActivity.class);
-                break;
-            case R.id.tv_3:
-                startActivity(ExoActivity.class);
-                break;
-        }
-    }
-
-    private void startActivity(Class c){
-        startActivity(new Intent(this,c));
-    }
-
-}

Demo/src/main/java/com/yc/ycvideoplayer/demo/ExoActivity.java

@@ -1,63 +0,0 @@
-package com.yc.ycvideoplayer.demo;
-
-import android.net.Uri;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.google.android.exoplayer2.DefaultLoadControl;
-import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
-import com.yc.ycvideoplayer.ConstantVideo;
-
-import org.yc.ycvideoplayer.R;
-
-public class ExoActivity extends AppCompatActivity {
-
-    private PlayerView mVideoView;
-    private SimpleExoPlayer player;
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mVideoView.onPause();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mVideoView.onResume();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (player!=null){
-            player.release();
-        }
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_exo_player);
-        mVideoView = findViewById(R.id.video_view);
-
-        SimpleExoPlayer player = ExoPlayerFactory.newSimpleInstance(this,
-                new DefaultTrackSelector(),new DefaultLoadControl());
-        player.setPlayWhenReady(true);
-        mVideoView.setPlayer(player);
-        Uri uri = Uri.parse(ConstantVideo.VideoPlayerList[0]);
-        DefaultHttpDataSourceFactory dataSourceFactory = new DefaultHttpDataSourceFactory("user-agent");
-        ProgressiveMediaSource mediaSource = new ProgressiveMediaSource.Factory(
-                dataSourceFactory).createMediaSource(uri);
-        // 播放
-        player.prepare(mediaSource);
-    }
-
-}

Demo/src/main/java/com/yc/ycvideoplayer/demo/IjkActivity.java

@@ -1,19 +0,0 @@
-package com.yc.ycvideoplayer.demo;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import org.yc.ycvideoplayer.R;
-
-public class IjkActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_ijk_player);
-    }
-
-
-}

Demo/src/main/java/com/yc/ycvideoplayer/demo/MediaActivity.java

@@ -1,75 +0,0 @@
-package com.yc.ycvideoplayer.demo;
-
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.MediaController;
-import android.widget.VideoView;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.yc.ycvideoplayer.ConstantVideo;
-
-import org.yc.ycvideoplayer.R;
-import com.yc.video.tool.BaseToast;
-
-public class MediaActivity extends AppCompatActivity {
-
-    private VideoView mVideo;
-    private Button mBtnStart;
-    private Button mBtnPause;
-    private MediaController mMediaController;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_media_player);
-        initView();
-        initListener();
-    }
-
-    private void initView() {
-        mVideo = findViewById(R.id.video);
-        mBtnStart = findViewById(R.id.btn_start);
-        mBtnPause = findViewById(R.id.btn_pause);
-
-        Uri uri = Uri.parse(ConstantVideo.VideoPlayerList[2]);
-        mVideo.setVideoURI(uri);
-        mMediaController = new MediaController(this);
-        mVideo.setMediaController(mMediaController);
-        mVideo.start();
-        mVideo.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(MediaPlayer mp) {
-                //         mp.setLooping(true);
-                mp.start();// 播放
-                BaseToast.showRoundRectToast("开始播放！");
-            }
-        });
-        mVideo.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
-            @Override
-            public void onCompletion(MediaPlayer mp) {
-                BaseToast.showRoundRectToast("播放完毕！");
-            }
-        });
-    }
-
-    private void initListener() {
-        mBtnStart.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mVideo.start();
-            }
-        });
-        mBtnPause.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mVideo.pause();
-            }
-        });
-    }
-
-}

Demo/src/main/java/com/yc/ycvideoplayer/demo/MediaActivity2.java

@@ -1,98 +0,0 @@
-package com.yc.ycvideoplayer.demo;
-
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.SurfaceView;
-import android.view.View;
-import android.widget.Button;
-import android.widget.SeekBar;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.yc.ycvideoplayer.ConstantVideo;
-
-import org.yc.ycvideoplayer.R;
-import com.yc.video.tool.BaseToast;
-
-public class MediaActivity2 extends AppCompatActivity {
-
-    private SurfaceView mSvMainSurface;
-    private SeekBar mSeekBar;
-    private Button mStart;
-    private MediaPlayer mediaPlayer;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_media_player2);
-        initView();
-        initMedia();
-        initSurfaceView();
-    }
-
-
-    private void initView() {
-        mSvMainSurface = findViewById(R.id.sv_main_surface);
-        mSeekBar = findViewById(R.id.seekBar);
-        mStart = findViewById(R.id.start);
-        mStart.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mStart.getText().toString().equals("暂停")){
-                    mediaPlayer.start();
-                    mStart.setText("播放");
-                } else {
-                    mediaPlayer.pause();
-                    mStart.setText("暂停");
-                }
-            }
-        });
-    }
-
-    private void initMedia() {
-        mediaPlayer=new MediaPlayer();
-        //设置类型
-        mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
-        /* 得到文件路径 *//* 注：文件存放在SD卡的根目录，一定要进行prepare()方法，使硬件进行准备 */
-        try{
-            Uri uri = Uri.parse(ConstantVideo.VideoPlayerList[2]);
-            /* 为MediaPlayer 设置数据源 */
-            mediaPlayer.setDataSource(this,uri);
-            /* 准备 */
-            mediaPlayer.prepare();
-            //将播放器捕捉的画面展示到SurfaceView画面上
-            mediaPlayer.setDisplay(mSvMainSurface.getHolder());
-        }catch(Exception ex){
-            ex.printStackTrace();
-        }
-        mediaPlayer.start();
-        // 把图标变为暂停图标
-        mStart.setText("暂停");
-        //获取音乐的总时长
-        int duration=mediaPlayer.getDuration();
-        //设置进度条的最大值为音乐总时长
-        mSeekBar.setMax(duration);
-
-    }
-
-
-    private void initSurfaceView() {
-        mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {}
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {}
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                //获取拖动结束之后的位置
-                int progress=seekBar.getProgress();
-                //跳转到某个位置播放
-                mediaPlayer.seekTo(progress);
-            }
-        });
-    }
-
-}

Demo/src/main/java/com/yc/ycvideoplayer/m3u8/M3u8Activity.java

@@ -20,7 +20,7 @@ import com.yc.m3u8.utils.M3u8FileUtils;
 import com.yc.m3u8.utils.NetSpeedUtils;
 import com.yc.ycvideoplayer.video.activity.NormalActivity;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 import java.io.File;
 import java.io.IOException;

Demo/src/main/java/com/yc/ycvideoplayer/music/MusicPlayerActivity.java

@@ -15,7 +15,7 @@ import androidx.fragment.app.FragmentTransaction;
 import com.yc.music.inter.OnPlayerEventListener;
 import com.yc.music.model.AudioBean;
 import com.yc.music.tool.BaseAppHelper;
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 public class MusicPlayerActivity extends AppCompatActivity implements View.OnClickListener {
 

Demo/src/main/java/com/yc/ycvideoplayer/music/PlayMusicFragment.java

@@ -30,7 +30,7 @@ import com.yc.video.tool.PlayerUtils;
 import com.yc.videotool.VideoSpUtils;
 import com.yc.videotool.VideoLogUtils;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 import java.util.Objects;
 

Demo/src/main/java/com/yc/ycvideoplayer/video/activity/DetailActivity.java

@@ -11,11 +11,11 @@ import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.ViewCompat;
 
-import org.yc.ycvideoplayer.R;
 import com.yc.video.player.VideoViewManager;
 import com.yc.video.player.VideoPlayer;
 import com.yc.video.tool.PlayerUtils;
 import com.yc.video.ui.view.BasisVideoController;
+import com.yc.ycvideoplayer.R;
 
 public class DetailActivity extends AppCompatActivity {
 

Demo/src/main/java/com/yc/ycvideoplayer/video/activity/MultipleActivity.java

@@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.player.VideoPlayer;
 import com.yc.video.player.VideoPlayerBuilder;
 import com.yc.video.ui.view.BasisVideoController;

Demo/src/main/java/com/yc/ycvideoplayer/video/activity/NormalActivity.java

@@ -17,7 +17,7 @@ import com.yc.kernel.utils.PlayerFactoryUtils;
 import com.yc.ycvideoplayer.BuriedPointEventImpl;
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoPlayerConfig;
 import com.yc.video.player.OnVideoStateListener;

Demo/src/main/java/com/yc/ycvideoplayer/video/activity/TypeActivity.java

@@ -11,7 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.ycvideoplayer.video.ad.AdActivity;
 import com.yc.ycvideoplayer.video.clarity.ClarityActivity;
 import com.yc.ycvideoplayer.video.danmu.DanmuActivity;

Demo/src/main/java/com/yc/ycvideoplayer/video/ad/AdActivity.java

@@ -11,7 +11,7 @@ import com.bumptech.glide.Glide;
 import com.yc.videocache.HttpProxyCacheServer;
 
 import com.yc.ycvideoplayer.ConstantVideo;
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.videocache.cache.ProxyVideoCacheManager;
 
 import com.yc.video.config.ConstantKeys;

Demo/src/main/java/com/yc/ycvideoplayer/video/ad/AdControlView.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 import com.yc.video.bridge.ControlWrapper;
 import com.yc.video.config.ConstantKeys;

Demo/src/main/java/com/yc/ycvideoplayer/video/clarity/ClarityActivity.java

@@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import com.bumptech.glide.Glide;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.VideoPlayer;

Demo/src/main/java/com/yc/ycvideoplayer/video/clarity/DefinitionControlView.java

@@ -17,7 +17,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.tool.PlayerUtils;
 import com.yc.video.ui.view.CustomBottomView;

Demo/src/main/java/com/yc/ycvideoplayer/video/danmu/DanmuActivity.java

@@ -9,7 +9,7 @@ import com.bumptech.glide.Glide;
 import com.yc.ycvideoplayer.BaseActivity;
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.player.SimpleStateListener;
 import com.yc.video.player.VideoPlayer;

Demo/src/main/java/com/yc/ycvideoplayer/video/danmu/MyDanmakuView.java

@@ -17,7 +17,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 import com.yc.video.bridge.ControlWrapper;
 import com.yc.video.config.ConstantKeys;

Demo/src/main/java/com/yc/ycvideoplayer/video/list/ContinuousVideoActivity.java

@@ -10,7 +10,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.bumptech.glide.Glide;
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.SimpleStateListener;

Demo/src/main/java/com/yc/ycvideoplayer/video/list/RecyclerView2Fragment.java

@@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.yc.pagerlib.recycler.ScrollPageHelper;
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.SimpleStateListener;

Demo/src/main/java/com/yc/ycvideoplayer/video/list/RecyclerViewFragment.java

@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.yc.videotool.VideoLogUtils;
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.SimpleStateListener;

Demo/src/main/java/com/yc/ycvideoplayer/video/list/SeamlessPlayFragment.java

@@ -10,7 +10,7 @@ import androidx.annotation.RequiresApi;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.ycvideoplayer.video.activity.DetailActivity;
 import com.yc.ycvideoplayer.video.activity.IntentKeys;
 import com.yc.video.config.ConstantKeys;

Demo/src/main/java/com/yc/ycvideoplayer/video/list/TestListActivity.java

@@ -2,7 +2,7 @@ package com.yc.ycvideoplayer.video.list;
 
 import com.yc.ycvideoplayer.BaseActivity;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.ycvideoplayer.video.tiktok.TikTok1ListFragment;
 import com.yc.ycvideoplayer.video.tiktok.TikTokListFragment;
 

Demo/src/main/java/com/yc/ycvideoplayer/video/list/VideoRecyclerViewAdapter.java

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.ui.view.CustomPrepareView;
 

Demo/src/main/java/com/yc/ycvideoplayer/video/pip/PipActivity.java

@@ -11,7 +11,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.bumptech.glide.Glide;
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.player.VideoPlayer;
 import com.yc.video.player.VideoViewManager;
 import com.yc.video.ui.pip.FloatVideoManager;

Demo/src/main/java/com/yc/ycvideoplayer/video/pip/PipListActivity.java

@@ -14,7 +14,7 @@ import com.yc.ycvideoplayer.ConstantVideo;
 import com.yc.ycvideoplayer.video.list.OnItemChildClickListener;
 import com.yc.ycvideoplayer.video.list.VideoRecyclerViewAdapter;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.VideoPlayer;

Demo/src/main/java/com/yc/ycvideoplayer/video/surface/MySurfaceView.java

@@ -14,7 +14,7 @@ import android.view.MotionEvent;
 
 import com.yc.videotool.VideoLogUtils;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 public class MySurfaceView extends SurfaceView implements Runnable, SurfaceHolder.Callback {
 

Demo/src/main/java/com/yc/ycvideoplayer/video/surface/TestSurfaceActivity.java

@@ -8,7 +8,7 @@ import android.widget.RelativeLayout;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 public class TestSurfaceActivity extends AppCompatActivity {
 

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1Activity.java

@@ -19,7 +19,7 @@ import com.yc.ycvideoplayer.ConstantVideo;
 import com.yc.ycvideoplayer.video.list.OnItemChildClickListener;
 import com.yc.ycvideoplayer.video.list.VideoRecyclerViewAdapter;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.SimpleStateListener;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1ListAdapter.java

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.VideoInfoBean;
 
 import java.util.List;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok1ListFragment.java

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.VideoInfoBean;
 
 import java.util.ArrayList;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTok2Activity.java

@@ -12,7 +12,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.yc.videotool.VideoLogUtils;
 
 import com.yc.ycvideoplayer.ConstantVideo;
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 import com.yc.pagerlib.pager.VerticalViewPager;
 import com.yc.videocache.cache.PreloadManager;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokListAdapter.java

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.VideoInfoBean;
 
 import java.util.List;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokListFragment.java

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.VideoInfoBean;
 
 import java.util.ArrayList;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/TikTokView.java

@@ -16,7 +16,7 @@ import androidx.annotation.Nullable;
 
 import com.yc.videotool.VideoLogUtils;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 
 import com.yc.video.bridge.ControlWrapper;
 import com.yc.video.config.ConstantKeys;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiktok/Tiktok2Adapter.java

@@ -14,7 +14,7 @@ import androidx.viewpager.widget.PagerAdapter;
 
 import com.bumptech.glide.Glide;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.videocache.cache.PreloadManager;
 import com.yc.video.config.VideoInfoBean;
 

Demo/src/main/java/com/yc/ycvideoplayer/video/tiny/TestFullActivity.java

@@ -9,7 +9,7 @@ import com.bumptech.glide.Glide;
 import com.yc.ycvideoplayer.BaseActivity;
 import com.yc.ycvideoplayer.ConstantVideo;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.player.VideoPlayer;
 import com.yc.video.ui.view.BasisVideoController;

Demo/src/main/java/com/yc/ycvideoplayer/video/tiny/TinyScreenActivity.java

@@ -14,7 +14,7 @@ import com.yc.ycvideoplayer.ConstantVideo;
 import com.yc.ycvideoplayer.video.list.OnItemChildClickListener;
 import com.yc.ycvideoplayer.video.list.VideoRecyclerViewAdapter;
 
-import org.yc.ycvideoplayer.R;
+import com.yc.ycvideoplayer.R;
 import com.yc.video.config.ConstantKeys;
 import com.yc.video.config.VideoInfoBean;
 import com.yc.video.player.SimpleStateListener;

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

@@ -1,74 +0,0 @@
-<?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:background="@color/whiteBg">
-
-    <androidx.appcompat.widget.Toolbar
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@color/colorTheme"
-        android:theme="@style/AppTheme.ActionBar"
-        app:contentInsetStart="0.0dp"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        android:visibility="visible">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="播放视频的原生案例"
-            android:textSize="18sp"
-            android:textColor="@color/blackText"/>
-    </androidx.appcompat.widget.Toolbar>
-
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="10dp">
-            <TextView
-                android:id="@+id/tv_1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:background="@color/colorAccent"
-                android:text="1.最原生的播放器，使用VideoView"/>
-            <TextView
-                android:id="@+id/tv_1_2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:background="@color/colorAccent"
-                android:text="1.2 最原生的播放器，使用SurfaceView+MediaPlayer"/>
-            <TextView
-                android:id="@+id/tv_2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:background="@color/colorAccent"
-                android:text="2.ijk原生播放器"/>
-            <TextView
-                android:id="@+id/tv_3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:padding="10dp"
-                android:background="@color/colorAccent"
-                android:text="3.exo原生播放器"/>
-        </LinearLayout>
-    </ScrollView>
-
-
-</LinearLayout>

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

@@ -1,11 +0,0 @@
-<?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">
-
-    <com.google.android.exoplayer2.ui.PlayerView
-        android:id="@+id/video_view"
-        android:layout_width="match_parent"
-        android:layout_height="300dp"/>
-
-</LinearLayout>

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

@@ -1,8 +0,0 @@
-<?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">
-
-
-
-</LinearLayout>

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

@@ -1,29 +0,0 @@
-<?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">
-
-
-    <VideoView
-        android:id="@+id/video"
-        android:layout_width="match_parent"
-        android:layout_height="240dp"
-        android:background="@android:color/black"/>
-
-    <Button
-        android:id="@+id/btn_start"
-        android:layout_marginTop="5dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="播放" />
-
-    <Button
-        android:id="@+id/btn_pause"
-        android:layout_marginTop="5dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="暂停" />
-
-</LinearLayout>

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

@@ -1,29 +0,0 @@
-<?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">
-
-    <SurfaceView
-        android:layout_width="match_parent"
-        android:layout_height="300dp"
-        android:id="@+id/sv_main_surface" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <SeekBar
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:id="@+id/seekBar" />
-
-        <Button
-            android:id="@+id/start"
-            android:layout_marginTop="5dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="播放" />
-    </LinearLayout>
-</LinearLayout>

VideoCache/build.gradle

@@ -23,5 +23,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation project.ext.AppDependencies['appcompat']
 }