Merge branch 'release/v7.0.1'

Jzvd · May 1, 2019 · 1ddbe7f · 1ddbe7f
2 parents 7bbbfa9 + 54f0372
commit 1ddbe7f
Show file tree

Hide file tree

Showing 37 changed files with 350 additions and 496 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -11,6 +11,8 @@
 
 Q群: 490442439 2群: 761899104 验证信息:jzvd
 
+微信公众号搜索: jzvdjzt [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
+
 ## 主要特点
 
 1. 可以完全自定义UI和任何功能
@@ -47,6 +49,8 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd
 
 即便是自定义UI，或者对Library有过修改，也是这五步骤来使用播放器。
 
+7.0版本是预览版本，还没开发完，还有问题，请先用6.4.3
+
 1.添加类库
 ```gradle
 compile 'cn.jzvd:jiaozivideoplayer:7.0_preview'
@@ -129,6 +133,7 @@ protected void onPause() {
 
 1. [熊晓清](http://blog.csdn.net/yaya_xiong) QQ:137048616
 2. [の伤也快乐](https://github.com/jmhjmh) QQ:466278628
+3. [吴亚男]() QQ:623562486
 
 * [wiki整理](https://github.com/lipangit/JiaoZiVideoPlayer/wiki#wiki%E6%95%B4%E7%90%86)
 

diff --git a/README.md b/README.md
@@ -7,10 +7,13 @@
 <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>
 
-Highly customizable Android video player
-
 Q群: 490442439 2群: 761899104 验证信息:jzvd
 
+微信公众号搜索: jzvdjzt [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
+
+## 划重点
+为了增加项目质量，促进项目进度，调用社群力量，方便社群管理，近日将推出基于以太坊erc-20的数字通证[JiaoZiToken(JZT)(饺子Token)](https://github.com/lipangit/JZT)，通俗点理解，谁给饺子视频播放器写代码、出主意、解决用户问题、活跃社群关系、关注项目进展，就给谁饺子Token。将来会让项目更加丰富，更加精致，必定大有可为。
+
 [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)  [EnglishWiki](https://github.com/felipetorres/VideoPlayer-Wiki)  
 [中文ReadMe](https://github.com/lipangit/JiaoZiVideoPlayer/blob/develop/README-ZH.md)  
 [WorkPlan](https://github.com/lipangit/JiaoZiVideoPlayer/projects/2)  
@@ -52,6 +55,8 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd
 
 Only five steps to use the player:
 
+The 7.0 version is a preview version. It has not been developed yet. There are still problems. Please use 6.4.3 first.
+
 1.Import library:
 ```gradle
 implementation 'cn.jzvd:jiaozivideoplayer:7.0_preview'
@@ -117,6 +122,7 @@ protected void onPause() {
 
 1. [熊晓清](http://blog.csdn.net/yaya_xiong) QQ:137048616
 2. [の伤也快乐](https://github.com/jmhjmh) QQ:466278628
+3. [吴亚男]() QQ:623562486
 
 ## Reward
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "cn.jzvd.demo"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 88
-        versionName "7.0_preview"
+        versionCode 89
+        versionName "7.0.1"
     }
     signingConfigs {
         releaseConfig {
@@ -20,7 +20,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.releaseConfig
         }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -37,10 +37,6 @@
             android:name=".ActivityListViewNormal"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ActivityTinyWindowListViewNormal"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ActivityListViewFragmentViewPager"
             android:configChanges="orientation|screenSize|keyboardHidden"
@@ -57,10 +53,6 @@
             android:name=".ActivityTinyWindow"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ActivityTinyWindowListViewMultiHolder"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ActivityTinyWindowRecycleViewMultiHolder"
             android:configChanges="orientation|screenSize|keyboardHidden"

diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApi.java b/app/src/main/java/cn/jzvd/demo/ActivityApi.java
@@ -56,7 +56,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 , JzvdStd.SCREEN_NORMAL);
         Glide.with(this).load(VideoConstant.videoThumbList[0]).into(mJzvdStd.thumbImageView);
 //        mJzvdStd.seekToInAdvance = 20000;
-        //JZVideoPlayer.SAVE_PROGRESS = false;
+//        Jzvd.SAVE_PROGRESS = false;
 
         /** Play video in local path, eg:record by system camera **/
 //        cpAssertVideoToLocalPath();

diff --git a/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMedia.java b/app/src/main/java/cn/jzvd/demo/ActivityApiCustomMedia.java
@@ -47,7 +47,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        jzvdStd.setUp(jzDataSource, JzvdStd.SCREEN_NORMAL, new JZMediaSystemAssertFolder(jzvdStd));
+        jzvdStd.setUp(jzDataSource, JzvdStd.SCREEN_NORMAL, JZMediaSystemAssertFolder.class);
 
 
 //        jzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4"
@@ -62,25 +62,24 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
     public void clickChangeToIjkplayer(View view) {
         Jzvd.resetAllVideos();
-
         jzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4"
-                , "饺子快长大", JzvdStd.SCREEN_NORMAL, new JZMediaIjk(jzvdStd));
+                , "饺子快长大", JzvdStd.SCREEN_NORMAL, JZMediaIjk.class);
         jzvdStd.startVideo();
         Toast.makeText(this, "Change to Ijkplayer", Toast.LENGTH_SHORT).show();
     }
 
     public void clickChangeToSystem(View view) {
         Jzvd.resetAllVideos();
         jzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4"
-                , "饺子快长大", JzvdStd.SCREEN_NORMAL, new JZMediaSystem(jzvdStd));
+                , "饺子快长大", JzvdStd.SCREEN_NORMAL, JZMediaSystem.class);
         jzvdStd.startVideo();
         Toast.makeText(this, "Change to MediaPlayer", Toast.LENGTH_SHORT).show();
     }
 
     public void clickChangeToExo(View view) {
         Jzvd.resetAllVideos();
         jzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4"
-                , "饺子快长大", JzvdStd.SCREEN_NORMAL, new JZMediaExo(jzvdStd));
+                , "饺子快长大", JzvdStd.SCREEN_NORMAL, JZMediaExo.class);
         jzvdStd.startVideo();
         Toast.makeText(this, "Change to ExoPlayer", Toast.LENGTH_SHORT).show();
     }

diff --git a/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java b/app/src/main/java/cn/jzvd/demo/ActivityListViewMultiHolder.java
@@ -48,8 +48,6 @@ public void onScrollStateChanged(AbsListView view, int scrollState) {
 
             @Override
             public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-//                Jzvd.onScrollReleaseAllVideos(view, firstVisibleItem, visibleItemCount, totalItemCount);
-
                 if (Jzvd.CURRENT_JZVD == null) return;
                 int lastVisibleItem = firstVisibleItem + visibleItemCount;
                 int currentPlayPosition = Jzvd.CURRENT_JZVD.positionInList;

diff --git a/app/src/main/java/cn/jzvd/demo/ActivityListViewNormal.java b/app/src/main/java/cn/jzvd/demo/ActivityListViewNormal.java
@@ -31,7 +31,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_listview_normal);
 
         listView = findViewById(R.id.listview);
-        listView.setAdapter(new AdapterVideoList(this,
+        listView.setAdapter(new AdapterListView(this,
                 VideoConstant.videoUrls[0],
                 VideoConstant.videoTitles[0],
                 VideoConstant.videoThumbs[0]));
@@ -56,7 +56,6 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
                         }
                     }
                 }
-//                Jzvd.onScrollReleaseAllVideos(view, firstVisibleItem, visibleItemCount, totalItemCount);
             }
         });
 

diff --git a/app/src/main/java/cn/jzvd/demo/ActivityListViewRecyclerView.java b/app/src/main/java/cn/jzvd/demo/ActivityListViewRecyclerView.java
@@ -15,7 +15,7 @@
  */
 public class ActivityListViewRecyclerView extends AppCompatActivity {
     RecyclerView recyclerView;
-    AdapterRecyclerViewVideo adapterVideoList;
+    AdapterRecyclerView adapterVideoList;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -30,7 +30,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         recyclerView = findViewById(R.id.recyclerview);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
 
-        adapterVideoList = new AdapterRecyclerViewVideo(this);
+        adapterVideoList = new AdapterRecyclerView(this);
         recyclerView.setAdapter(adapterVideoList);
         recyclerView.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
             @Override

diff --git a/app/src/main/java/cn/jzvd/demo/ActivityMain.java b/app/src/main/java/cn/jzvd/demo/ActivityMain.java
@@ -28,6 +28,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         myJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4"
                 , "饺子快长大", JzvdStd.SCREEN_NORMAL);
         Glide.with(this).load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png").into(myJzvdStd.thumbImageView);
+
     }
 
     @Override

diff --git a/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java b/app/src/main/java/cn/jzvd/demo/ActivityTinyWindow.java
@@ -1,5 +1,6 @@
 package cn.jzvd.demo;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
@@ -11,14 +12,15 @@
 
 import cn.jzvd.Jzvd;
 import cn.jzvd.JzvdStd;
+import cn.jzvd.demo.CustomJzvd.JzvdStdTinyWindow;
 
 /**
  * Created by Nathen on 2017/10/31.
  */
 
 public class ActivityTinyWindow extends AppCompatActivity {
 
-    JzvdStd mJzvdStd;
+    JzvdStdTinyWindow jzvdStdTinyWindow;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -30,12 +32,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         getSupportActionBar().setTitle("TinyWindow");
         setContentView(R.layout.activity_tiny_window);
 
-        mJzvdStd = findViewById(R.id.jz_video);
-        mJzvdStd.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4", "饺子快长大"
+        jzvdStdTinyWindow = findViewById(R.id.jz_video);
+        jzvdStdTinyWindow.setUp("http://jzvd.nathen.cn/342a5f7ef6124a4a8faf00e738b8bee4/cf6d9db0bd4d41f59d09ea0a81e918fd-5287d2089db37e62345123a1be272f8b.mp4", "饺子快长大"
                 , JzvdStd.SCREEN_NORMAL);
         Glide.with(this)
                 .load("http://jzvd-pic.nathen.cn/jzvd-pic/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png")
-                .into(mJzvdStd.thumbImageView);
+                .into(jzvdStdTinyWindow.thumbImageView);
 
     }
 
@@ -66,17 +68,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
 
     public void clickTinyWindow(View view) {
-        mJzvdStd.gotoScreenTiny();
-    }
-
-    public void clickAutoTinyListView(View view) {
-        Toast.makeText(this, "comming soon", Toast.LENGTH_SHORT).show();
-//        startActivity(new Intent(this, ActivityTinyWindowListViewNormal.class));
-    }
-
-    public void clickAutoTinyListViewMultiHolder(View view) {
-        Toast.makeText(this, "comming soon", Toast.LENGTH_SHORT).show();
-//        startActivity(new Intent(this, ActivityTinyWindowListViewMultiHolder.class));
+        jzvdStdTinyWindow.gotoScreenTiny();
     }
 
     public void clickAutoTinyListViewRecyclerView(View view) {