Merge branch 'release/v3.2'

lipangit · May 22, 2016 · 1975cca · 1975cca
2 parents f39554c + 9155937
commit 1975cca
Show file tree

Hide file tree

Showing 22 changed files with 112 additions and 139 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -1,7 +1,7 @@
 #节操视频播放器 
 
 [![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html) 
-[![Maven Central](https://img.shields.io/badge/Maven%20Central-3.1-green.svg)](http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.1%7Caar) 
+[![Maven Central](https://img.shields.io/badge/Maven%20Central-3.2-green.svg)](http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.2%7Caar) 
 [![Licenses](https://img.shields.io/badge/license-MIT-green.svg)](http://choosealicense.com/licenses/mit/) 
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-jiecaovideoplayer-green.svg?style=true)](https://android-arsenal.com/details/1/3269)
 [![GitHub stars](https://img.shields.io/github/stars/lipangit/jiecaovideoplayer.svg?style=social&label=Star)]()
@@ -21,7 +21,7 @@
 
 ##效果
 
-**[jiecaovideoplayer-3.1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1-demo.apk)**
+**[jiecaovideoplayer-3.2-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.2-demo.apk)**
 
 ![Demo Screenshot][1]
 
@@ -30,14 +30,14 @@
 ##使用
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:3.1'
+compile 'fm.jiecao:jiecaovideoplayer:3.2'
 ```
 
 或直接下载
 
-* [jiecaovideoplayer-3.1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1.aar)
-* [jiecaovideoplayer-3.1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1-javadoc.jar)
-* [jiecaovideoplayer-3.1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1-sources.jar)
+* [jiecaovideoplayer-3.2.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.2.aar)
+* [jiecaovideoplayer-3.2-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.2-javadoc.jar)
+* [jiecaovideoplayer-3.2-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.2-sources.jar)
 
 2.添加布局
 ```xml

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # JieCao Video Player  
 
 [![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html) 
-[![Maven Central](https://img.shields.io/badge/Maven%20Central-3.1-green.svg)](http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.1%7Caar) 
+[![Maven Central](https://img.shields.io/badge/Maven%20Central-3.2-green.svg)](http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.2%7Caar) 
 [![Licenses](https://img.shields.io/badge/license-MIT-green.svg)](http://choosealicense.com/licenses/mit/) 
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-jiecaovideoplayer-green.svg?style=true)](https://android-arsenal.com/details/1/3269)
 [![GitHub stars](https://img.shields.io/github/stars/lipangit/jiecaovideoplayer.svg?style=social&label=Star)]()
@@ -23,7 +23,7 @@ Android truly full-screen capabilities, the Android platform to become the most
 
 ## Effect
 
-**[jiecaovideoplayer-3.1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1-demo.apk)**
+**[jiecaovideoplayer-3.2-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.2-demo.apk)**
 
 ![Demo Screenshot][1]
 
@@ -32,14 +32,14 @@ Demo video : http://v.youku.com/v_show/id_XMTQ2NzUwOTcyNA==.html
 ## Usage
 1.Import library
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:3.1'
+compile 'fm.jiecao:jiecaovideoplayer:3.2'
 ```
 
 Or download lib
 
-* [jiecaovideoplayer-3.1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1.aar)
-* [jiecaovideoplayer-3.1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1-javadoc.jar)
-* [jiecaovideoplayer-3.1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.1-sources.jar)
+* [jiecaovideoplayer-3.2.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.2.aar)
+* [jiecaovideoplayer-3.2-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.2-javadoc.jar)
+* [jiecaovideoplayer-3.2-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.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 23
-    versionName "3.1"
+    versionCode 24
+    versionName "3.2"
   }
   buildTypes {
     release {

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/View/JCVideoPlayerStandardFresco.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/View/JCVideoPlayerStandardFresco.java
@@ -126,7 +126,7 @@ public void onClick(View v) {
         startDismissControlViewTimer();
       }
     } else if (i == R.id.surface_container) {
-      if (jc_BuriedPointStandard != null && JCMediaManager.intance().listener == this) {
+      if (jc_BuriedPointStandard != null && JCMediaManager.instance().listener == this) {
         if (IF_CURRENT_IS_FULLSCREEN) {
           jc_BuriedPointStandard.onClickBlankFullscreen(url, objects);
         } else {

diff --git a/app/src/main/res/layout/jc_layout_standard_fresco.xml b/app/src/main/res/layout/jc_layout_standard_fresco.xml
@@ -4,17 +4,16 @@
   android:layout_height="match_parent"
   android:background="@android:color/black">
 
+  <SurfaceView
+    android:layout_width="0dp"
+    android:layout_height="0dp" />
+
   <RelativeLayout
     android:id="@+id/surface_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center">
 
-    <fm.jiecao.jcvideoplayer_lib.JCResizeSurfaceView
-      android:id="@+id/surfaceView"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_centerInParent="true" />
   </RelativeLayout>
 
   <ImageView

diff --git a/app/src/main/res/layout/jc_layout_standard_with_share_button.xml b/app/src/main/res/layout/jc_layout_standard_with_share_button.xml
@@ -4,17 +4,16 @@
   android:layout_height="match_parent"
   android:background="@android:color/black">
 
+  <SurfaceView
+    android:layout_width="0dp"
+    android:layout_height="0dp" />
+
   <RelativeLayout
     android:id="@+id/surface_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center">
 
-    <fm.jiecao.jcvideoplayer_lib.JCResizeSurfaceView
-      android:id="@+id/surfaceView"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_centerInParent="true" />
   </RelativeLayout>
 
   <ImageView

diff --git a/downloads/jiecaovideoplayer-3.1-javadoc.jar b/downloads/jiecaovideoplayer-3.1-javadoc.jar
diff --git a/downloads/jiecaovideoplayer-3.1-sources.jar b/downloads/jiecaovideoplayer-3.1-sources.jar
diff --git a/downloads/jiecaovideoplayer-3.1.aar b/downloads/jiecaovideoplayer-3.1.aar
diff --git a/downloads/jiecaovideoplayer-3.1-demo.apk → downloads/jiecaovideoplayer-3.2-demo.apk b/downloads/jiecaovideoplayer-3.1-demo.apk → downloads/jiecaovideoplayer-3.2-demo.apk
diff --git a/downloads/jiecaovideoplayer-3.2-javadoc.jar b/downloads/jiecaovideoplayer-3.2-javadoc.jar
diff --git a/downloads/jiecaovideoplayer-3.2-sources.jar b/downloads/jiecaovideoplayer-3.2-sources.jar
diff --git a/downloads/jiecaovideoplayer-3.2.aar b/downloads/jiecaovideoplayer-3.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.1"
+version = "3.2"
 
 uploadArchives {
   repositories {

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

diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCFullScreenActivity.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCFullScreenActivity.java
@@ -81,12 +81,12 @@ protected void onCreate(Bundle savedInstanceState) {
     jcVideoPlayer.IF_FULLSCREEN_IS_DIRECTLY = DIRECT_FULLSCREEN;
     jcVideoPlayer.setUp(URL, OBJECTS);
     jcVideoPlayer.setStateAndUi(CURRENT_STATE);
-
+    jcVideoPlayer.addSurfaceView();
     if (jcVideoPlayer.IF_FULLSCREEN_IS_DIRECTLY) {
       jcVideoPlayer.ivStart.performClick();
     } else {
       JCVideoPlayer.IF_RELEASE_WHEN_ON_PAUSE = true;
-      JCMediaManager.intance().listener = jcVideoPlayer;
+      JCMediaManager.instance().listener = jcVideoPlayer;
     }
   }
 

diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaManager.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaManager.java
@@ -26,7 +26,7 @@ public class JCMediaManager implements MediaPlayer.OnPreparedListener, MediaPlay
   public JCMediaPlayerListener lastListener;
   public int lastState;
 
-  public static JCMediaManager intance() {
+  public static JCMediaManager instance() {
     if (jcMediaManager == null) {
       jcMediaManager = new JCMediaManager();
     }

diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCResizeSurfaceView.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCResizeSurfaceView.java
@@ -26,8 +26,8 @@ public JCResizeSurfaceView(Context context, AttributeSet attrs) {
 
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    int mVideoWidth = JCMediaManager.intance().currentVideoWidth;
-    int mVideoHeight = JCMediaManager.intance().currentVideoHeight;
+    int mVideoWidth = JCMediaManager.instance().currentVideoWidth;
+    int mVideoHeight = JCMediaManager.instance().currentVideoHeight;
 
     int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
     int height = getDefaultSize(mVideoHeight, heightMeasureSpec);