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

王琳
2 parents c65901e1 c8fb9eca
Showing 4 changed files with 3 additions and 49 deletions
app/libs/libcnliveutil.jar
app/libs/libcnlivevideo.jar
app/src/main/java/com/cnlive/demo/video/VideoViewActivity.java
app/src/main/res/layout/activity_videoview.xml
@@ -7,9 +7,6 @@ import com.cnlive.demo.video.model.ProgramVod;
 import com.cnlive.libs.video.video.VideoView;
 import com.cnlive.libs.video.video.base.IMediaPlayer;
-import static com.cnlive.libs.util.auth.AuthUtil.AUTH_ERROR;
-import static com.cnlive.libs.util.auth.AuthUtil.AUTH_SUCCESS;
-
 public class VideoViewActivity extends Activity {
@@ -43,62 +40,24 @@ public class VideoViewActivity extends Activity {
     private void initPlay() {
         videoView = (VideoView) findViewById(R.id.videoview);
         //认证APP播放权限（使用视讯中国资源）
-        videoView.auth();
-        videoView.setOnBufferingUpdateListener(new IMediaPlayer.OnBufferingUpdateListener() {
-            @Override
-            public void onBufferingUpdate(IMediaPlayer mediaplayer, int percent) {
-            }
-        });
-        videoView.setOnPlayStateListener(new IMediaPlayer.OnPlayStateListener() {
-            @Override
-            public void onPlayState(boolean isPlay) {
-            }
-        });
-        videoView.setOnInfoListener(new IMediaPlayer.OnInfoListener() {
-            @Override
-            public boolean onInfo(IMediaPlayer mediaplayer, int what, int extra) {
-                switch (what) {
-                    case AUTH_SUCCESS:
-//                        auth = true;
-                        startPlay();
-                        break;
-                }
-                return false;
-            }
-        });
-        videoView.setOnErrorListener(new IMediaPlayer.OnErrorListener() {
-            @Override
-            public boolean onError(IMediaPlayer mediaplayer, int what, int extra) {
-                switch (what) {
-                    case AUTH_ERROR:
-                        break;
-                }
-                return false;
-            }
-        });
         videoView.setOnPreparedListener(new IMediaPlayer.OnPreparedListener() {
             @Override
             public void onPrepared(IMediaPlayer mediaplayer) {
                 mediaplayer.start();
             }
         });
-        videoView.setOnCompletionListener(new IMediaPlayer.OnCompletionListener() {
-            @Override
-            public void onCompletion(IMediaPlayer mediaplayer) {
-            }
-        });
         startPlay();
     }
     private void startPlay() {
-        //视讯云 直播
+//        //视讯云 直播
 //        videoView.setDataSource(new ProgramLive(),false);
         //视讯云 点播
-        videoView.setDataSourceByAuth(new ProgramVod(), false);
+        videoView.setDataSource(new ProgramVod(), false);
-        //本地视频
+//        //本地视频
 //        try {
 //            videoView.setDataSource("rtmp://live.hkstv.hk.lxdns.com/live/hks");
 //        } catch (IOException e) {
@@ -16,9 +16,4 @@
             android:layout_centerInParent="true" />
     </RelativeLayout>
-    <Button
-        android:id="@+id/switch_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="onClick" />
 </RelativeLayout>
 \ No newline at end of file