Merge branch 'release/v1.1'

lipangit · Jan 25, 2016 · 6c5be67 · 6c5be67
2 parents 35c9a66 + fef9ff7
commit 6c5be67
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 102 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java
@@ -20,12 +20,12 @@ protected void onCreate(Bundle savedInstanceState) {
         videoController1 = (JCVideoPlayer) findViewById(R.id.videocontroller1);
         videoController1.setUp("http://2449.vod.myqcloud.com/2449_43b6f696980311e59ed467f22794e792.f20.mp4",
                 "http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640",
-                "嫂子别摸我", false);
+                "嫂子别摸我");
 
         videoController2 = (JCVideoPlayer) findViewById(R.id.videocontroller2);
-        videoController2.setUp("http://2449.vod.myqcloud.com/2449_a80a72289b1211e5a28d6dc08193c3c9.f20.mp4",
-                "http://cos.myqcloud.com/1000264/qcloud_video_attachment/842646334/vod_cover/cover1449294460.jpg",
-                "嫂子还摸我", false, false);
+        videoController2.setUp("http://2449.vod.myqcloud.com/2449_ded7b566b37911e5942f0b208e48548d.f20.mp4",//
+                "http://p.qpic.cn/videoyun/0/2449_ded7b566b37911e5942f0b208e48548d_2/640",
+                "嫂子还摸我", false);
         EventBus.getDefault().register(this);
     }
 
@@ -65,6 +65,5 @@ public void onEventMainThread(VideoEvents event) {
         } else if (event.type == VideoEvents.POINT_QUIT_FULLSCREEN) {
             Log.i("Video Event", "POINT_QUIT_FULLSCREEN");
         }
-//        Log.i("Video Event", "type : " + event.type);
     }
 }
diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaPlayer.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCMediaPlayer.java
@@ -4,6 +4,7 @@
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.io.IOException;
@@ -37,6 +38,7 @@ public JCMediaPlayer() {
     }
 
     public void prepareToPlay(Context context, String url) {
+        if (TextUtils.isEmpty(url)) return;
         try {
             mediaPlayer.release();
             mediaPlayer = new MediaPlayer();
@@ -66,7 +68,7 @@ public void onCompletion(MediaPlayer mp) {
 
     @Override
     public void onBufferingUpdate(MediaPlayer mp, int percent) {
-        VideoEvents videoEvents = new VideoEvents().setType(VideoEvents.VE_MEDIAPLAYER_BUFFERUPDATE);
+        VideoEvents videoEvents = new VideoEvents().setType(VideoEvents.VE_MEDIAPLAYER_UPDATE_BUFFER);
         videoEvents.obj = percent;
         EventBus.getDefault().post(videoEvents);
     }