From 8f7c8360b35a42e22b1bb352722adb620c98ca6f Mon Sep 17 00:00:00 2001 From: Nathen Date: Tue, 8 Aug 2017 00:39:04 +0800 Subject: [PATCH 1/2] fix clarity bug --- .../fm/jiecao/jiecaovideoplayer/MainActivity.java | 11 ++--------- .../fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java | 3 ++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java index 0e336111c..c15f600f0 100644 --- a/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java +++ b/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java @@ -48,15 +48,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { mAboutWebView.setOnClickListener(this); myJCVideoPlayerStandard = (MyJCVideoPlayerStandard) findViewById(R.id.jc_video); - - LinkedHashMap map = new LinkedHashMap(); - map.put("高清", "http://video.jiecao.fm/11/23/xin/%E5%81%87%E4%BA%BA.mp4"); - map.put("标清", "http://video.jiecao.fm/8/16/%E4%BF%AF%E5%8D%A7%E6%92%91.mp4"); - map.put("普清", "http://video.jiecao.fm/8/16/%E9%B8%AD%E5%AD%90.mp4"); - myJCVideoPlayerStandard.setUp(map, 0 - , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子不信"); -// myJCVideoPlayerStandard.setUp("http://video.jiecao.fm/11/23/xu/%E5%A6%B9%E5%A6%B9.mp4" -// , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子快长大"); + myJCVideoPlayerStandard.setUp("http://video.jiecao.fm/11/23/xu/%E5%A6%B9%E5%A6%B9.mp4" + , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子快长大"); Picasso.with(this) .load("http://img4.jiecaojingxuan.com/2016/11/23/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png@!640_360") .into(myJCVideoPlayerStandard.thumbImageView); diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java index ea60d1e20..3009f59a9 100644 --- a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java +++ b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java @@ -482,7 +482,7 @@ public void onInfo(int what, int extra) { BACKUP_PLAYING_BUFFERING_STATE = -1; } Log.d(TAG, "MEDIA_INFO_BUFFERING_END"); - }else if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START){ + } else if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START) { onVideoRendingStart(); } } @@ -871,6 +871,7 @@ public void playOnThisJcvd() { Log.i(TAG, "playOnThisJcvd " + " [" + this.hashCode() + "] "); //1.清空全屏和小窗的jcvd currentState = JCVideoPlayerManager.getSecondFloor().currentState; + currentUrlMapIndex = JCVideoPlayerManager.getSecondFloor().currentUrlMapIndex; clearFloatScreen(); //2.在本jcvd上播放 setState(currentState); From 58a74435e5225dbf945840f06d9f98de78dfffd9 Mon Sep 17 00:00:00 2001 From: Nathen Date: Tue, 8 Aug 2017 00:41:15 +0800 Subject: [PATCH 2/2] v5.8.1 --- README-ZH.md | 8 ++++---- README.md | 8 ++++---- app/build.gradle | 4 ++-- gradle/maven_push.gradle | 2 +- jcvideoplayer-lib/build.gradle | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README-ZH.md b/README-ZH.md index 85fc1c76f..b7f5fe838 100644 --- a/README-ZH.md +++ b/README-ZH.md @@ -2,7 +2,7 @@ --

- +

@@ -28,7 +28,7 @@ ## 效果 -**[jiecaovideoplayer-5.8.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8/jiecaovideoplayer-5.8.apk)** +**[jiecaovideoplayer-5.8.1.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8.1/jiecaovideoplayer-5.8.1.apk)** ![Demo Screenshot][1] @@ -38,10 +38,10 @@ 1.添加类库 ```gradle -compile 'fm.jiecao:jiecaovideoplayer:5.8' +compile 'fm.jiecao:jiecaovideoplayer:5.8.1' ``` -[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8) +[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8.1) 2.添加布局 ```xml diff --git a/README.md b/README.md index 8c199574f..16db4ae7c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ --

- +

@@ -30,7 +30,7 @@ I think the final solution for play video in android is android.media.MediaPlaye ## Effect -**[jiecaovideoplayer-5.8.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8/jiecaovideoplayer-5.8.apk)** +**[jiecaovideoplayer-5.8.1.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8.1/jiecaovideoplayer-5.8.1.apk)** ![Demo Screenshot][1] @@ -40,10 +40,10 @@ Even the custom UI, or has changed to the Library, is also the five steps to use 1.Import library ```gradle -compile 'fm.jiecao:jiecaovideoplayer:5.8' +compile 'fm.jiecao:jiecaovideoplayer:5.8.1' ``` -[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8) +[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8.1) 2.Add JCVideoPlayer in your layout ```xml diff --git a/app/build.gradle b/app/build.gradle index 67237bbd2..ad2e735a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "fm.jiecao.jiecaovideoplayer" minSdkVersion 16 targetSdkVersion 25 - versionCode 62 - versionName "5.8" + versionCode 63 + versionName "5.8.1" } buildTypes { release { diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle index 2412b72cb..7ac99f5fb 100644 --- a/gradle/maven_push.gradle +++ b/gradle/maven_push.gradle @@ -22,7 +22,7 @@ signing { group = "fm.jiecao" archivesBaseName = "jiecaovideoplayer" -version = "5.8" +version = "5.8.1" uploadArchives { repositories { diff --git a/jcvideoplayer-lib/build.gradle b/jcvideoplayer-lib/build.gradle index 2638760ba..405f35736 100644 --- a/jcvideoplayer-lib/build.gradle +++ b/jcvideoplayer-lib/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 25 - versionCode 62 - versionName "5.8" + versionCode 63 + versionName "5.8.1" } buildTypes { release {