From a395fa3323adbd306496142981a9a83bd006230b Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 12 May 2019 02:03:20 +0800
Subject: [PATCH 01/16] fix .gradle
---
gradle/maven_push.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle
index 43cac0989..a41d81063 100644
--- a/gradle/maven_push.gradle
+++ b/gradle/maven_push.gradle
@@ -8,7 +8,7 @@ signing {
group = "cn.jzvd"
archivesBaseName = "jiaozivideoplayer"
-version = "7.0.2"
+version = "7.0.3"
uploadArchives {
repositories {
From 6783461aa0649299ef201caa8faa79d67447f3e3 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Tue, 14 May 2019 01:13:25 +0800
Subject: [PATCH 02/16] readme
---
README-ZH.md | 18 +++++++++---------
README.md | 17 +++++++++--------
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/README-ZH.md b/README-ZH.md
index 5c3a25f20..7579411de 100644
--- a/README-ZH.md
+++ b/README-ZH.md
@@ -49,28 +49,28 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd
即便是自定义UI，或者对Library有过修改，也是这五步骤来使用播放器。
-7.0.3不是非常稳定，感兴趣的可以尝试
-
1.添加类库
```gradle
compile 'cn.jzvd:jiaozivideoplayer:7.0.3'
```
-或直接下载 [aar](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.4.2) (不建议)
-
2.添加布局
```xml
-
+ android:layout_height="200dp">
+
+
```
3.设置视频地址、缩略图地址、标题
```java
-JzvdStd jzvdStd = (JzvdStd) findViewById(R.id.videoplayer);
+MyJzvdStd jzvdStd = (MyJzvdStd) findViewById(R.id.jz_video);
jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4"
- , "饺子闭眼睛", Jzvd.SCREEN_WINDOW_NORMAL);
+ , "饺子闭眼睛");
jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640");
```
diff --git a/README.md b/README.md
index 7ee52149d..b3c8b0401 100644
--- a/README.md
+++ b/README.md
@@ -55,28 +55,29 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd
Only five steps to use the player:
-The 7.0.3 version is not very stable.
-
1.Import library:
```gradle
implementation 'cn.jzvd:jiaozivideoplayer:7.0.3'
```
-Or download [aar](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.4.2) (not recommended).
2.Add `JZVideoPlayer` in your layout:
```xml
-
+ android:layout_height="200dp">
+
+
```
3.Set the video uri, video thumb url and video title:
```java
-JzvdStd jzvdStd = (JzvdStd) findViewById(R.id.videoplayer);
+MyJzvdStd jzvdStd = (MyJzvdStd) findViewById(R.id.jz_video);
jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4"
- , "饺子闭眼睛" , Jzvd.SCREEN_WINDOW_NORMAL);
+ , "饺子闭眼睛");
jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640");
```
From ccaa2895a4131d117ebd5eeba1be5268c73e0e53 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Thu, 16 May 2019 22:56:13 +0800
Subject: [PATCH 03/16] upgrade as
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 748746728..5ea98810f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.0'
+ classpath 'com.android.tools.build:gradle:3.4.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
From 9572ab5534da60f82423216c15b0fe19b50ca310 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Mon, 20 May 2019 18:36:26 +0800
Subject: [PATCH 04/16] demo ui
---
app/src/main/res/layout/activity_api.xml | 3 +--
app/src/main/res/layout/activity_api_rotation_videosize.xml | 3 +--
app/src/main/res/layout/activity_ui_small_change.xml | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/activity_api.xml b/app/src/main/res/layout/activity_api.xml
index d965d9f1b..e41c040a1 100644
--- a/app/src/main/res/layout/activity_api.xml
+++ b/app/src/main/res/layout/activity_api.xml
@@ -16,8 +16,7 @@
+ android:layout_height="200dp">
+ android:layout_height="200dp" />
Date: Mon, 20 May 2019 18:54:47 +0800
Subject: [PATCH 05/16] fix change url bug
---
jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
index fb0d53ed6..ecffb428e 100644
--- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
+++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
@@ -502,10 +502,15 @@ public void startVideo() {
}
+ public void changeUrl(String url, String title, long seekToInAdvance) {
+ changeUrl(new JZDataSource(url, title), seekToInAdvance);
+ }
+
public void changeUrl(int urlMapIndex, long seekToInAdvance) {
state = STATE_PREPARING_CHANGING_URL;
this.seekToInAdvance = seekToInAdvance;
jzDataSource.currentUrlIndex = urlMapIndex;
+ mediaInterface.release();
mediaInterface.prepare();
}
@@ -513,13 +518,10 @@ public void changeUrl(JZDataSource jzDataSource, long seekToInAdvance) {
state = STATE_PREPARING_CHANGING_URL;
this.seekToInAdvance = seekToInAdvance;
this.jzDataSource = jzDataSource;
+ mediaInterface.release();
mediaInterface.prepare();
}
- public void changeUrl(String url, String title, long seekToInAdvance) {
- changeUrl(new JZDataSource(url, title), seekToInAdvance);
- }
-
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
if (screen == SCREEN_FULLSCREEN || screen == SCREEN_TINY) {
From b4f2fb949e379207f5ba6862758e7636b45bbff7 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Mon, 20 May 2019 19:38:03 +0800
Subject: [PATCH 06/16] fix changeurl bug
---
app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java | 5 +++++
app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaIjk.java | 5 +++++
.../cn/jzvd/demo/CustomMedia/JZMediaSystemAssertFolder.java | 4 ++++
.../src/main/java/cn/jzvd/JZMediaInterface.java | 2 ++
jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaSystem.java | 4 ++++
jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java | 2 ++
6 files changed, 22 insertions(+)
diff --git a/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java b/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java
index 555819a3e..c683b0b67 100755
--- a/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java
+++ b/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaExo.java
@@ -264,6 +264,11 @@ public void onSeekProcessed() {
handler.post(() -> jzvd.onSeekComplete());
}
+ @Override
+ public void setSurface(Surface surface) {
+ simpleExoPlayer.setVideoSurface(surface);
+ }
+
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
if (SAVED_SURFACE == null) {
diff --git a/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaIjk.java b/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaIjk.java
index 053345554..5edce679a 100644
--- a/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaIjk.java
+++ b/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaIjk.java
@@ -163,6 +163,11 @@ public void onTimedText(IMediaPlayer iMediaPlayer, IjkTimedText ijkTimedText) {
}
+ @Override
+ public void setSurface(Surface surface) {
+ ijkMediaPlayer.setSurface(surface);
+ }
+
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
if (SAVED_SURFACE == null) {
diff --git a/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaSystemAssertFolder.java b/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaSystemAssertFolder.java
index 0d1152507..22ac0bb64 100644
--- a/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaSystemAssertFolder.java
+++ b/app/src/main/java/cn/jzvd/demo/CustomMedia/JZMediaSystemAssertFolder.java
@@ -184,6 +184,10 @@ public void onVideoSizeChanged(MediaPlayer mediaPlayer, int width, int height) {
handler.post(() -> jzvd.onVideoSizeChanged(width, height));
}
+ @Override
+ public void setSurface(Surface surface) {
+ mediaPlayer.setSurface(surface);
+ }
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaInterface.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaInterface.java
index aa3ac5fb8..a8202b29b 100644
--- a/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaInterface.java
+++ b/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaInterface.java
@@ -3,6 +3,7 @@
import android.graphics.SurfaceTexture;
import android.os.Handler;
import android.os.HandlerThread;
+import android.view.Surface;
import android.view.TextureView;
/**
@@ -42,4 +43,5 @@ public JZMediaInterface(Jzvd jzvd) {
public abstract void setSpeed(float speed);
+ public abstract void setSurface(Surface surface);
}
diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaSystem.java b/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaSystem.java
index 2678015d0..bc8029e81 100644
--- a/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaSystem.java
+++ b/jiaozivideoplayer/src/main/java/cn/jzvd/JZMediaSystem.java
@@ -182,6 +182,10 @@ public void onVideoSizeChanged(MediaPlayer mediaPlayer, int width, int height) {
handler.post(() -> jzvd.onVideoSizeChanged(width, height));
}
+ @Override
+ public void setSurface(Surface surface) {
+ mediaPlayer.setSurface(surface);
+ }
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
index ecffb428e..d8e524113 100644
--- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
+++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
@@ -510,6 +510,7 @@ public void changeUrl(int urlMapIndex, long seekToInAdvance) {
state = STATE_PREPARING_CHANGING_URL;
this.seekToInAdvance = seekToInAdvance;
jzDataSource.currentUrlIndex = urlMapIndex;
+ mediaInterface.setSurface(null);
mediaInterface.release();
mediaInterface.prepare();
}
@@ -518,6 +519,7 @@ public void changeUrl(JZDataSource jzDataSource, long seekToInAdvance) {
state = STATE_PREPARING_CHANGING_URL;
this.seekToInAdvance = seekToInAdvance;
this.jzDataSource = jzDataSource;
+ mediaInterface.setSurface(null);
mediaInterface.release();
mediaInterface.prepare();
}
From 2f714fb3d2fe50c5df27c99bdf937149badb2dbb Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Thu, 23 May 2019 07:52:13 +0800
Subject: [PATCH 07/16] fix null pint bug
---
jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
index d8e524113..4bae2f879 100644
--- a/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
+++ b/jiaozivideoplayer/src/main/java/cn/jzvd/Jzvd.java
@@ -565,7 +565,7 @@ public void clearFloatScreen() {
ViewGroup vg = (ViewGroup) (JZUtils.scanForActivity(getContext())).getWindow().getDecorView();
vg.removeView(this);
- mediaInterface.release();
+ if (mediaInterface != null) mediaInterface.release();
CURRENT_JZVD = null;
}
From 5c58b035ca0d00d588f66eaf1a72964c14ee4029 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 14:05:05 +0800
Subject: [PATCH 08/16] rm doc folds
---
docs/Makefile | 19 ------
docs/conf.py | 167 -------------------------------------------------
docs/index.rst | 20 ------
docs/make.bat | 35 -----------
4 files changed, 241 deletions(-)
delete mode 100644 docs/Makefile
delete mode 100644 docs/conf.py
delete mode 100644 docs/index.rst
delete mode 100644 docs/make.bat
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index 298ea9e21..000000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS =
-SPHINXBUILD = sphinx-build
-SOURCEDIR = .
-BUILDDIR = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
- @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
- @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
deleted file mode 100644
index 377d9fbc3..000000000
--- a/docs/conf.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Configuration file for the Sphinx documentation builder.
-#
-# This file does only contain a selection of the most common options. For a
-# full list see the documentation:
-# http://www.sphinx-doc.org/en/master/config
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- Project information -----------------------------------------------------
-
-project = 'JiaoZiVideoPlayer'
-copyright = '2018, Nathen'
-author = 'Nathen'
-
-# The short X.Y version
-version = ''
-# The full version, including alpha/beta/rc tags
-release = ''
-
-# -- General configuration ---------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The master toctree document.
-master_doc = 'index'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = 'zh'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = None
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'alabaster'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself. Builtin themes are using these templates by
-# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
-# 'searchbox.html']``.
-#
-# html_sidebars = {}
-
-
-# -- Options for HTMLHelp output ---------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'JiaoZiVideoPlayerdoc'
-
-# -- Options for LaTeX output ------------------------------------------------
-
-latex_elements = {
- # The paper size ('letterpaper' or 'a4paper').
- #
- # 'papersize': 'letterpaper',
-
- # The font size ('10pt', '11pt' or '12pt').
- #
- # 'pointsize': '10pt',
-
- # Additional stuff for the LaTeX preamble.
- #
- # 'preamble': '',
-
- # Latex figure (float) alignment
- #
- # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-# author, documentclass [howto, manual, or own class]).
-latex_documents = [
- (master_doc, 'JiaoZiVideoPlayer.tex', 'JiaoZiVideoPlayer Documentation',
- 'Nathen', 'manual'),
-]
-
-# -- Options for manual page output ------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
- (master_doc, 'jiaozivideoplayer', 'JiaoZiVideoPlayer Documentation',
- [author], 1)
-]
-
-# -- Options for Texinfo output ----------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-# dir menu entry, description, category)
-texinfo_documents = [
- (master_doc, 'JiaoZiVideoPlayer', 'JiaoZiVideoPlayer Documentation',
- author, 'JiaoZiVideoPlayer', 'One line description of project.',
- 'Miscellaneous'),
-]
-
-# -- Options for Epub output -------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = project
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#
-# epub_identifier = ''
-
-# A unique identification for the text.
-#
-# epub_uid = ''
-
-# A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
diff --git a/docs/index.rst b/docs/index.rst
deleted file mode 100644
index 667013bf1..000000000
--- a/docs/index.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-.. JiaoZiVideoPlayer documentation master file, created by
- sphinx-quickstart on Sat Sep 29 14:41:21 2018.
- You can adapt this file completely to your liking, but it should at least
- contain the root `toctree` directive.
-
-Welcome to JiaoZiVideoPlayer's documentation!
-=============================================
-
-.. toctree::
- :maxdepth: 2
- :caption: Contents:
-
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/docs/make.bat b/docs/make.bat
deleted file mode 100644
index 27f573b87..000000000
--- a/docs/make.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
- set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=.
-set BUILDDIR=_build
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
- echo.
- echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
- echo.installed, then set the SPHINXBUILD environment variable to point
- echo.to the full path of the 'sphinx-build' executable. Alternatively you
- echo.may add the Sphinx directory to PATH.
- echo.
- echo.If you don't have Sphinx installed, grab it from
- echo.http://sphinx-doc.org/
- exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd
From b7770d55a21db0bcd1ce310916a11a91a26d850d Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 15:34:12 +0800
Subject: [PATCH 09/16] reamde
---
README-EN.md | 131 ++++++++++++++++++++++++++++++++++++++++++
README-ZH.md | 159 ---------------------------------------------------
README.md | 121 ++++++++++++++++++++-------------------
3 files changed, 193 insertions(+), 218 deletions(-)
create mode 100644 README-EN.md
delete mode 100644 README-ZH.md
diff --git a/README-EN.md b/README-EN.md
new file mode 100644
index 000000000..6eeb76b8e
--- /dev/null
+++ b/README-EN.md
@@ -0,0 +1,131 @@
+
+--
+
+
+
+
+
+
+
+
+
+## Features
+
+1. You can completely customize the UI and any method
+2. One line of code to switch the playback engine, supported video formats and protocols depends on the playback engine like: [android.media.MediaPlayer](https://developer.android.com/guide/topics/media/media-formats.html), [IJKplayer](https://github.com/Bilibili/ijkplayer), [ExoPlayer](http://google.github.io/ExoPlayer/supported-formats.html).
+3. Perfect detection of list sliding
+4. Fullscreen and small window option available
+5. Fullscreen works in multiple nested modes like ListView, ViewPager and ListView, ViewPager and Fragment
+6. Can load, pause, play and other normal state into the fullscreen and exit fullscreen
+7. A variety of video screen modes: full screen, you can cut full screen
+8. Use of gravity sensors to automatically enter fullscreen
+9. Gestures to control progress, volume and brightness in fullscreen mode
+10. Home key to exit the interface to suspend the playback, return to the interface to continue playing
+11. WebView Nested Local Video Controls
+12. VideoCache in demo
+13. PlayBack speed
+
+## Steps for usage
+
+1. Read through ReadMe
+2. Download and install the demo apk[jiaozivideoplayer-7.0.3.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v7.0.3/jiaozivideoplayer-7.0.3.apk), each page enters once, each button clicks once
+3. Download and debug the develop branch, and find the source code through the effect
+4. See [custom-related WIKI](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，Realize your own needs
+
+* [Getting Started Document 1](https://www.jianshu.com/p/4c187a09b838)
+* [Getting Started Document 2](https://shimo.im/docs/xj5F85W1gqEEBXRJ)
+
+## Screenshot
+
+![Demo screenshot][1]
+
+## Usage
+
+Only five steps to use the player:
+
+1.Import library:
+```gradle
+implementation 'cn.jzvd:jiaozivideoplayer:7.0.3'
+```
+
+
+2.Add `JZVideoPlayer` in your layout:
+```xml
+
+
+
+```
+
+3.Set the video uri, video thumb url and video title:
+```java
+MyJzvdStd jzvdStd = (MyJzvdStd) findViewById(R.id.jz_video);
+jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4"
+ , "饺子闭眼睛");
+jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640");
+```
+
+4.In `Activity`:
+```java
+@Override
+public void onBackPressed() {
+ if (Jzvd.backPress()) {
+ return;
+ }
+ super.onBackPressed();
+}
+@Override
+protected void onPause() {
+ super.onPause();
+ Jzvd.releaseAllVideos();
+}
+```
+
+5.In `AndroidManifest.xml`:
+```xml
+
+
+```
+
+## Details about UI and code customization
+
+[See our Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki).
+
+## Community
+
+#### Group management
+
+1. [熊晓清](http://blog.csdn.net/yaya_xiong) QQ:137048616
+2. [Lionet](https://github.com/Lionet6?tab=repositories) QQ:2950527715
+3. [montauk](https://github.com/hanmeimei888) QQ:958489121
+4. [张展硕]() QQ:229431468
+
+#### Questions and Answers
+
+1. [熊晓清](http://blog.csdn.net/yaya_xiong) QQ:137048616
+2. [の伤也快乐](https://github.com/jmhjmh) QQ:466278628
+3. [吴亚男]() QQ:623562486
+
+## Reward
+
+![Reward][2]
+
+## License MIT
+
+Copyright (c) 2015-2018 李盼 Nathen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[1]: https://user-images.githubusercontent.com/2038071/31045150-a077cc8a-a5a2-11e7-8dc2-7a0e3a9f3e62.jpg
+[2]: https://user-images.githubusercontent.com/2038071/29978804-45c321ba-8f75-11e7-9040-776d3b6dca1f.jpg
diff --git a/README-ZH.md b/README-ZH.md
deleted file mode 100644
index 7579411de..000000000
--- a/README-ZH.md
+++ /dev/null
@@ -1,159 +0,0 @@
-
---
-
-
-
-
-
-
-
-高度自定义的安卓视频播放器
-
-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和任何功能
-2. 一行代码切换播放引擎，支持的视频格式和协议取决于播放引擎，[android.media.MediaPlayer](https://developer.android.com/guide/topics/media/media-formats.html) [ijkplayer](https://github.com/Bilibili/ijkplayer)
-3. 完美检测列表滑动
-4. 可实现全屏播放，小窗播放
-5. 能在`ListView`、`ViewPager`和`ListView`、`ViewPager`和`Fragment`等多重嵌套模式下全屏工作
-6. 可以在加载、暂停、播放等各种状态中正常进入全屏和退出全屏
-7. 多种视频适配屏幕的方式，可铺满全屏，可以全屏剪裁
-8. 重力感应自动进入全屏
-9. 全屏后手势修改进度和音量
-10. Home键退出界面暂停播放，返回界面继续播放
-11. WebView嵌套本地视频控件
-12. demo中添加视频缓存的例子
-13. 倍速播放
-
-## 使用步骤
-
-1. 通读ReadMe
-2. 下载安装demo apk [jiaozivideoplayer-7.0.3.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v7.0.3/jiaozivideoplayer-7.0.3.apk)，各个页面都进入一次，各个按钮点一次
-3. 下载调试develop分支，有针对性的通过效果找到实现的源码
-4. 看[自定义相关的WIKI](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，实现自己的需求
-
-* [入门文档 1](https://www.jianshu.com/p/4c187a09b838)
-* [入门文档 2](https://shimo.im/docs/xj5F85W1gqEEBXRJ)
-
-## 效果
-
-![Demo Screenshot][1]
-
-[列表滑动自动进入小窗的效果](http://weibo.com/tv/v/FtxpWgqmg?fid=1034:5cda6fc7f394b403d592bd9b1d5a9701)
-
-## 使用
-
-即便是自定义UI，或者对Library有过修改，也是这五步骤来使用播放器。
-
-1.添加类库
-```gradle
-compile 'cn.jzvd:jiaozivideoplayer:7.0.3'
-```
-
-2.添加布局
-```xml
-
-
-
-```
-
-3.设置视频地址、缩略图地址、标题
-```java
-MyJzvdStd jzvdStd = (MyJzvdStd) findViewById(R.id.jz_video);
-jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4"
- , "饺子闭眼睛");
-jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640");
-```
-
-4.在`Activity`中
-```java
-@Override
-public void onBackPressed() {
- if (Jzvd.backPress()) {
- return;
- }
- super.onBackPressed();
-}
-@Override
-protected void onPause() {
- super.onPause();
- Jzvd.releaseAllVideos();
-}
-```
-
-5.在`AndroidManifest.xml`中
-```
-
-```
-
-## [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)
-
-* 常规使用
-
-1. [QuickStart](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/QuickStart)
-2. [列表播放](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%88%97%E8%A1%A8%E6%92%AD%E6%94%BE)
-3. [小窗播放](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%B0%8F%E7%AA%97%E6%92%AD%E6%94%BE)
-4. [直接全屏播放](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E7%9B%B4%E6%8E%A5%E5%85%A8%E5%B1%8F%E6%92%AD%E6%94%BE)
-5. [API](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/API%E7%9A%84%E4%BD%BF%E7%94%A8)
-
-* 自定义
-
-1. [自定义代码](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E8%87%AA%E5%AE%9A%E4%B9%89%E4%BB%A3%E7%A0%81)
-2. [自定义代码示例](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E8%87%AA%E5%AE%9A%E4%B9%89%E4%BB%A3%E7%A0%81%E7%A4%BA%E4%BE%8B)
-3. [自定义UI](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E8%87%AA%E5%AE%9A%E4%B9%89UI)
-4. [自定义UI示例](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E8%87%AA%E5%AE%9A%E4%B9%89UI%E7%A4%BA%E4%BE%8B)
-
-[常见问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98)
-
-
-## [工作分流](https://github.com/lipangit/JiaoZiVideoPlayer/wiki#%E5%B7%A5%E4%BD%9C%E5%88%86%E6%B5%81)
-
-老臣精力能力有限，希望和志同道合的朋友一起把项目做好，感兴趣的同学随时和我报名
-
-* [群管理](https://github.com/lipangit/JiaoZiVideoPlayer/wiki#%E7%BE%A4%E7%AE%A1%E7%90%86)
-
-1. [熊晓清](http://blog.csdn.net/yaya_xiong) QQ:137048616
-2. [Lionet](https://github.com/Lionet6?tab=repositories) QQ:2950527715
-3. [montauk](https://github.com/hanmeimei888) QQ:958489121
-4. [张展硕]() QQ:229431468
-
-* [问题解答](https://github.com/lipangit/JiaoZiVideoPlayer/wiki#%E9%97%AE%E9%A2%98%E8%A7%A3%E7%AD%94)
-
-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)
-
-* [发版](https://github.com/lipangit/JiaoZiVideoPlayer/wiki#%E5%8F%91%E7%89%88)
-
-## [任务发布](https://github.com/lipangit/JiaoZiVideoPlayer/wiki#%E4%BB%BB%E5%8A%A1%E5%8F%91%E5%B8%83)
-
-## [打赏](https://github.com/lipangit/JiaoZiVideoPlayer/wiki#%E6%89%93%E8%B5%8F%E5%92%8C%E5%92%A8%E8%AF%A2)
-
-![打赏][2]
-
-## License MIT
-
-Copyright (c) 2015-2018 李盼 Nathen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-[1]: https://user-images.githubusercontent.com/2038071/31045150-a077cc8a-a5a2-11e7-8dc2-7a0e3a9f3e62.jpg
-[2]: https://user-images.githubusercontent.com/2038071/29978804-45c321ba-8f75-11e7-9040-776d3b6dca1f.jpg
\ No newline at end of file
diff --git a/README.md b/README.md
index b3c8b0401..c813a0fd7 100644
--- a/README.md
+++ b/README.md
@@ -7,61 +7,68 @@
+高度自定义的安卓视频播框架
+
+## 置顶消息：
+
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)
-[Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)
+## 主要特点
+
+1. 可以完全自定义UI和任何功能
+2. 一行代码切换播放引擎，支持的视频格式和协议取决于播放引擎，[android.media.MediaPlayer](https://developer.android.com/guide/topics/media/media-formats.html) [ijkplayer](https://github.com/Bilibili/ijkplayer)
+3. 完美检测列表滑动
+4. 可实现全屏播放，小窗播放
+5. 能在`ListView`、`ViewPager`和`ListView`、`ViewPager`和`Fragment`等多重嵌套模式下全屏工作
+6. 可以在加载、暂停、播放等各种状态中正常进入全屏和退出全屏
+7. 多种视频适配屏幕的方式，可铺满全屏，可以全屏剪裁
+8. 重力感应自动进入全屏
+9. 全屏后手势修改进度和音量
+10. Home键退出界面暂停播放，返回界面继续播放
+11. WebView嵌套本地视频控件
+12. demo中添加视频缓存的例子
+13. 倍速播放
-## Features
+## 使用必读
-1. You can completely customize the UI and any method
-2. One line of code to switch the playback engine, supported video formats and protocols depends on the playback engine like: [android.media.MediaPlayer](https://developer.android.com/guide/topics/media/media-formats.html), [IJKplayer](https://github.com/Bilibili/ijkplayer), [ExoPlayer](http://google.github.io/ExoPlayer/supported-formats.html).
-3. Perfect detection of list sliding
-4. Fullscreen and small window option available
-5. Fullscreen works in multiple nested modes like ListView, ViewPager and ListView, ViewPager and Fragment
-6. Can load, pause, play and other normal state into the fullscreen and exit fullscreen
-7. A variety of video screen modes: full screen, you can cut full screen
-8. Use of gravity sensors to automatically enter fullscreen
-9. Gestures to control progress, volume and brightness in fullscreen mode
-10. Home key to exit the interface to suspend the playback, return to the interface to continue playing
-11. WebView Nested Local Video Controls
-12. VideoCache in demo
-13. PlayBack speed
+1. 通读ReadMe
+2. 下载安装demo apk [jiaozivideoplayer-7.0.3.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v7.0.3/jiaozivideoplayer-7.0.3.apk)，各个页面都进入一次，各个按钮点一次
+3. 下载调试develop分支，有针对性的通过效果找到实现的源码
+4. 继承JzvdStd，实现自己的需求
+5. 请仔细阅读相关文档和博客，可以把相关链接填在这里。
-## Steps for usage
+* [入门文档 1](https://juejin.im/entry/5cb838b5518825186d65430a)
+* [入门文档 2](https://shimo.im/docs/xj5F85W1gqEEBXRJ)
+* [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)
+* [EnglishWiki](https://github.com/felipetorres/VideoPlayer-Wiki)
+* [Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)
-1. Read through ReadMe
-2. Download and install the demo apk[jiaozivideoplayer-7.0.3.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v7.0.3/jiaozivideoplayer-7.0.3.apk), each page enters once, each button clicks once
-3. Download and debug the develop branch, and find the source code through the effect
-4. See [custom-related WIKI](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，Realize your own needs
+* [常见问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/常见问题)，已经解决的，常见问题列表
+* [未解决问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/未解决问题)，群主解决不了的，需要大家帮助的问题
-* [Getting Started Document 1](https://www.jianshu.com/p/4c187a09b838)
-* [Getting Started Document 2](https://shimo.im/docs/xj5F85W1gqEEBXRJ)
+6.提问步骤
-## Screenshot
+* 有问题请到Issue提问，我会第一时间回复，着急的QQ微信通知我一声，随时随地回复。微信:lipanhelloworld QQ:1066666651
+* 复杂的问题可以到群里讨论，有管理员接应，解决不了找群主
-![Demo screenshot][1]
+## 效果
-[small window effect on list sliding](http://weibo.com/tv/v/FtxpWgqmg?fid=1034:5cda6fc7f394b403d592bd9b1d5a9701).
+![Demo Screenshot][1]
-## Usage
+## 使用
-Only five steps to use the player:
+即便是自定义UI，或者对Library有过修改，把自定义的逻辑写到继承JzvdStd的类中，然后依然通过如下骤调用播放器。
-1.Import library:
+1.添加类库
```gradle
-implementation 'cn.jzvd:jiaozivideoplayer:7.0.3'
+compile 'cn.jzvd:jiaozivideoplayer:7.0.3'
```
-
-2.Add `JZVideoPlayer` in your layout:
+2.添加布局
```xml
```
-3.Set the video uri, video thumb url and video title:
+3.设置视频地址、缩略图地址、标题
```java
MyJzvdStd jzvdStd = (MyJzvdStd) findViewById(R.id.jz_video);
jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4"
@@ -81,7 +88,7 @@ jzvdStd.setUp("http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc
jzvdStd.thumbImageView.setImage("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640");
```
-4.In `Activity`:
+4.在`Activity`中
```java
@Override
public void onBackPressed() {
@@ -97,41 +104,38 @@ protected void onPause() {
}
```
-5.In `AndroidManifest.xml`:
-```xml
+5.在`AndroidManifest.xml`中
+```
-
+ android:screenOrientation="portrait" />
```
-## Details about UI and code customization
-
-[See our Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki).
+6.在`proguard-rules.pro`中按需添加
+```
+-keep public class cn.jzvd.JZMediaSystem {*; }
+-keep public class cn.jzvd.demo.CustomMedia.CustomMedia {*; }
+-keep public class cn.jzvd.demo.CustomMedia.JZMediaIjk {*; }
+-keep public class cn.jzvd.demo.CustomMedia.JZMediaSystemAssertFolder {*; }
+
+-keep class tv.danmaku.ijk.media.player.** {*; }
+-dontwarn tv.danmaku.ijk.media.player.*
+-keep interface tv.danmaku.ijk.media.player.** { *; }
+```
-## Community
-#### Group management
-1. [熊晓清](http://blog.csdn.net/yaya_xiong) QQ:137048616
-2. [Lionet](https://github.com/Lionet6?tab=repositories) QQ:2950527715
-3. [montauk](https://github.com/hanmeimei888) QQ:958489121
-4. [张展硕]() QQ:229431468
+## [加入我们](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/加入我们)
-#### Questions and Answers
+老臣精力能力有限，希望和志同道合的朋友一起把项目做好，感兴趣的同学随时和我报名
-1. [熊晓清](http://blog.csdn.net/yaya_xiong) QQ:137048616
-2. [の伤也快乐](https://github.com/jmhjmh) QQ:466278628
-3. [吴亚男]() QQ:623562486
-## Reward
-![Reward][2]
## License MIT
-Copyright (c) 2015-2018 李盼 Nathen
+Copyright (c) 2015-2019 李盼
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -139,5 +143,4 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-[1]: https://user-images.githubusercontent.com/2038071/31045150-a077cc8a-a5a2-11e7-8dc2-7a0e3a9f3e62.jpg
-[2]: https://user-images.githubusercontent.com/2038071/29978804-45c321ba-8f75-11e7-9040-776d3b6dca1f.jpg
+[1]: https://user-images.githubusercontent.com/2038071/31045150-a077cc8a-a5a2-11e7-8dc2-7a0e3a9f3e62.jpg
\ No newline at end of file
From d7267800100b3f42258a83e70fdbb7508f7d7d61 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 15:36:49 +0800
Subject: [PATCH 10/16] readme
---
README.md | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index c813a0fd7..3590ddd80 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,7 @@
## 置顶消息：
-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)
+Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt
为了增加项目质量，促进项目进度，调用社群力量，方便社群管理，近日将推出基于以太坊erc-20的数字通证[JiaoZiToken(JZT)(饺子Token)](https://github.com/lipangit/JZT)，通俗点理解，谁给饺子视频播放器写代码、出主意、解决用户问题、活跃社群关系、关注项目进展，就给谁饺子Token。将来会让项目更加丰富，更加精致，必定大有可为。
@@ -49,8 +47,10 @@ Q群: 490442439 2群: 761899104 验证信息:jzvd
* [常见问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/常见问题)，已经解决的，常见问题列表
* [未解决问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/未解决问题)，群主解决不了的，需要大家帮助的问题
+* [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
+
-6.提问步骤
+6.如果还有疑问
* 有问题请到Issue提问，我会第一时间回复，着急的QQ微信通知我一声，随时随地回复。微信:lipanhelloworld QQ:1066666651
* 复杂的问题可以到群里讨论，有管理员接应，解决不了找群主
@@ -131,8 +131,6 @@ protected void onPause() {
老臣精力能力有限，希望和志同道合的朋友一起把项目做好，感兴趣的同学随时和我报名
-
-
## License MIT
Copyright (c) 2015-2019 李盼
From 616a9a0e17c1df7333fff7d54af1879b34641755 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 15:46:05 +0800
Subject: [PATCH 11/16] readme
---
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 3590ddd80..bfdacdb1a 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@
## 置顶消息：
-Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt
+Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微信:lipanhelloworld，QQ:1066666651
-为了增加项目质量，促进项目进度，调用社群力量，方便社群管理，近日将推出基于以太坊erc-20的数字通证[JiaoZiToken(JZT)(饺子Token)](https://github.com/lipangit/JZT)，通俗点理解，谁给饺子视频播放器写代码、出主意、解决用户问题、活跃社群关系、关注项目进展，就给谁饺子Token。将来会让项目更加丰富，更加精致，必定大有可为。
+为了增加项目质量，促进项目进度，调用社群力量，方便社群管理，推出基于以太坊erc-20的数字通证[JiaoZiToken(JZT)(饺子Token)](https://github.com/lipangit/JZT)，通俗点理解，谁给饺子视频播放器写代码、出主意、解决用户问题、活跃社群关系、关注项目进展，就给谁饺子Token。将来会让项目更加丰富，更加精致，必定大有可为。
## 主要特点
@@ -45,9 +45,9 @@ Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt
* [EnglishWiki](https://github.com/felipetorres/VideoPlayer-Wiki)
* [Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)
-* [常见问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/常见问题)，已经解决的，常见问题列表
-* [未解决问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/未解决问题)，群主解决不了的，需要大家帮助的问题
-* [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
+- [常见问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/常见问题)，已经解决的，常见问题列表
+- [未解决问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/未解决问题)，群主解决不了的，需要大家帮助的问题
+- [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
6.如果还有疑问
From 392c2a20857d8562baed142f4bbc8c8d3c0128cc Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 15:58:51 +0800
Subject: [PATCH 12/16] readme
---
README.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index bfdacdb1a..55fb55500 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微
* [入门文档 1](https://juejin.im/entry/5cb838b5518825186d65430a)
* [入门文档 2](https://shimo.im/docs/xj5F85W1gqEEBXRJ)
-* [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)
+* [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，很久没更新了
* [EnglishWiki](https://github.com/felipetorres/VideoPlayer-Wiki)
* [Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)
@@ -49,6 +49,9 @@ Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微
- [未解决问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/未解决问题)，群主解决不了的，需要大家帮助的问题
- [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
+## Prerequisite
+* node
+* npm
6.如果还有疑问
From 45884dd389a4380cdfc1a1c69cb68bb3ba04ef09 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 15:59:37 +0800
Subject: [PATCH 13/16] readme
---
README.md | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 55fb55500..9d3322b8b 100644
--- a/README.md
+++ b/README.md
@@ -39,12 +39,11 @@ Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微
4. 继承JzvdStd，实现自己的需求
5. 请仔细阅读相关文档和博客，可以把相关链接填在这里。
-* [入门文档 1](https://juejin.im/entry/5cb838b5518825186d65430a)
-* [入门文档 2](https://shimo.im/docs/xj5F85W1gqEEBXRJ)
-* [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，很久没更新了
-* [EnglishWiki](https://github.com/felipetorres/VideoPlayer-Wiki)
-* [Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)
-
+- [入门文档 1](https://juejin.im/entry/5cb838b5518825186d65430a)
+- [入门文档 2](https://shimo.im/docs/xj5F85W1gqEEBXRJ)
+- [Wiki](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，很久没更新了
+- [EnglishWiki](https://github.com/felipetorres/VideoPlayer-Wiki)
+- [Weibo](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1)
- [常见问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/常见问题)，已经解决的，常见问题列表
- [未解决问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/未解决问题)，群主解决不了的，需要大家帮助的问题
- [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
From 3beaa04dc1cfbce857a106f683a21dd04cd344ff Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 16:04:03 +0800
Subject: [PATCH 14/16] readme
---
README.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/README.md b/README.md
index 9d3322b8b..ad3584101 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,6 @@ Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微
- [未解决问题](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/未解决问题)，群主解决不了的，需要大家帮助的问题
- [公众号文章](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E5%85%AC%E4%BC%97%E5%8F%B7%E6%96%87%E7%AB%A0)
-## Prerequisite
-* node
-* npm
-
6.如果还有疑问
* 有问题请到Issue提问，我会第一时间回复，着急的QQ微信通知我一声，随时随地回复。微信:lipanhelloworld QQ:1066666651
From d4aa1619c0642f6cc706c14e23756976014ed3a0 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Sun, 26 May 2019 16:25:19 +0800
Subject: [PATCH 15/16] readme
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ad3584101..cd958acab 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
## 置顶消息：
-Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微信:lipanhelloworld，QQ:1066666651
+Q群:490442439, 2群:761899104, 验证信息:jzvd, 微信公众号:jzvdjzt，微信:lipanhelloworld，QQ:1066666651，[Telegram](https://t.me/jiaozitoken)
为了增加项目质量，促进项目进度，调用社群力量，方便社群管理，推出基于以太坊erc-20的数字通证[JiaoZiToken(JZT)(饺子Token)](https://github.com/lipangit/JZT)，通俗点理解，谁给饺子视频播放器写代码、出主意、解决用户问题、活跃社群关系、关注项目进展，就给谁饺子Token。将来会让项目更加丰富，更加精致，必定大有可为。
From 9afca3c6d0666320641e48a7d4e7656eb7d0aee3 Mon Sep 17 00:00:00 2001
From: Nathen <1066666651@qq.com>
Date: Wed, 29 May 2019 02:08:10 +0800
Subject: [PATCH 16/16] v7.0.4
---
README-EN.md | 6 +++---
README.md | 6 +++---
app/build.gradle | 4 ++--
gradle/maven_push.gradle | 2 +-
jiaozivideoplayer/build.gradle | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/README-EN.md b/README-EN.md
index 6eeb76b8e..cc0a89ccb 100644
--- a/README-EN.md
+++ b/README-EN.md
@@ -2,7 +2,7 @@
--
-
+
@@ -28,7 +28,7 @@
## Steps for usage
1. Read through ReadMe
-2. Download and install the demo apk[jiaozivideoplayer-7.0.3.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v7.0.3/jiaozivideoplayer-7.0.3.apk), each page enters once, each button clicks once
+2. Download and install the demo apk[jiaozivideoplayer-7.0.4.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v7.0.4/jiaozivideoplayer-7.0.4.apk), each page enters once, each button clicks once
3. Download and debug the develop branch, and find the source code through the effect
4. See [custom-related WIKI](https://github.com/lipangit/JiaoZiVideoPlayer/wiki)，Realize your own needs
@@ -45,7 +45,7 @@ Only five steps to use the player:
1.Import library:
```gradle
-implementation 'cn.jzvd:jiaozivideoplayer:7.0.3'
+implementation 'cn.jzvd:jiaozivideoplayer:7.0.4'
```
diff --git a/README.md b/README.md
index cd958acab..30895a065 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
--
+
+
+
+