修改无缝切换的demo

谷俊
1 parent 172a2e15
Showing 8 changed files with 225 additions and 43 deletions
app/libs/libcnlivevideo.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/video/JumpSwitchVideoActivity.java
app/src/main/java/com/cnlive/demo/video/MainActivity.java
app/src/main/java/com/cnlive/demo/video/SwitchVideoByIdActivity.java
app/src/main/java/com/cnlive/demo/video/SwitchVideoActivity.java → app/src/main/java/com/cnlive/demo/video/SwitchVideoByPathActivity.java
app/src/main/res/layout/activity_jump_switch.xml
app/src/main/res/layout/activity_switch_video.xml
@@ -46,7 +46,17 @@
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".SwitchVideoActivity"
+            android:name=".SwitchVideoByIdActivity"
+            android:configChanges="keyboardHidden|screenSize|orientation"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".SwitchVideoByPathActivity"
+            android:configChanges="keyboardHidden|screenSize|orientation"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".JumpSwitchVideoActivity"
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:screenOrientation="portrait" />
+package com.cnlive.demo.video;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+
+/**
+ * Created by gujun on 2017/5/17.
+ */
+
+public class JumpSwitchVideoActivity extends AppCompatActivity{
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_jump_switch);
+
+    }
+
+    public void clickToPlayPathDemo(View view){
+        startActivity(new Intent(this,SwitchVideoByIdActivity.class));
+    }
+
+    public void clickToPlayIdDemo(View view){
+        startActivity(new Intent(this,SwitchVideoByPathActivity.class));
+    }
+
+
+}
+
@@ -29,10 +29,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 startActivity(new Intent(this, BarrageActivity.class));
                 break;
             case R.id.changePlayer:
-                startActivity(new Intent(this, SwitchVideoActivity.class));
+                startActivity(new Intent(this, JumpSwitchVideoActivity.class));
                 break;
             case R.id.adVideo:
-//                startActivity(new Intent(this, SltVideoActivity.class));
+                startActivity(new Intent(this, SltVideoActivity.class));
                 break;
             case R.id.videoStatus:
                 startActivity(new Intent(this, VideoStatusActivity.class));
+package com.cnlive.demo.video;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.cnlive.demo.video.model.DataSource;
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.video.video.SwitchVideoView;
+import com.cnlive.libs.video.video.base.IDataSource;
+import com.cnlive.libs.video.video.base.IMediaPlayer;
+import com.cnlive.libs.video.video.base.ISwitchVideoView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SwitchVideoByIdActivity extends AppCompatActivity implements IMediaPlayer.OnPreparedListener,
+        IMediaPlayer.OnCompletionListener, IMediaPlayer.OnErrorListener, IMediaPlayer.OnInfoListener,
+        IMediaPlayer.OnPlayStateListener, IMediaPlayer.OnSeekCompleteListener,
+        ISwitchVideoView.OnSwitchVideoPreparedListener, ISwitchVideoView.OnSwitchVideoErrorListener {
+
+    private SwitchVideoView videoView;
+
+    private int curVideoIndex = 0;
+    private List<IDataSource> videoIdUrls;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_switch_video);
+        initPlay();
+        startPlayId(getVideoIdList());
+    }
+
+    public List<IDataSource> getVideoIdList() {
+        List<IDataSource> videoList = new ArrayList<>();
+        videoList.add(new DataSource("20161126", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
+        videoList.add(new DataSource("20161126", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
+        videoList.add(new DataSource("20161126", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
+        videoList.add(new DataSource("20161126", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
+        videoList.add(new DataSource("20161126", Config.TYPE_VOD, Config.TYPE_PLAY_RATE_2));
+        return videoList;
+    }
+
+    private void startPlayId(List<IDataSource> videoList) {
+        videoIdUrls = videoList;
+        curVideoIndex = 0;
+        videoView.setDataSource(getNextVideoId());
+        videoView.switchVideo(getNextVideoId());
+    }
+
+    private IDataSource getNextVideoId() {
+        if (curVideoIndex >= videoIdUrls.size()) return null;
+        return videoIdUrls.get(curVideoIndex++);
+    }
+
+    private void initPlay() {
+        videoView = (SwitchVideoView) findViewById(R.id.videoview);
+        //认证APP播放权限（使用视讯中国资源）
+        videoView.setOnPreparedListener(this);
+        videoView.setOnCompletionListener(this);
+        videoView.setOnPlayStateListener(this);
+        videoView.setOnErrorListener(this);
+        videoView.setOnInfoListener(this);
+        videoView.setOnSeekCompleteListener(this);
+        videoView.setOnSwitchVideoPreparedListener(this);
+        videoView.setOnSwitchVideoErrorListener(this);
+        videoView.setKeepScreenOn(true);
+    }
+
+    private void playComplete() {
+        //播放完成 (视频结束或错误结束都会被触发)
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        videoView.pause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        videoView.start();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        videoView.release();
+    }
+
+    @Override
+    public void onCompletion(IMediaPlayer iMediaPlayer) {
+        boolean isLastMedia =
+                videoView.getSwitchMediaPlayer() == null || iMediaPlayer.equals(videoView.getSwitchMediaPlayer());
+        if (isLastMedia) {
+            playComplete();
+        } else {
+            videoView.switchVideoStart();
+            videoView.switchVideo(getNextVideoId());
+        }
+    }
+
+    @Override
+    public boolean onError(IMediaPlayer iMediaPlayer, int i, int i1) {
+        videoView.releaseSwitchVideo();
+        return false;
+    }
+
+    @Override
+    public boolean onInfo(IMediaPlayer iMediaPlayer, int i, int i1) {
+        return false;
+    }
+
+    @Override
+    public void onPlayState(boolean b) {
+
+    }
+
+    @Override
+    public void onPrepared(IMediaPlayer iMediaPlayer) {
+        iMediaPlayer.start();
+    }
+
+    @Override
+    public void onSeekComplete(IMediaPlayer iMediaPlayer) {
+
+    }
+
+    @Override
+    public void onSwitchVideoError(IMediaPlayer iMediaPlayer, int i, int i1) {
+        videoView.releaseSwitchVideo();
+    }
+
+    @Override
+    public void onSwitchVideoPrepared(IMediaPlayer iMediaPlayer) {
+
+    }
+
+}
@@ -4,34 +4,29 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
-import com.cnlive.demo.video.model.DataSource;
-import com.cnlive.libs.util.Config;
 import com.cnlive.libs.video.video.SwitchVideoView;
-import com.cnlive.libs.video.video.base.IDataSource;
 import com.cnlive.libs.video.video.base.IMediaPlayer;
 import com.cnlive.libs.video.video.base.ISwitchVideoView;
 import java.util.ArrayList;
 import java.util.List;
-public class SwitchVideoActivity extends AppCompatActivity implements IMediaPlayer.OnPreparedListener,
+public class SwitchVideoByPathActivity extends AppCompatActivity implements IMediaPlayer.OnPreparedListener,
         IMediaPlayer.OnCompletionListener, IMediaPlayer.OnErrorListener, IMediaPlayer.OnInfoListener,
         IMediaPlayer.OnPlayStateListener, IMediaPlayer.OnSeekCompleteListener,
-        ISwitchVideoView.OnSwitchVideoPreparedListener, ISwitchVideoView.OnSwitchVideoErrorListener{
+        ISwitchVideoView.OnSwitchVideoPreparedListener, ISwitchVideoView.OnSwitchVideoErrorListener {
     private SwitchVideoView videoView;
-    private int curVideoIndex=0;
+    private int curVideoIndex = 0;
     private List<String> videoUrls;
-    private List<IDataSource> videoIdUrls;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_switch_video);
         initPlay();
-//        startPlay(getVideoList());
-        startPlayId(getVideoIdList());
+        startPlay(getVideoList());
     }
     public List<String> getVideoList() {
@@ -56,28 +51,6 @@ public class SwitchVideoActivity extends AppCompatActivity implements IMediaPlay
         return videoUrls.get(curVideoIndex++);
     }
-    public List<IDataSource> getVideoIdList() {
-        List<IDataSource> videoList = new ArrayList<>();
-        videoList.add(new DataSource("20161126",Config.TYPE_VOD,Config.TYPE_PLAY_RATE_2));
-        videoList.add(new DataSource("20161126",Config.TYPE_VOD,Config.TYPE_PLAY_RATE_2));
-        videoList.add(new DataSource("20161126",Config.TYPE_VOD,Config.TYPE_PLAY_RATE_2));
-        videoList.add(new DataSource("20161126",Config.TYPE_VOD,Config.TYPE_PLAY_RATE_2));
-        videoList.add(new DataSource("20161126",Config.TYPE_VOD,Config.TYPE_PLAY_RATE_2));
-        return videoList;
-    }
-
-    private void startPlayId(List<IDataSource> videoList) {
-        videoIdUrls = videoList;
-        curVideoIndex = 0;
-        videoView.setDataSource(getNextVideoId());
-        videoView.switchVideo(getNextVideoId());
-    }
-
-    private IDataSource getNextVideoId() {
-        if (curVideoIndex >= videoIdUrls.size()) return null;
-        return videoIdUrls.get(curVideoIndex++);
-    }
-
     private void initPlay() {
         videoView = (SwitchVideoView) findViewById(R.id.videoview);
         //认证APP播放权限（使用视讯中国资源）
@@ -89,6 +62,7 @@ public class SwitchVideoActivity extends AppCompatActivity implements IMediaPlay
         videoView.setOnSeekCompleteListener(this);
         videoView.setOnSwitchVideoPreparedListener(this);
         videoView.setOnSwitchVideoErrorListener(this);
+        videoView.setKeepScreenOn(true);
     }
     private void playComplete() {
@@ -117,12 +91,11 @@ public class SwitchVideoActivity extends AppCompatActivity implements IMediaPlay
     public void onCompletion(IMediaPlayer iMediaPlayer) {
         boolean isLastMedia =
                 videoView.getSwitchMediaPlayer() == null || iMediaPlayer.equals(videoView.getSwitchMediaPlayer());
-        if(isLastMedia){
+        if (isLastMedia) {
             playComplete();
-        }else{
+        } else {
             videoView.switchVideoStart();
-//            videoView.switchVideo(getNextVideoPath());
-            videoView.switchVideo(getNextVideoId());
+            videoView.switchVideo(getNextVideoPath());
         }
     }
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="播放地址的demo"
+        android:onClick="clickToPlayPathDemo"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="播放id的demo"
+        android:onClick="clickToPlayIdDemo"/>
+
+</LinearLayout>
 \ No newline at end of file
@@ -4,12 +4,18 @@
     android:id="@+id/activity_test"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.cnlive.demo.video.SwitchVideoActivity">
+    tools:context="com.cnlive.demo.video.SwitchVideoByIdActivity">
-    <com.cnlive.libs.video.video.SwitchVideoView
-        android:id="@+id/videoview"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerInParent="true" />
+        android:layout_height="200dp"
+        android:background="#000000">
+
+        <com.cnlive.libs.video.video.SwitchVideoView
+            android:id="@+id/videoview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true" />
+    </RelativeLayout>
 </RelativeLayout>