Merge branch 'release/v3.6.2'

lipangit · Jul 3, 2016 · aeb5738 · aeb5738
2 parents a1fe64d + 6d8836a
commit aeb5738
Show file tree

Hide file tree

Showing 16 changed files with 216 additions and 145 deletions.
diff --git a/README-ZH.md b/README-ZH.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%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.1%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-3.6.1-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-3.6.2-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-jiecaovideoplayer-green.svg?style=true"></a>
 </p>
@@ -22,28 +22,28 @@
 
 ##效果
 
-**[jiecaovideoplayer-3.6.1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1-demo.apk)**
+**[jiecaovideoplayer-3.6.2-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2-demo.apk)**
 
 ![Demo Screenshot][1]
 
 ##使用
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:3.6.1'
+compile 'fm.jiecao:jiecaovideoplayer:3.6.2'
 ```
 
 或直接下载
 
-* [jiecaovideoplayer-3.6.1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1.aar)
-* [jiecaovideoplayer-3.6.1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1-javadoc.jar)
-* [jiecaovideoplayer-3.6.1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1-sources.jar)
+* [jiecaovideoplayer-3.6.2.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2.aar)
+* [jiecaovideoplayer-3.6.2-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2-javadoc.jar)
+* [jiecaovideoplayer-3.6.2-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2-sources.jar)
 
 2.添加布局
 ```xml
 <fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard
     android:id="@+id/custom_videoplayer_standard"
     android:layout_width="match_parent"
-    android:lay3.6.1out_height="200dp"/>
+    android:lay3.6.2out_height="200dp"/>
 ```
 
 3.设置视频地址、缩略图地址、标题

diff --git a/README.md b/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%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.1%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-3.6.1-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-3.6.2-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-jiecaovideoplayer-green.svg?style=true"></a>
 </p>
@@ -26,21 +26,21 @@ Android truly full-screen capabilities, the Android platform to become the most
 
 ## Effect
 
-**[jiecaovideoplayer-3.6.1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1-demo.apk)**
+**[jiecaovideoplayer-3.6.2-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2-demo.apk)**
 
 ![Demo Screenshot][1]
 
 ## Usage
 1.Import library
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:3.6.1'
+compile 'fm.jiecao:jiecaovideoplayer:3.6.2'
 ```
 
 Or download lib
 
-* [jiecaovideoplayer-3.6.1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1.aar)
-* [jiecaovideoplayer-3.6.1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1-javadoc.jar)
-* [jiecaovideoplayer-3.6.1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.1-sources.jar)
+* [jiecaovideoplayer-3.6.2.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2.aar)
+* [jiecaovideoplayer-3.6.2-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2-javadoc.jar)
+* [jiecaovideoplayer-3.6.2-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.2-sources.jar)
 
 2.Add JCVideoPlayer in your layout
 ```xml

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 29
-        versionName "3.6.1"
+        versionCode 30
+        versionName "3.6.2"
     }
     buildTypes {
         release {

diff --git a/downloads/jiecaovideoplayer-3.6.1-javadoc.jar b/downloads/jiecaovideoplayer-3.6.1-javadoc.jar
diff --git a/downloads/jiecaovideoplayer-3.6.1-sources.jar b/downloads/jiecaovideoplayer-3.6.1-sources.jar
diff --git a/downloads/jiecaovideoplayer-3.6.1.aar b/downloads/jiecaovideoplayer-3.6.1.aar
diff --git a/downloads/jiecaovideoplayer-3.6.1-demo.apk → downloads/jiecaovideoplayer-3.6.2-demo.apk b/downloads/jiecaovideoplayer-3.6.1-demo.apk → downloads/jiecaovideoplayer-3.6.2-demo.apk
diff --git a/downloads/jiecaovideoplayer-3.6.2-javadoc.jar b/downloads/jiecaovideoplayer-3.6.2-javadoc.jar
diff --git a/downloads/jiecaovideoplayer-3.6.2-sources.jar b/downloads/jiecaovideoplayer-3.6.2-sources.jar
diff --git a/downloads/jiecaovideoplayer-3.6.2.aar b/downloads/jiecaovideoplayer-3.6.2.aar
diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle
@@ -22,7 +22,7 @@ signing {
 
 group = "fm.jiecao"
 archivesBaseName = "jiecaovideoplayer"
-version = "3.6.1"
+version = "3.6.2"
 
 uploadArchives {
     repositories {

diff --git a/jcvideoplayer-lib/build.gradle b/jcvideoplayer-lib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 29
-        versionName "3.6.1"
+        versionCode 30
+        versionName "3.6.2"
     }
     buildTypes {
         release {