Merge branch 'release/v1.3'

lipangit · Feb 21, 2016 · 06a6a10 · 06a6a10
2 parents ab03fcb + 4f31cc1
commit 06a6a10
Show file tree

Hide file tree

Showing 11 changed files with 181 additions and 133 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 ##使用
 引入类库
 ```java
-compile 'fm.jiecao:jiecaovideoplayer:1.2_preview'
+compile 'fm.jiecao:jiecaovideoplayer:1.2'
 ```
 
 添加布局

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 2
-        versionName "1.1"
+        versionCode 14
+        versionName "1.3"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewpagerActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewpagerActivity.java
@@ -53,7 +53,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
 
     @Override
     public void onPageSelected(int position) {
-        JCVideoPlayer.releaseAllVideo();
+        JCVideoPlayer.releaseAllVideos();
     }
 
     @Override

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java
@@ -14,7 +14,7 @@
 
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
-    JCVideoPlayer videoController1, videoController2;
+    JCVideoPlayer videoController1, videoController2, videoController3;
     Button btnToList, btnToListViewpager, btnToFullscreen, btnToChangecolor;
 
     @Override
@@ -33,6 +33,11 @@ protected void onCreate(Bundle savedInstanceState) {
                 "http://p.qpic.cn/videoyun/0/2449_ded7b566b37911e5942f0b208e48548d_2/640",
                 "嫂子还摸我", false);
 
+        videoController3 = (JCVideoPlayer) findViewById(R.id.videocontroller3);
+        videoController3.setUp("http://121.40.64.47/resource/mp3/music_yangguang3.mp3",//
+                "http://p.qpic.cn/videoyun/0/2449_ded7b566b37911e5942f0b208e48548d_2/640",
+                "嫂子别闹");
+
         btnToList = (Button) findViewById(R.id.to_list_activity);
         btnToListViewpager = (Button) findViewById(R.id.to_list_viewpager_activity);
         btnToFullscreen = (Button) findViewById(R.id.to_fullscreen);
@@ -48,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onPause() {
         super.onPause();
-        JCVideoPlayer.releaseAllVideo();
+        JCVideoPlayer.releaseAllVideos();
     }
 
     @Override
@@ -91,7 +96,7 @@ public void onEventMainThread(VideoEvents event) {
 
     @Override
     public void onClick(View v) {
-        JCVideoPlayer.releaseAllVideo();
+        JCVideoPlayer.releaseAllVideos();
         switch (v.getId()) {
             case R.id.to_list_activity:
                 startActivity(new Intent(MainActivity.this, ListActivity.class));

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -34,6 +34,18 @@
                 android:layout_height="200dp"
                 android:layout_marginTop="2dp" />
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:text="播放mp3" />
+
+            <fm.jiecao.jcvideoplayer_lib.JCVideoPlayer
+                android:id="@+id/videocontroller3"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:layout_marginTop="2dp" />
+
             <Button
                 android:id="@+id/to_fullscreen"
                 android:layout_width="match_parent"

diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle
@@ -21,7 +21,7 @@ signing {
 
 group = "fm.jiecao"
 archivesBaseName = "jiecaovideoplayer"
-version = "1.2"
+version = "1.3"
 
 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 13
-        versionName "1.2"
+        versionCode 14
+        versionName "1.3"
     }
     buildTypes {
         release {

diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/FullScreenActivity.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/FullScreenActivity.java
@@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
         jcVideoPlayer = (JCVideoPlayer) findViewById(R.id.jcvideoplayer);
         jcVideoPlayer.setUpForFullscreen(URL, THUMB, TITLE);
         jcVideoPlayer.setState(STATE);
-        JCMediaPlayer.intance().setUuid(jcVideoPlayer.uuid);
+        JCMediaManager.intance().setUuid(jcVideoPlayer.uuid);
         manualQuit = false;
     }
 
@@ -65,7 +65,8 @@ public void onBackPressed() {
     protected void onPause() {
         super.onPause();
         if (!manualQuit) {
-            JCVideoPlayer.releaseAllVideo();
+            jcVideoPlayer.isClickFullscreen = false;
+            JCVideoPlayer.releaseAllVideos();
             finish();
         }
     }

diff --git a/...ecao/jcvideoplayer_lib/JCMediaPlayer.java → ...cao/jcvideoplayer_lib/JCMediaManager.java b/...ecao/jcvideoplayer_lib/JCMediaPlayer.java → ...cao/jcvideoplayer_lib/JCMediaManager.java
@@ -17,23 +17,23 @@
  * Created by Nathen
  * On 2015/11/30 15:39
  */
-class JCMediaPlayer implements MediaPlayer.OnPreparedListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnSeekCompleteListener, MediaPlayer.OnErrorListener, MediaPlayer.OnVideoSizeChangedListener {
+class JCMediaManager implements MediaPlayer.OnPreparedListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnSeekCompleteListener, MediaPlayer.OnErrorListener, MediaPlayer.OnVideoSizeChangedListener {
 
     public MediaPlayer mediaPlayer;
-    private static JCMediaPlayer jcMediaPlayer;
+    private static JCMediaManager jcMediaManager;
     public String uuid = "";//这个是正在播放中的视频控件的uuid，
     private String prev_uuid = "";
     public int currentVideoWidth = 0;
     public int currentVideoHeight = 0;
 
-    public static JCMediaPlayer intance() {
-        if (jcMediaPlayer == null) {
-            jcMediaPlayer = new JCMediaPlayer();
+    public static JCMediaManager intance() {
+        if (jcMediaManager == null) {
+            jcMediaManager = new JCMediaManager();
         }
-        return jcMediaPlayer;
+        return jcMediaManager;
     }
 
-    public JCMediaPlayer() {
+    public JCMediaManager() {
         mediaPlayer = new MediaPlayer();
     }