升级播放SDK

王琳
1 parent 934d5f6b
Showing 15 changed files with 27 additions and 29 deletions
.idea/gradle.xml
.idea/misc.xml
app/build.gradle
app/libs/libcnliveutilplus.jar
app/libs/libcnlivevideo.jar
app/src/main/java/com/cnlive/demo/videoqn/CNMediaPlayerActivity.java
app/src/main/java/com/cnlive/demo/videoqn/CNVideoViewActivity.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/jniLibs/arm64-v8a/libpldroidplayer.so
app/src/main/jniLibs/armeabi-v7a/libpldroidplayer.so
app/src/main/jniLibs/armeabi/libpldroidplayer.so
app/src/main/jniLibs/x86/libpldroidplayer.so
build.gradle
gradle/wrapper/gradle-wrapper.properties
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-3.3" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <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">
+  <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">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -2,7 +2,7 @@ apply plugin: &#39;com.android.application&#39;
  
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    buildToolsVersion '25.0.0'
     defaultConfig {
         applicationId "com.cnlive.demo.videoqn"
         minSdkVersion 16
@@ -24,7 +24,7 @@ import com.cnlive.libs.lib_cnvideo.player.MediaPlayer;
 import java.io.IOException;
  
 /**
- *  This demo shows how to use IMediaPlayer API playing video stream
+ * This demo shows how to use IMediaPlayer API playing video stream
  */
 public class CNMediaPlayerActivity extends VideoPlayerBaseActivity {
  
@@ -37,7 +37,7 @@ public class CNMediaPlayerActivity extends VideoPlayerBaseActivity {
     private View mLoadingView;
     private AVOptions mAVOptions;
  
-    private int mSurfaceWidth  = 0;
+    private int mSurfaceWidth = 0;
     private int mSurfaceHeight = 0;
  
     private String mVideoPath = null;
@@ -190,8 +190,7 @@ public class CNMediaPlayerActivity extends VideoPlayerBaseActivity {
             e.printStackTrace();
         } catch (IllegalStateException e) {
             e.printStackTrace();
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }
@@ -217,15 +216,15 @@ public class CNMediaPlayerActivity extends VideoPlayerBaseActivity {
     };
  
     private IMediaPlayer.OnVideoSizeChangedListener mOnVideoSizeChangedListener = new IMediaPlayer.OnVideoSizeChangedListener() {
-        public void onVideoSizeChanged(IMediaPlayer mp, int width, int height) {
-            Log.i(TAG, "onVideoSizeChanged, width = "+ width + ",height = " + height);
+        public void onVideoSizeChanged(IMediaPlayer mp, int width, int height, int i, int i2) {
+            Log.i(TAG, "onVideoSizeChanged, width = " + width + ",height = " + height);
             // resize the display window to fit the screen
             if (width != 0 && height != 0) {
-                float ratioW = (float) width/(float) mSurfaceWidth;
-                float ratioH = (float) height/(float) mSurfaceHeight;
+                float ratioW = (float) width / (float) mSurfaceWidth;
+                float ratioH = (float) height / (float) mSurfaceHeight;
                 float ratio = Math.max(ratioW, ratioH);
-                width  = (int) Math.ceil((float)width/ratio);
-                height = (int) Math.ceil((float)height/ratio);
+                width = (int) Math.ceil((float) width / ratio);
+                height = (int) Math.ceil((float) height / ratio);
                 FrameLayout.LayoutParams layout = new FrameLayout.LayoutParams(width, height);
                 layout.gravity = Gravity.CENTER;
                 mSurfaceView.setLayoutParams(layout);
@@ -269,13 +268,12 @@ public class CNMediaPlayerActivity extends VideoPlayerBaseActivity {
     };
  
     /**
-     *  Listen the event of playing complete
-     *  For playing local file, it's called when reading the file EOF
-     *  For playing network stream, it's called when the buffered bytes played over
-     *
-     *  If setLooping(true) is called, the player will restart automatically
-     *  And ｀onCompletion｀ will not be called
-     *
+     * Listen the event of playing complete
+     * For playing local file, it's called when reading the file EOF
+     * For playing network stream, it's called when the buffered bytes played over
+     * <p>
+     * If setLooping(true) is called, the player will restart automatically
+     * And ｀onCompletion｀ will not be called
      */
     private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
         @Override
@@ -86,10 +86,10 @@ public class CNVideoViewActivity extends VideoPlayerBaseActivity {
         mVideoView.setOnPreparedListener(onPreparedListener);
  
         //播放普通视频
-        mVideoView.setVideoPath(mVideoPath);
+//        mVideoView.setVideoPath(mVideoPath);
  
 //        //播放视讯云视频
-//        mVideoView.setDataSource(new ProgramLive(), false);
+        mVideoView.setDataSource(new ProgramLive(), false);
  
         // You can also use a custom `MediaController` widget
         mMediaController = new MediaController(this, false, isLiveStreaming == 1);
@@ -240,8 +240,8 @@ public class CNVideoViewActivity extends VideoPlayerBaseActivity {
  
     private IMediaPlayer.OnVideoSizeChangedListener mOnVideoSizeChangedListener = new IMediaPlayer.OnVideoSizeChangedListener() {
         @Override
-        public void onVideoSizeChanged(IMediaPlayer plMediaPlayer, int width, int height) {
-            Log.d(TAG, "onVideoSizeChanged: " + width + "," + height);
+        public void onVideoSizeChanged(IMediaPlayer iMediaPlayer, int i, int i1, int i2, int i3) {
+            Log.d(TAG, "onVideoSizeChanged: " + i + "," + i1 + "," + i2 + "," + i3);
         }
     };
  
@@ -253,7 +253,7 @@ public class VideoViewActivity extends VideoPlayerBaseActivity implements
     }
  
     @Override
-    public void onVideoSizeChanged(IMediaPlayer iMediaPlayer, int width, int height) {
+    public void onVideoSizeChanged(IMediaPlayer iMediaPlayer, int width, int height, int i1, int i2) {
  
         Log.i(TAG, "onVideoSizeChanged " + iMediaPlayer.getVideoWidth() + "x" + iMediaPlayer.getVideoHeight() + ",width:" + width + ",height:" + height);
  
@@ -13,7 +13,7 @@ public class ProgramLive implements IDataSource{
     //返回直播视频ID
     @Override
     public String getId() {
-        return "news";
+        return "qwert";
     }
  
     //返回视频类型 live
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
  
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Apr 06 18:31:12 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip