Merge branch 'release/v4.5_preview1'

lipangit · Jul 31, 2016 · 90ab056 · 90ab056
2 parents 9f9359f + d52a31c
commit 90ab056
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 205 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.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.5_preview-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.5_preview1-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>
@@ -23,7 +23,7 @@
 
 ##效果
 
-**[jiecaovideoplayer-4.5_preview-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview-demo.apk)**
+**[jiecaovideoplayer-4.5_preview1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-demo.apk)**
 
 ![Demo Screenshot][1]
 
@@ -33,14 +33,14 @@
 
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:4.5_preview'
+compile 'fm.jiecao:jiecaovideoplayer:4.5_preview1'
 ```
 
 或直接下载
 
-* [jiecaovideoplayer-4.5_preview.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview.aar)
-* [jiecaovideoplayer-4.5_preview-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview-javadoc.jar)
-* [jiecaovideoplayer-4.5_preview-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview-sources.jar)
+* [jiecaovideoplayer-4.5_preview1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1.aar)
+* [jiecaovideoplayer-4.5_preview1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-javadoc.jar)
+* [jiecaovideoplayer-4.5_preview1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-sources.jar)
 
 2.添加布局
 ```xml

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.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.5_preview-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.5_preview1-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>
@@ -27,7 +27,7 @@ Android truly full-screen capabilities, the Android platform to become the most
 
 ## Effect
 
-**[jiecaovideoplayer-4.5_preview-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview-demo.apk)**
+**[jiecaovideoplayer-4.5_preview1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-demo.apk)**
 
 ![Demo Screenshot][1]
 
@@ -37,14 +37,14 @@ Android truly full-screen capabilities, the Android platform to become the most
 
 1.Import library
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:4.5_preview'
+compile 'fm.jiecao:jiecaovideoplayer:4.5_preview1'
 ```
 
 Or download lib
 
-* [jiecaovideoplayer-4.5_preview.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview.aar)
-* [jiecaovideoplayer-4.5_preview-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview-javadoc.jar)
-* [jiecaovideoplayer-4.5_preview-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview-sources.jar)
+* [jiecaovideoplayer-4.5_preview1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1.aar)
+* [jiecaovideoplayer-4.5_preview1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-javadoc.jar)
+* [jiecaovideoplayer-4.5_preview1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-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 14
         targetSdkVersion 24
-        versionCode 34
-        versionName "4.5_preview"
+        versionCode 35
+        versionName "4.5_preview1"
     }
     buildTypes {
         release {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -15,3 +15,4 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardFresco.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardFresco.java
@@ -76,15 +76,15 @@ public boolean setUp(String url, int screen, Object... objects) {
         if (objects.length == 0) return false;
         if (super.setUp(url, screen, objects)) {
             titleTextView.setText(objects[0].toString());
-            if (mCurrentScreen == SCREEN_WINDOW_FULLSCREEN) {
+            if (currentScreen == SCREEN_WINDOW_FULLSCREEN) {
                 fullscreenButton.setImageResource(R.drawable.jc_shrink);
                 backButton.setVisibility(View.VISIBLE);
                 tinyBackImageView.setVisibility(View.INVISIBLE);
-            } else if (mCurrentScreen == SCREEN_LAYOUT_LIST) {
+            } else if (currentScreen == SCREEN_LAYOUT_LIST) {
                 fullscreenButton.setImageResource(R.drawable.jc_enlarge);
                 backButton.setVisibility(View.GONE);
                 tinyBackImageView.setVisibility(View.INVISIBLE);
-            } else if (mCurrentScreen == SCREEN_WINDOW_TINY) {
+            } else if (currentScreen == SCREEN_WINDOW_TINY) {
                 tinyBackImageView.setVisibility(View.VISIBLE);
                 setAllControlsVisible(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
                         View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
@@ -102,7 +102,7 @@ public int getLayoutId() {
     @Override
     public void setUiWitStateAndScreen(int state) {
         super.setUiWitStateAndScreen(state);
-        switch (mCurrentState) {
+        switch (currentState) {
             case CURRENT_STATE_NORMAL:
                 changeUiToNormal();
                 break;
@@ -171,25 +171,25 @@ public void onClick(View v) {
         super.onClick(v);
         int i = v.getId();
         if (i == R.id.thumb) {
-            if (TextUtils.isEmpty(mUrl)) {
+            if (TextUtils.isEmpty(url)) {
                 Toast.makeText(getContext(), getResources().getString(R.string.no_url), Toast.LENGTH_SHORT).show();
                 return;
             }
-            if (mCurrentState == CURRENT_STATE_NORMAL) {
-                if (!mUrl.startsWith("file") && !JCUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
+            if (currentState == CURRENT_STATE_NORMAL) {
+                if (!url.startsWith("file") && !JCUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
                     showWifiDialog();
                     return;
                 }
                 startPlayLocic();
-            } else if (mCurrentState == CURRENT_STATE_AUTO_COMPLETE) {
+            } else if (currentState == CURRENT_STATE_AUTO_COMPLETE) {
                 onClickUiToggle();
             }
         } else if (i == R.id.surface_container) {
             if (JC_BURIED_POINT_STANDARD != null && isCurrentMediaListener()) {
 //                if (mIfCurrentIsFullscreen) {
-//                    JC_BURIED_POINT_STANDARD.onClickBlankFullscreen(mUrl, mObjects);
+//                    JC_BURIED_POINT_STANDARD.onClickBlankFullscreen(url, objects);
 //                } else {
-//                    JC_BURIED_POINT_STANDARD.onClickBlank(mUrl, mObjects);
+//                    JC_BURIED_POINT_STANDARD.onClickBlank(url, objects);
 //                }
             }
             startDismissControlViewTimer();
@@ -236,38 +236,38 @@ public void onStopTrackingTouch(SeekBar seekBar) {
 
     private void startPlayLocic() {
         if (JC_BURIED_POINT_STANDARD != null) {
-            JC_BURIED_POINT_STANDARD.onClickStartThumb(mUrl, mObjects);
+            JC_BURIED_POINT_STANDARD.onClickStartThumb(url, objects);
         }
         prepareVideo();
         startDismissControlViewTimer();
     }
 
     private void onClickUiToggle() {
-        if (mCurrentState == CURRENT_STATE_PREPAREING) {
+        if (currentState == CURRENT_STATE_PREPAREING) {
             if (bottomContainer.getVisibility() == View.VISIBLE) {
                 changeUiToPrepareingClear();
             } else {
                 changeUiToPrepareingShow();
             }
-        } else if (mCurrentState == CURRENT_STATE_PLAYING) {
+        } else if (currentState == CURRENT_STATE_PLAYING) {
             if (bottomContainer.getVisibility() == View.VISIBLE) {
                 changeUiToPlayingClear();
             } else {
                 changeUiToPlayingShow();
             }
-        } else if (mCurrentState == CURRENT_STATE_PAUSE) {
+        } else if (currentState == CURRENT_STATE_PAUSE) {
             if (bottomContainer.getVisibility() == View.VISIBLE) {
                 changeUiToPauseClear();
             } else {
                 changeUiToPauseShow();
             }
-        } else if (mCurrentState == CURRENT_STATE_AUTO_COMPLETE) {
+        } else if (currentState == CURRENT_STATE_AUTO_COMPLETE) {
             if (bottomContainer.getVisibility() == View.VISIBLE) {
                 changeUiToCompleteClear();
             } else {
                 changeUiToCompleteShow();
             }
-        } else if (mCurrentState == CURRENT_STATE_PLAYING_BUFFERING_START) {
+        } else if (currentState == CURRENT_STATE_PLAYING_BUFFERING_START) {
             if (bottomContainer.getVisibility() == View.VISIBLE) {
                 changeUiToPlayingBufferingClear();
             } else {
@@ -292,7 +292,7 @@ protected void resetProgressAndTime() {
 
     //Unified management Ui
     private void changeUiToNormal() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
                         View.INVISIBLE, View.VISIBLE, View.VISIBLE, View.INVISIBLE);
@@ -309,7 +309,7 @@ private void changeUiToNormal() {
     }
 
     private void changeUiToPrepareingShow() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.VISIBLE, View.VISIBLE, View.INVISIBLE,
                         View.VISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
@@ -325,7 +325,7 @@ private void changeUiToPrepareingShow() {
     }
 
     private void changeUiToPrepareingClear() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
                         View.VISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
@@ -341,7 +341,7 @@ private void changeUiToPrepareingClear() {
     }
 
     private void changeUiToPlayingShow() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.VISIBLE, View.VISIBLE, View.VISIBLE,
                         View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
@@ -359,7 +359,7 @@ private void changeUiToPlayingShow() {
     }
 
     private void changeUiToPlayingClear() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.INVISIBLE, View.INVISIBLE, View.VISIBLE,
                         View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
@@ -375,7 +375,7 @@ private void changeUiToPlayingClear() {
     }
 
     private void changeUiToPauseShow() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.VISIBLE, View.VISIBLE, View.VISIBLE,
                         View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
@@ -393,7 +393,7 @@ private void changeUiToPauseShow() {
     }
 
     private void changeUiToPauseClear() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.INVISIBLE, View.VISIBLE, View.INVISIBLE,
                         View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
@@ -409,7 +409,7 @@ private void changeUiToPauseClear() {
     }
 
     private void changeUiToPlayingBufferingShow() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.VISIBLE, View.VISIBLE, View.INVISIBLE,
                         View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
@@ -425,7 +425,7 @@ private void changeUiToPlayingBufferingShow() {
     }
 
     private void changeUiToPlayingBufferingClear() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
                         View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE);
@@ -443,7 +443,7 @@ private void changeUiToPlayingBufferingClear() {
     }
 
     private void changeUiToCompleteShow() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.VISIBLE, View.VISIBLE, View.VISIBLE,
                         View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
@@ -461,7 +461,7 @@ private void changeUiToCompleteShow() {
     }
 
     private void changeUiToCompleteClear() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.INVISIBLE, View.INVISIBLE, View.VISIBLE,
                         View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.VISIBLE);
@@ -479,7 +479,7 @@ private void changeUiToCompleteClear() {
     }
 
     private void changeUiToError() {
-        switch (mCurrentScreen) {
+        switch (currentScreen) {
             case SCREEN_LAYOUT_LIST:
                 setAllControlsVisible(View.INVISIBLE, View.INVISIBLE, View.VISIBLE,
                         View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
@@ -508,9 +508,9 @@ private void setAllControlsVisible(int topCon, int bottomCon, int startBtn, int
     }
 
     private void updateStartImage() {
-        if (mCurrentState == CURRENT_STATE_PLAYING) {
+        if (currentState == CURRENT_STATE_PLAYING) {
             startButton.setImageResource(R.drawable.jc_click_pause_selector);
-        } else if (mCurrentState == CURRENT_STATE_ERROR) {
+        } else if (currentState == CURRENT_STATE_ERROR) {
             startButton.setImageResource(R.drawable.jc_click_error_selector);
         } else {
             startButton.setImageResource(R.drawable.jc_click_play_selector);
@@ -623,9 +623,9 @@ protected class DismissControlViewTimerTask extends TimerTask {
 
         @Override
         public void run() {
-            if (mCurrentState != CURRENT_STATE_NORMAL
-                    && mCurrentState != CURRENT_STATE_ERROR
-                    && mCurrentState != CURRENT_STATE_AUTO_COMPLETE) {
+            if (currentState != CURRENT_STATE_NORMAL
+                    && currentState != CURRENT_STATE_ERROR
+                    && currentState != CURRENT_STATE_AUTO_COMPLETE) {
                 if (getContext() != null && getContext() instanceof Activity) {
                     ((Activity) getContext()).runOnUiThread(new Runnable() {
                         @Override

diff --git a/...cao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardShowShareButtonAfterFullscreen.java b/...cao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardShowShareButtonAfterFullscreen.java
@@ -49,7 +49,7 @@ public void onClick(View v) {
     @Override
     public boolean setUp(String url, int screen, Object... objects) {
         if (super.setUp(url, screen, objects)) {
-            if (mCurrentScreen == SCREEN_WINDOW_FULLSCREEN) {
+            if (currentScreen == SCREEN_WINDOW_FULLSCREEN) {
                 shareButton.setVisibility(View.VISIBLE);
             } else {
                 shareButton.setVisibility(View.INVISIBLE);

diff --git a/...fm/jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardShowTitleAfterFullscreen.java b/...fm/jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardShowTitleAfterFullscreen.java
@@ -22,7 +22,7 @@ public JCVideoPlayerStandardShowTitleAfterFullscreen(Context context, AttributeS
     @Override
     public boolean setUp(String url, int screen, Object... objects) {
         if (super.setUp(url, screen, objects)) {
-            if (mCurrentScreen == SCREEN_WINDOW_FULLSCREEN) {
+            if (currentScreen == SCREEN_WINDOW_FULLSCREEN) {
                 titleTextView.setVisibility(View.VISIBLE);
             } else {
                 titleTextView.setVisibility(View.INVISIBLE);

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

diff --git a/jcvideoplayer-lib/build.gradle b/jcvideoplayer-lib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 34
-        versionName "4.5_preview"
+        versionCode 35
+        versionName "4.5_preview1"
     }
     buildTypes {
         release {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@
		#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
		# public *;
		#}