Commit 39963ae6ca6a6e93b43ad8b73936452f3ea08a57

Authored by 朱显松
2 parents 1d290feb c9b10e33

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNVideoDemo

app/libs/libcnliveutil.jar
No preview for this file type
app/libs/libcnlivevideo.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/video/VideoStatusActivity.java
@@ -50,12 +50,9 @@ public class VideoStatusActivity extends Activity implements View.OnClickListene @@ -50,12 +50,9 @@ public class VideoStatusActivity extends Activity implements View.OnClickListene
50 private IMediaPlayer.OnPreparedListener mOnPrepareListener = new IMediaPlayer.OnPreparedListener() { 50 private IMediaPlayer.OnPreparedListener mOnPrepareListener = new IMediaPlayer.OnPreparedListener() {
51 @Override 51 @Override
52 public void onPrepared(IMediaPlayer iMediaPlayer) { 52 public void onPrepared(IMediaPlayer iMediaPlayer) {
53 - if (canPlay) { 53 + if (canPlay && !iMediaPlayer.getPlayState()) {
54 setPlayState(true); 54 setPlayState(true);
55 isPlay = true; 55 isPlay = true;
56 - } else {  
57 - setPlayState(false);  
58 - isPlay = false;  
59 } 56 }
60 57
61 } 58 }
@@ -109,7 +106,7 @@ public class VideoStatusActivity extends Activity implements View.OnClickListene @@ -109,7 +106,7 @@ public class VideoStatusActivity extends Activity implements View.OnClickListene
109 106
110 private IVideoStatus.VideoStatusCallback mOnVideoStatusCallback = new IVideoStatus.VideoStatusCallback() { 107 private IVideoStatus.VideoStatusCallback mOnVideoStatusCallback = new IVideoStatus.VideoStatusCallback() {
111 @Override 108 @Override
112 - public void onSuccess(int status) { 109 + public void onStatusChange(int status) {
113 switch (status) { 110 switch (status) {
114 case IVideoStatus.MEDIA_STATUS_LIVING: 111 case IVideoStatus.MEDIA_STATUS_LIVING:
115 //直播中' 112 //直播中'
app/src/main/jniLibs/arm64-v8a/libksyplayer.so
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libksyplayer.so
No preview for this file type
app/src/main/jniLibs/armeabi/libksyplayer.so
No preview for this file type
app/src/main/jniLibs/x86/libksyplayer.so
No preview for this file type
doc/Android播放SDK说明文档 .pdf
No preview for this file type