Merge branch 'release/v7.2.3'

README.md

@@ -2,7 +2,7 @@
 --
 <p align="center">
 <a href="http://developer.android.com/index.html"><img src="https://img.shields.io/badge/platform-android-green.svg"></a>
-<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C7.2.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-7.2.2-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C7.2.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-7.2.3-green.svg"></a>
 <a href="http://choosealicense.com/licenses/mit/"><img src="https://img.shields.io/badge/license-MIT-green.svg"></a>
 <a href="https://android-arsenal.com/details/1/3269"><img src="https://img.shields.io/badge/Android%20Arsenal-jiaozivideoplayer-green.svg?style=true"></a>
 </p>
@@ -39,7 +39,7 @@
 
 ## 文档
 
-- [文档 - API](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-API)，下载安装demo[jiaozivideoplayer-7.2.2.apk](https://github.com/Jzvd/JiaoZiVideoPlayer/releases/download/v7.2.2/jiaozivideoplayer-7.2.2.apk)，仔细过一遍demo
+- [文档 - API](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-API)，下载安装demo[jiaozivideoplayer-7.2.3.apk](https://github.com/Jzvd/JiaoZiVideoPlayer/releases/download/v7.2.3/jiaozivideoplayer-7.2.3.apk)，仔细过一遍demo
 - [文档 - 自定义Jzvd](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-%E8%87%AA%E5%AE%9A%E4%B9%89Jzvd)，继承JzvdStd实现自己的播放器
 - [文档 - 自定义播放内核](https://github.com/Jzvd/JiaoZiVideoPlayer/wiki/%E6%96%87%E6%A1%A3-%E2%80%94-%E8%87%AA%E5%AE%9A%E4%B9%89%E6%92%AD%E6%94%BE%E5%86%85%E6%A0%B8)，测试哪个播放内核适合自己的项目
 
@@ -53,7 +53,7 @@
 
 1.添加类库
 ```gradle
-compile 'cn.jzvd:jiaozivideoplayer:7.2.2'
+compile 'cn.jzvd:jiaozivideoplayer:7.2.3'
 ```
 
 2.添加布局

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

app/build.gradle → demo/build.gradle

@@ -2,13 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
+    buildToolsVersion = '29.0.3'
 
     defaultConfig {
         applicationId "cn.jzvd.demo"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 97
-        versionName "7.2.2"
+        versionCode 98
+        versionName "7.2.3"
         ndk {
             // add support lib
             abiFilters 'armeabi-v7a' //, 'arm64-v8a'//, "mips"  //,'armeabi''x86',, 'x86_64',
@@ -47,12 +48,14 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation project(':jiaozivideoplayer')
+    implementation 'com.android.support:design:28.0.0'
+    implementation project(':library')
     implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
     implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.danikula:videocache:2.7.0'
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation 'com.google.android.exoplayer:exoplayer:2.10.4'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }

app/src/main/AndroidManifest.xml → demo/src/main/AndroidManifest.xml

@@ -124,6 +124,9 @@
         <activity android:name=".ActivityScreenRotate"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
+        <activity android:name=".BigUIChangeAG.ActivityApiUIBigChangeAG"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

app/src/main/java/cn/jzvd/demo/ActivityApi.java → demo/src/main/java/cn/jzvd/demo/ActivityApi.java

@@ -63,7 +63,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         /** Play video in local localVideoPath, eg:record by system camera **/
 //        cpAssertVideoToLocalPath();
-//        mJzvdStd.setUp(Environment.getExternalStorageDirectory().getAbsolutePath() + "/DCIM/Camera/local_video.mp4"
+//        mJzvdStd.setUp(Environment.getExternalStorageDirectory().getAbsolutePath() + "/DCIM/Camera/activity_local_video.mp4"
 //                , "饺子不信", Jzvd.SCREEN_NORMAL);
         mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
         mSensorEventListener = new Jzvd.JZAutoFullscreenListener();
@@ -109,7 +109,7 @@ public void cpAssertVideoToLocalPath() {
         verifyStoragePermissions();
         try {
             InputStream myInput;
-            OutputStream myOutput = new FileOutputStream(Environment.getExternalStorageDirectory().getAbsolutePath() + "/DCIM/Camera/local_video.mp4");
+            OutputStream myOutput = new FileOutputStream(Environment.getExternalStorageDirectory().getAbsolutePath() + "/DCIM/Camera/activity_local_video.mp4");
             myInput = this.getAssets().open("local_video.mp4");
             byte[] buffer = new byte[1024];
             int length = myInput.read(buffer);
@@ -146,8 +146,8 @@ public void clickSmallChange(View view) {
     }
 
     public void clickBigChange(View view) {
-        Toast.makeText(ActivityApi.this, "Comming Soon", Toast.LENGTH_SHORT).show();
-//                startActivity(new Intent(ActivityApi.this, ActivityApiUIBigChange.class));
+//        Toast.makeText(ActivityApi.this, "Comming Soon", Toast.LENGTH_SHORT).show();
+                startActivity(new Intent(ActivityApi.this, ActivityApiUIBigChange.class));
     }
 
     public void clickOrientation(View view) {

app/src/main/java/cn/jzvd/demo/ActivityApiUIBigChange.java → demo/src/main/java/cn/jzvd/demo/ActivityApiUIBigChange.java

@@ -1,12 +1,15 @@
 package cn.jzvd.demo;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import cn.jzvd.Jzvd;
+import cn.jzvd.demo.BigUIChangeAG.ActivityApiUIBigChangeAG;
 
 /**
  * Created by Nathen on 16/7/31.
@@ -38,6 +41,10 @@ protected void onPause() {
         Jzvd.releaseAllVideos();
     }
 
+    public void clickUiAGBigChange(View view) {
+        startActivity(new Intent(ActivityApiUIBigChange.this, ActivityApiUIBigChangeAG.class));
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {

app/src/main/java/cn/jzvd/demo/ActivityLocalVideo.java → demo/src/main/java/cn/jzvd/demo/ActivityLocalVideo.java

@@ -44,10 +44,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         getSupportActionBar().setDisplayShowTitleEnabled(true);
         getSupportActionBar().setDisplayUseLogoEnabled(false);
         getSupportActionBar().setTitle("PlayLocalVideo");
-        setContentView(R.layout.local_video);
+        setContentView(R.layout.activity_local_video);
         jzvdLocalPath = findViewById(cn.jzvd.demo.R.id.lcoal_path);
         jzvdAssertPath = findViewById(cn.jzvd.demo.R.id.assert_path);
-        localVideoPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/DCIM/Camera/local_video.mp4";
+        localVideoPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/DCIM/Camera/activity_local_video.mp4";
 
         //checkPermission
         int permission = ActivityCompat.checkSelfPermission(this, "android.permission.WRITE_EXTERNAL_STORAGE");

demo/src/main/java/cn/jzvd/demo/BigUIChangeAG/AGEpsodeEntity.java

@@ -0,0 +1,37 @@
+package cn.jzvd.demo.BigUIChangeAG;
+
+public class AGEpsodeEntity {
+    private String videoUrl;
+    private String videoName;
+    /**是否被选中播放(默认没有播放)*/
+    private boolean isPlay=false;
+
+    public AGEpsodeEntity(String videoUrl, String videoName) {
+        this.videoUrl = videoUrl;
+        this.videoName = videoName;
+    }
+
+    public boolean isPlay() {
+        return isPlay;
+    }
+
+    public void setPlay(boolean play) {
+        isPlay = play;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public String getVideoName() {
+        return videoName;
+    }
+
+    public void setVideoName(String videoName) {
+        this.videoName = videoName;
+    }
+}