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

王琳
2 parents 04011cb8 89b82116
Showing 24 changed files with 430 additions and 185 deletions
.idea/misc.xml
app/build.gradle
app/libs/libcnliveutil.jar
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/SwitchVideoActivity.java
app/src/main/java/com/cnlive/demo/video/SwitchVideoByIdActivity.java
app/src/main/java/com/cnlive/demo/video/SwitchVideoByPathActivity.java
app/src/main/java/com/cnlive/demo/video/VideoViewActivity.java
app/src/main/java/com/cnlive/demo/video/model/DataSource.java
app/src/main/java/com/cnlive/demo/video/model/ProgramLiveActivityId.java
app/src/main/jniLibs/arm64-v8a/libRongIMLib.so
app/src/main/jniLibs/arm64-v8a/libksylive.so
app/src/main/jniLibs/armeabi-v7a/libRongIMLib.so
app/src/main/jniLibs/armeabi-v7a/libksylive.so
app/src/main/jniLibs/armeabi/libRongIMLib.so
app/src/main/jniLibs/armeabi/libksylive.so
app/src/main/jniLibs/x86/libRongIMLib.so
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -26,6 +26,6 @@ dependencies {
     compile project(':lib_advideo')
     compile 'com.android.support:appcompat-v7:25.0.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.1'
-    compile 'com.android.support:design:25.3.0'
+    compile 'com.android.support:design:25.0.0'
     testCompile 'junit:junit:4.12'
 }
@@ -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.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,SwitchVideoByPathActivity.class));
+    }
+
+    public void clickToPlayIdDemo(View view){
+        startActivity(new Intent(this,SwitchVideoByIdActivity.class));
+    }
+
+
+}
+
@@ -31,7 +31,7 @@ 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));
-package com.cnlive.demo.video;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.widget.Button;
-import android.widget.Toast;
-
-import com.cnlive.libs.video.video.MediaPlayer;
-import com.cnlive.libs.video.video.base.IMediaPlayer;
-
-import java.io.IOException;
-
-public class SwitchVideoActivity extends AppCompatActivity {
-
-    private MediaPlayer firstPlayer;
-    private MediaPlayer secondPlayer;
-
-    //负责配合mediaPlayer显示视频图像播放的surfaceView
-    private SurfaceView surface;
-    private SurfaceHolder surfaceHolder;
-
-    private boolean isFirst = true;
-
-    private Button changeBtn;
-    private Button prepareBtn;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_switch_video);
-
-        surface = (SurfaceView) findViewById(R.id.surfaceView);
-        surfaceHolder = surface.getHolder();
-        changeBtn = (Button) findViewById(R.id.prepare);
-        changeBtn.setOnClickListener(listener);
-
-        prepareBtn = (Button) findViewById(R.id.create);
-        prepareBtn.setOnClickListener(listener);
-
-        initFirstPlayer(true);
-    }
-
-    View.OnClickListener listener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            //判断切换到哪一个MediaPlayer
-            switch (v.getId()) {
-                case R.id.prepare:
-                    if (isFirst && secondPlayer != null) {
-                        //点击按钮切换到第二个MediaPlayer
-                        firstPlayer.setDisplay(null);
-//                        secondPlayer.setDisplay(surfaceHolder);
-                        secondPlayer.setPlayerMute(0);
-                        firstPlayer.release();
-                        firstPlayer = null;
-                        isFirst = false;
-                    } else if (!isFirst && firstPlayer != null){
-                        //点击按钮切换到第一个MediaPlayer
-                        secondPlayer.setDisplay(null);
-//                        firstPlayer.setDisplay(surfaceHolder);
-                        firstPlayer.setPlayerMute(0);
-                        secondPlayer.release();
-                        secondPlayer = null;
-                        isFirst = true;
-                    }else {
-                        Toast.makeText(SwitchVideoActivity.this, "Player为null，请先准备视频", Toast.LENGTH_SHORT).show();
-                    }
-                    break;
-                case R.id.create:
-                    if (firstPlayer == null) {
-                        initFirstPlayer(false);
-                    }
-                    if (secondPlayer == null)
-                        initNextPlayer();
-            }
-        }
-    };
-
-    private void initFirstPlayer(final boolean isFirstTime) {
-        //初始化第一个MediaPlayer,在本demo中需要传入是否是第一次初始化,如果不是第一次则需要将player设置为静音
-        firstPlayer = new MediaPlayer(getBaseContext());
-        firstPlayer.setOnPreparedListener(new IMediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(IMediaPlayer iMediaPlayer) {
-                firstPlayer.setDisplay(surfaceHolder);
-                firstPlayer.start();
-                if (isFirstTime) {
-                    firstPlayer.setPlayerMute(0);
-                } else {
-                    firstPlayer.setPlayerMute(1);
-                }
-            }
-        });
-
-        firstPlayer.setBufferTimeMax(3);
-        firstPlayer.setTimeout(5, 30);
-
-
-        try {
-            firstPlayer.setDataSource("rtmp://live.hkstv.hk.lxdns.com/live/hks");
-            firstPlayer.prepareAsync();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void initNextPlayer() {
-        //初始化第二个MediaPlayer
-        secondPlayer = new MediaPlayer(SwitchVideoActivity.this);
-        secondPlayer.setOnPreparedListener(new IMediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(IMediaPlayer iMediaPlayer) {
-                secondPlayer.setDisplay(surfaceHolder);
-                secondPlayer.start();
-                secondPlayer.setPlayerMute(1);
-            }
-        });
-
-        secondPlayer.setBufferTimeMax(3);
-        secondPlayer.setTimeout(5, 30);
-
-        try {
-            secondPlayer.setDataSource("http://uv01.cnlive.com/record/live/82_20161126/hls/82_20161126-82_20161126.m3u8");
-            secondPlayer.prepareAsync();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (firstPlayer != null) {
-            firstPlayer.start();
-        }
-        if (secondPlayer != null) {
-            secondPlayer.start();
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (firstPlayer != null) {
-            if (firstPlayer.isPlaying()) {
-                firstPlayer.stop();
-            }
-            firstPlayer.release();
-        }
-        if (secondPlayer != null) {
-            if (secondPlayer.isPlaying()) {
-                secondPlayer.stop();
-            }
-            secondPlayer.release();
-        }
-
-    }
-}
+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) {
+
+    }
+
+}
+package com.cnlive.demo.video;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import com.cnlive.libs.video.video.SwitchVideoView;
+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 SwitchVideoByPathActivity 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<String> videoUrls;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_switch_video);
+        initPlay();
+        startPlay(getVideoList());
+    }
+
+    public List<String> getVideoList() {
+        List<String> videoList = new ArrayList<>();
+        videoList.add("https://mobile.cnlive.com/CnliveMobile/web/7.mp4");
+        videoList.add("https://mobile.cnlive.com/CnliveMobile/web/7.mp4");
+        videoList.add("https://mobile.cnlive.com/CnliveMobile/web/7.mp4");
+        videoList.add("https://mobile.cnlive.com/CnliveMobile/web/7.mp4");
+        videoList.add("https://mobile.cnlive.com/CnliveMobile/web/7.mp4");
+        return videoList;
+    }
+
+    private void startPlay(List<String> videoList) {
+        videoUrls = videoList;
+        curVideoIndex = 0;
+        videoView.setDataSource(getNextVideoPath());
+        videoView.switchVideo(getNextVideoPath());
+    }
+
+    private String getNextVideoPath() {
+        if (curVideoIndex >= videoUrls.size()) return null;
+        return videoUrls.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(getNextVideoPath());
+        }
+    }
+
+    @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) {
+
+    }
+
+}
@@ -51,13 +51,17 @@ public class VideoViewActivity extends Activity {
     }
  
     private void startPlay() {
-//        //视讯云 直播
-//        videoView.setDataSource(new ProgramLive(),false);
  
         //视讯云 点播
         videoView.setDataSource(new ProgramVod());
  
-//        //本地视频
+        //视讯云 直播 主播/频道ID播放
+        //videoView.setDataSource(new ProgramLive());
+
+        //视讯云 直播 活动ID播放
+        //videoView.setDataSource(new ProgramLiveActivityId());
+
+        //本地视频
 //        try {
 //            videoView.setDataSource("rtmp://live.hkstv.hk.lxdns.com/live/hks");
 //        } catch (IOException e) {
+package com.cnlive.demo.video.model;
+
+import com.cnlive.libs.video.video.base.IDataSource;
+
+/**
+ * Created by gujun on 2017/5/16.
+ */
+
+public class DataSource implements IDataSource{
+
+    private String id;
+    private String type;
+    private String rate;
+
+    public DataSource(String id, String type, String rate) {
+        this.id = id;
+        this.type = type;
+        this.rate = rate;
+    }
+
+    @Override
+    public String getDataSourceId() {
+        return id;
+    }
+
+    @Override
+    public String getDataSourceType() {
+        return type;
+    }
+
+    @Override
+    public String getDataSourceRate() {
+        return rate;
+    }
+}
+package com.cnlive.demo.video.model;
+
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.video.video.base.IActivityDataSource;
+
+/**
+ * Created by xiansong on 2017/6/20.
+ */
+
+public class ProgramLiveActivityId implements IActivityDataSource {
+
+    @Override
+    public String getDataSourceId() {
+        //TODO 主播/频道ID
+        return "androidtest";
+    }
+
+    //返回视频类型 live
+    @Override
+    public String getDataSourceType() {
+        return Config.TYPE_LIVE;
+    }
+
+    //返回视频码率
+    @Override
+    public String getDataSourceRate() {
+        return Config.TYPE_PLAY_RATE_2;
+    }
+
+    @Override
+    public String getDataActivityId() {
+        //TODO 通过活动ID播放
+        return "activityId";
+    }
+}
+<?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,24 +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">
  
-    <SurfaceView
-        android:id="@+id/surfaceView"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="200dp"
-        android:layout_centerInParent="true" />
+        android:background="#000000">
  
-    <Button
-        android:id="@+id/prepare"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/create"
-        android:text="播放视频" />
+        <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>
  
-    <Button
-        android:id="@+id/create"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="准备视频" />
 </RelativeLayout>