添加播放SDK文档

王琳
1 parent ac138b3a
Showing 21 changed files with 97 additions and 58 deletions
.idea/misc.xml
app/build.gradle
app/src/androidTest/java/com/cnlive/demo/video/ExampleInstrumentedTest.java → app/src/androidTest/java/com/cnlive/demo/videoqn/ExampleInstrumentedTest.java
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/video/CNAudioPlayerActivity.java → app/src/main/java/com/cnlive/demo/videoqn/CNAudioPlayerActivity.java
app/src/main/java/com/cnlive/demo/video/CNMediaPlayerActivity.java → app/src/main/java/com/cnlive/demo/videoqn/CNMediaPlayerActivity.java
app/src/main/java/com/cnlive/demo/video/CNVideoTextureActivity.java → app/src/main/java/com/cnlive/demo/videoqn/CNVideoTextureActivity.java
app/src/main/java/com/cnlive/demo/video/CNVideoViewActivity.java → app/src/main/java/com/cnlive/demo/videoqn/CNVideoViewActivity.java
app/src/main/java/com/cnlive/demo/video/MainActivity.java → app/src/main/java/com/cnlive/demo/videoqn/MainActivity.java
app/src/main/java/com/cnlive/demo/video/VideoApplication.java → app/src/main/java/com/cnlive/demo/videoqn/VideoApplication.java
app/src/main/java/com/cnlive/demo/video/VideoFileActivity.java → app/src/main/java/com/cnlive/demo/videoqn/VideoFileActivity.java
app/src/main/java/com/cnlive/demo/video/VideoPlayerBaseActivity.java → app/src/main/java/com/cnlive/demo/videoqn/VideoPlayerBaseActivity.java
app/src/main/java/com/cnlive/demo/video/VideoViewActivity.java → app/src/main/java/com/cnlive/demo/videoqn/VideoViewActivity.java
app/src/main/java/com/cnlive/demo/videoqn/model/ProgramLive.java
app/src/main/java/com/cnlive/demo/videoqn/model/ProgramVod.java
app/src/main/java/com/cnlive/demo/video/utils/Utils.java → app/src/main/java/com/cnlive/demo/videoqn/utils/Utils.java
app/src/main/java/com/cnlive/demo/video/widget/AspectLayout.java → app/src/main/java/com/cnlive/demo/videoqn/widget/AspectLayout.java
app/src/main/java/com/cnlive/demo/video/widget/MediaController.java → app/src/main/java/com/cnlive/demo/videoqn/widget/MediaController.java
app/src/main/res/layout/activity_video_view.xml
app/src/test/java/com/cnlive/demo/video/ExampleUnitTest.java → app/src/test/java/com/cnlive/demo/videoqn/ExampleUnitTest.java
@@ -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">
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 24
     buildToolsVersion "24.0.3"
     defaultConfig {
-        applicationId "com.cnlive.demo.video"
+        applicationId "com.cnlive.demo.videoqn"
         minSdkVersion 16
         targetSdkVersion 24
         versionCode 1
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cnlive.demo.video">
+    package="com.cnlive.demo.videoqn">
  
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -9,25 +9,25 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  
     <application
-        android:name=".VideoApplication"
+        android:name="com.cnlive.demo.videoqn.VideoApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.cnlive.demo.videoqn.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
  
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".CNMediaPlayerActivity" />
-        <activity android:name=".CNAudioPlayerActivity" />
-        <activity android:name=".CNVideoViewActivity" />
-        <activity android:name=".CNVideoTextureActivity" />
-        <activity android:name=".VideoViewActivity" />
-        <activity android:name=".VideoFileActivity" />
+        <activity android:name="com.cnlive.demo.videoqn.CNMediaPlayerActivity" />
+        <activity android:name="com.cnlive.demo.videoqn.CNAudioPlayerActivity" />
+        <activity android:name="com.cnlive.demo.videoqn.CNVideoViewActivity" />
+        <activity android:name="com.cnlive.demo.videoqn.CNVideoTextureActivity" />
+        <activity android:name="com.cnlive.demo.videoqn.VideoViewActivity" />
+        <activity android:name="com.cnlive.demo.videoqn.VideoFileActivity" />
     </application>
  
 </manifest>
 \ No newline at end of file
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.content.Context;
 import android.media.AudioManager;
@@ -12,7 +12,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
  
-import com.cnlive.demo.video.utils.Utils;
+import com.cnlive.demo.videoqn.utils.Utils;
 import com.cnlive.libs.lib_cnvideo.base.IAVOptions;
 import com.cnlive.libs.lib_cnvideo.base.IMediaPlayer;
 import com.cnlive.libs.lib_cnvideo.player.AVOptions;
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.content.Context;
 import android.media.AudioManager;
@@ -15,13 +15,11 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.Toast;
  
-import com.cnlive.demo.video.utils.Utils;
+import com.cnlive.demo.videoqn.utils.Utils;
 import com.cnlive.libs.lib_cnvideo.base.IAVOptions;
-import com.cnlive.libs.lib_cnvideo.base.IDataSource;
 import com.cnlive.libs.lib_cnvideo.base.IMediaPlayer;
 import com.cnlive.libs.lib_cnvideo.player.AVOptions;
 import com.cnlive.libs.lib_cnvideo.player.MediaPlayer;
-import com.cnlive.libs.util.Config;
  
 import java.io.IOException;
  
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.os.Bundle;
 import android.os.Handler;
@@ -8,8 +8,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.Toast;
  
-import com.cnlive.demo.video.utils.Utils;
-import com.cnlive.demo.video.widget.MediaController;
+import com.cnlive.demo.videoqn.utils.Utils;
+import com.cnlive.demo.videoqn.widget.MediaController;
 import com.cnlive.libs.lib_cnvideo.base.IAVOptions;
 import com.cnlive.libs.lib_cnvideo.base.ICNVideoTextureView;
 import com.cnlive.libs.lib_cnvideo.base.IMediaPlayer;
@@ -87,6 +87,7 @@ public class CNVideoTextureActivity extends VideoPlayerBaseActivity {
  
         mVideoView.setOnCompletionListener(mOnCompletionListener);
         mVideoView.setOnErrorListener(mOnErrorListener);
+        mVideoView.setOnPreparedListener(onPreparedListener);
  
         mVideoView.setVideoPath(mVideoPath);
     }
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.os.Bundle;
 import android.os.Handler;
@@ -9,15 +9,14 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.Toast;
  
-import com.cnlive.demo.video.utils.Utils;
-import com.cnlive.demo.video.widget.MediaController;
+import com.cnlive.demo.videoqn.model.ProgramLive;
+import com.cnlive.demo.videoqn.utils.Utils;
+import com.cnlive.demo.videoqn.widget.MediaController;
 import com.cnlive.libs.lib_cnvideo.base.IAVOptions;
-import com.cnlive.libs.lib_cnvideo.base.IDataSource;
 import com.cnlive.libs.lib_cnvideo.base.IMediaPlayer;
 import com.cnlive.libs.lib_cnvideo.base.IVideoView;
 import com.cnlive.libs.lib_cnvideo.player.AVOptions;
 import com.cnlive.libs.lib_cnvideo.player.widget.CNVideoView;
-import com.cnlive.libs.util.Config;
  
 /**
  * This is a demo activity of PLVideoView
@@ -90,22 +89,7 @@ public class CNVideoViewActivity extends VideoPlayerBaseActivity {
         mVideoView.setVideoPath(mVideoPath);
  
 //        //播放视讯云视频
-//        mVideoView.setDataSource(new IDataSource() {
-//            @Override
-//            public String getId() {
-//                return "20161126";
-//            }
-//
-//            @Override
-//            public String getType() {
-//                return Config.TYPE_VOD;
-//            }
-//
-//            @Override
-//            public String getRate() {
-//                return Config.TYPE_PLAY_RATE_2;
-//            }
-//        }, false);
+//        mVideoView.setDataSource(new ProgramLive(), false);
  
         // You can also use a custom `MediaController` widget
         mMediaController = new MediaController(this, false, isLiveStreaming == 1);
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.app.Activity;
 import android.content.Intent;
@@ -13,8 +13,6 @@ import android.widget.TextView;
  
 import com.cnlive.libs.lib_cnvideo.NetworkManager;
  
-import java.net.UnknownHostException;
-
 public class MainActivity extends AppCompatActivity {
  
     private static final String DEFAULT_TEST_URL = "rtmp://live.hkstv.hk.lxdns.com/live/hks";
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.app.Application;
  
@@ -12,6 +12,6 @@ public class VideoApplication extends Application{
     @Override
     public void onCreate() {
         super.onCreate();
-        Config.init(this, "60_irn9edco29", "69fe70bda67e059286ad509d9f5377f815955645b52f94");
+        Config.init(this, "60_iwoodaqi22", "52b31aebc17b4af7467d25c974b9348accb044d76ff82a");
     }
 }
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.app.Activity;
 import android.content.Context;
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.os.Build;
 import android.os.Bundle;
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -12,8 +12,8 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.Toast;
  
-import com.cnlive.demo.video.widget.AspectLayout;
-import com.cnlive.demo.video.widget.MediaController;
+import com.cnlive.demo.videoqn.widget.AspectLayout;
+import com.cnlive.demo.videoqn.widget.MediaController;
 import com.cnlive.libs.lib_cnvideo.base.IAVOptions;
 import com.cnlive.libs.lib_cnvideo.base.IMediaPlayer;
 import com.cnlive.libs.lib_cnvideo.base.Util;
+package com.cnlive.demo.videoqn.model;
+
+import com.cnlive.libs.lib_cnvideo.base.IDataSource;
+import com.cnlive.libs.util.Config;
+
+/**
+ * 直播
+ * Created by bjwan on 12/14/2016.
+ */
+
+public class ProgramLive implements IDataSource{
+
+    //返回直播视频ID
+    @Override
+    public String getId() {
+        return "news";
+    }
+
+    //返回视频类型 live
+    @Override
+    public String getType() {
+        return Config.TYPE_LIVE;
+    }
+
+    //返回视频码率
+    @Override
+    public String getRate() {
+        return Config.TYPE_PLAY_RATE_2;
+    }
+}
+package com.cnlive.demo.videoqn.model;
+
+import com.cnlive.libs.lib_cnvideo.base.IDataSource;
+import com.cnlive.libs.util.Config;
+
+/**
+ * Created by bjwan on 12/14/2016.
+ */
+
+public class ProgramVod implements IDataSource {
+    //返回点播视频ID
+    @Override
+    public String getId() {
+        return "117_0005701481101785734a";
+    }
+
+    //返回视频类型 vod
+    @Override
+    public String getType() {
+        return Config.TYPE_VOD;
+    }
+
+    //返回视频码率
+    @Override
+    public String getRate() {
+        return Config.TYPE_PLAY_RATE_2;
+    }
+}
-package com.cnlive.demo.video.utils;
+package com.cnlive.demo.videoqn.utils;
  
 import android.content.Context;
 import android.net.ConnectivityManager;
-package com.cnlive.demo.video.widget;
+package com.cnlive.demo.videoqn.widget;
  
 import android.annotation.TargetApi;
 import android.content.Context;
-package com.cnlive.demo.video.widget;
+package com.cnlive.demo.videoqn.widget;
  
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@color/background_material_light">
  
-    <com.cnlive.demo.video.widget.AspectLayout
+    <com.cnlive.demo.videoqn.widget.AspectLayout
         android:id="@+id/aspect_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -18,7 +18,7 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:layout_centerInParent="true" />
-    </com.cnlive.demo.video.widget.AspectLayout>
+    </com.cnlive.demo.videoqn.widget.AspectLayout>
  
     <Button
         android:id="@+id/back_btn"
-package com.cnlive.demo.video;
+package com.cnlive.demo.videoqn;
  
 import org.junit.Test;