优化代码逻辑升级代码

gz818 · Nov 23, 2016 · 621d70e · 621d70e
1 parent f546740
commit 621d70e
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 150 deletions.
diff --git a/IjkLib/build.gradle b/IjkLib/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.3'
     compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.3'
-    compile 'com.android.support:appcompat-v7:23.2.1'
+    provided 'com.android.support:appcompat-v7:23.2.1'
     compile 'com.android.support:preference-v7:23.2.1'
 }
 def siteUrl = 'https://github.com/Leifzhang/ijkplayer' // 项目的主页

diff --git a/IjkLib/src/main/AndroidManifest.xml b/IjkLib/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <application
         android:allowBackup="true"
         android:supportsRtl="true">
-
+        <service android:name="tv.danmaku.ijk.media.services.MediaPlayerService" />
     </application>
 
 </manifest>
diff --git a/IjkLib/src/main/java/tv/danmaku/ijk/media/services/MediaPlayerService.java b/IjkLib/src/main/java/tv/danmaku/ijk/media/services/MediaPlayerService.java
@@ -59,4 +59,5 @@ public static void setMediaPlayer(IMediaPlayer mp) {
     public static IMediaPlayer getMediaPlayer() {
         return sMediaPlayer;
     }
+
 }
diff --git a/IjkLib/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java b/IjkLib/src/main/java/tv/danmaku/ijk/media/widget/media/IjkVideoView.java
@@ -18,7 +18,9 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -117,31 +119,32 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl
 
     public IjkVideoView(Context context) {
         super(context);
-        initVideoView(context);
+        initVideoView(context, null);
     }
 
     public IjkVideoView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        initVideoView(context);
+        initVideoView(context, attrs);
     }
 
     public IjkVideoView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        initVideoView(context);
+        initVideoView(context, attrs);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public IjkVideoView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        initVideoView(context);
+        initVideoView(context, attrs);
     }
 
-    // REMOVED: onMeasure
-    // REMOVED: onInitializeAccessibilityEvent
-    // REMOVED: onInitializeAccessibilityNodeInfo
-    // REMOVED: resolveAdjustedSize
-
-    private void initVideoView(Context context) {
+    private void initVideoView(Context context, AttributeSet attrs) {
+        TypedArray arr = getContext().obtainStyledAttributes(attrs,
+                R.styleable.IjkVideoView, 0, 0);
+        if (arr != null) {
+            mEnableBackgroundPlay = arr.getBoolean(R.styleable.IjkVideoView_enableBackground, false);
+            arr.recycle();
+        }
         mAppContext = context.getApplicationContext();
         mSettings = new Settings(mAppContext);
 
@@ -526,31 +529,35 @@ public boolean onError(IMediaPlayer mp, int framework_err, int impl_err) {
                         } else {
                             messageId = R.string.VideoView_error_text_unknown;
                         }
-
-           /*             new AlertDialog.Builder(getContext())
+                        new AlertDialog.Builder(getContext())
                                 .setMessage(messageId)
                                 .setPositiveButton(R.string.VideoView_error_button,
                                         new DialogInterface.OnClickListener() {
                                             public void onClick(DialogInterface dialog, int whichButton) {
-                                            *//* If we get here, there is no onError listener, so
-                                             * at least inform them that the video is over.
-                                             *//*
                                                 if (mOnCompletionListener != null) {
                                                     mOnCompletionListener.onCompletion(mMediaPlayer);
                                                 }
                                             }
                                         })
                                 .setCancelable(false)
-                                .show();*/
+                                .show();
                     }
                     return true;
                 }
             };
+    private IMediaPlayer.OnBufferingUpdateListener bufferingUpdateListener;
+
+    public void setBufferingUpdateListener(IMediaPlayer.OnBufferingUpdateListener bufferingUpdateListener) {
+        this.bufferingUpdateListener = bufferingUpdateListener;
+    }
 
     private IMediaPlayer.OnBufferingUpdateListener mBufferingUpdateListener =
             new IMediaPlayer.OnBufferingUpdateListener() {
                 public void onBufferingUpdate(IMediaPlayer mp, int percent) {
                     mCurrentBufferPercentage = percent;
+                    if (bufferingUpdateListener != null) {
+                        bufferingUpdateListener.onBufferingUpdate(mp, percent);
+                    }
                 }
             };
 
@@ -635,7 +642,6 @@ public void onSurfaceCreated(@NonNull IRenderView.ISurfaceHolder holder, int wid
                 Log.e(TAG, "onSurfaceCreated: unmatched render callback\n");
                 return;
             }
-
             mSurfaceHolder = holder;
             if (mMediaPlayer != null)
                 bindSurfaceHolder(mMediaPlayer, holder);
@@ -858,11 +864,11 @@ public int getAudioSessionId() {
             IRenderView.AR_ASPECT_FIT_PARENT,
             IRenderView.AR_ASPECT_FILL_PARENT,
             IRenderView.AR_ASPECT_WRAP_CONTENT,
-            // IRenderView.AR_MATCH_PARENT,
+            IRenderView.AR_MATCH_PARENT,
             IRenderView.AR_16_9_FIT_PARENT,
             IRenderView.AR_4_3_FIT_PARENT};
     private int mCurrentAspectRatioIndex = 0;
-    private int mCurrentAspectRatio = s_allAspectRatio[1];
+    private int mCurrentAspectRatio = s_allAspectRatio[0];
 
     public int toggleAspectRatio() {
         mCurrentAspectRatioIndex++;
@@ -875,7 +881,7 @@ public int toggleAspectRatio() {
     }
 
     public void changeAspectRaito() {
-        mRenderView.setAspectRatio(s_allAspectRatio[1]);
+        mRenderView.setAspectRatio(s_allAspectRatio[0]);
     }
 
     //-------------------------
@@ -1037,15 +1043,19 @@ public IMediaPlayer createPlayer(int playerType) {
     private boolean mEnableBackgroundPlay = false;
 
     private void initBackground() {
-        mEnableBackgroundPlay = mSettings.getEnableBackgroundPlay();
         if (mEnableBackgroundPlay) {
             MediaPlayerService.intentToStart(getContext());
             mMediaPlayer = MediaPlayerService.getMediaPlayer();
-            if (mHudViewHolder != null)
+            if (mHudViewHolder != null) {
                 mHudViewHolder.setMediaPlayer(mMediaPlayer);
+            }
         }
     }
 
+    public void setEnableBackgroundPlay(boolean mEnableBackgroundPlay) {
+        this.mEnableBackgroundPlay = mEnableBackgroundPlay;
+    }
+
     public boolean isBackgroundPlayEnabled() {
         return mEnableBackgroundPlay;
     }

diff --git a/IjkLib/src/main/java/tv/danmaku/ijk/media/widget/media/PlayerMediaController.java b/IjkLib/src/main/java/tv/danmaku/ijk/media/widget/media/PlayerMediaController.java
@@ -110,17 +110,6 @@ public void onLayoutChange(View v, int left, int top, int right,
                 }
             };
 
-/*    private final OnTouchListener mTouchListener = new OnTouchListener() {
-        @Override
-        public boolean onTouch(View v, MotionEvent event) {
-            if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                if (mShowing) {
-                    hide();
-                }
-            }
-            return false;
-        }
-    };*/
 
     public void setMediaPlayer(MediaController.MediaPlayerControl player) {
         mPlayer = player;
@@ -148,6 +137,7 @@ public void setAnchorView(ViewGroup view) {
         View v = makeControllerView();
         addView(v, ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT);
+        mAnchor.removeView(this);
         mAnchor.addView(this, ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT);
         v.setVisibility(View.INVISIBLE);

diff --git a/IjkLib/src/main/res/values/attrs.xml b/IjkLib/src/main/res/values/attrs.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="entrySummaries" format="reference" />
-
+    <declare-styleable name="IjkVideoView">
+        <attr name="enableBackground" format="boolean" />
+    </declare-styleable>
     <declare-styleable name="IjkListPreference">
         <attr name="entrySummaries" />
     </declare-styleable>

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 Add this line to your `build.gradle` file under your module directory. 
 
 ```
-    compile 'com.github.leifzhang:IjkLib:0.2.1'
+    compile 'com.github.leifzhang:IjkLib:0.2.4'
 ```
 # 简介
 更新了一下ijk的版本号以及升级了一下so包.

diff --git a/build.gradle b/build.gradle
@@ -5,12 +5,12 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
 

diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
@@ -1,96 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<items version="2" >
-
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.1/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="3469cb457f10f74c28cbc05f069b6c894f6cbdd0">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-animated-vector-drawable-23.2.1_b1dc9aaf2bd699028b4e9ccc3ca5691e542e5c63/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars/libs/internal_impl-23.2.1.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="607a3d0b8013b4ccbfeb0b7cb293351994e021fb">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/internal_impl-23.2.1_45adaea8fe7bc276ac703817f0a751a3eb8256c1/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.1/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="e4d0cbb0b999604b349062f0214a0a228a7fd151">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-appcompat-v7-23.2.1_2e1949940d463e351fdb8e81ed494b093e974b47/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.2.1/support-annotations-23.2.1.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="ccb693bc0774fcb637246f7360de25b4af7df318">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/support-annotations-23.2.1_c09742b42db6780a80ad06082653d58bc0122cdd/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/tv.danmaku.ijk.media/ijkplayer-exo/0.6.3/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="50175b147bda2b5fe75ced7236f049a5ea6e4adc">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/tv.danmaku.ijk.media-ijkplayer-exo-0.6.3_322ace7b8489017f98c4ff659c5fd09f618cbc75/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.google.android.exoplayer/exoplayer/r1.5.11/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="0a919fdfb7808ff27b33e6e84ec990478abc9cf1">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.exoplayer-exoplayer-r1.5.11_30683ae0cdb881097b18b48c3bcba71d673e0d34/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.android.support/preference-v7/23.2.1/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="ffdfc8b94e6d46a997ada2edc9a212782d4d321d">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-preference-v7-23.2.1_258c68cb40cf2956fca48ed1d5d01672e0075339/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.2.1/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="e3885783ff8926ed9e2fdcd16816c2e1e73e7aee">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-recyclerview-v7-23.2.1_58cb382d1e1f331983fb0a0baa3204bf2e843d7e/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/incremental-runtime-classes/debug/instant-run.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="a2e7bd764f7a7cb64ab1efc26fedc0683fc13ad4">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/instant-run_007dbccea4c7be6c2c32b9693ebf4c3263960e4c/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/incremental-classes/debug/instant-run-bootstrap.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="aa7cfce77f47be42c7e50cd7c1c9f3699ddfccef">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/instant-run-bootstrap_d5d70d2b2852178a2f8bd822f93102d59691d604/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="3be474b1b21b31cf2fa93fe6bd641ae108d96452">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-support-v4-23.2.1_cca832953db83dc586abd441f340db79ac35d8ae/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/tv.danmaku.ijk.media/ijkplayer-java/0.6.3/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="e91ec409bc1c4bb3e2b81645311cf51b24c3706d">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/tv.danmaku.ijk.media-ijkplayer-java-0.6.3_b7352cd1e3a73e6a83f8a14345b5faf9d47b442b/classes.dex" />
-    </item>
-    <item
-        jar="/Users/zhangyang/ijkplayer/sample/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.1/jars/classes.jar"
-        jumboMode="true"
-        revision="23.0.2"
-        sha1="673d77a5bbddd766037f088e775df525c46407f0">
-        <dex dex="/Users/zhangyang/ijkplayer/sample/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-support-vector-drawable-23.2.1_afd7aeec44cb19166a59a63f5e206e9d0fdb8acc/classes.dex" />
-    </item>
-
-</items>
+<items version="2" />
diff --git a/gradle.properties b/gradle.properties
@@ -1,22 +1,17 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-# 包信息
+#Wed Nov 23 14:04:37 CST 2016
 PROJ_GROUP=com.github.leifzhang
-PROJ_VERSION=0.2.1
+PROJ_VERSION=0.2.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 07 18:06:37 CST 2016
+#Wed Nov 23 14:04:54 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/sample/src/main/java/com/example/zhangyang/ijktest/MainActivity.java b/sample/src/main/java/com/example/zhangyang/ijktest/MainActivity.java
@@ -26,10 +26,11 @@ protected void onCreate(Bundle savedInstanceState) {
         //  videoView.setOnErrorListener(new ErrorListener());
         AndroidMediaController controller = new AndroidMediaController(this, false);
         videoView.setMediaController(controller);
-        //String url = "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8";
-        String url = "http://o6wf52jln.bkt.clouddn.com/演员.mp3";
+        String url = "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8";
+        // String url = "http://o6wf52jln.bkt.clouddn.com/演员.mp3";
         videoView.setVideoURI(Uri.parse(url));
         videoView.start();
+        videoView.setVideoURI(Uri.parse(url));
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,4 +59,5 @@ public static void setMediaPlayer(IMediaPlayer mp) { @@
         public static IMediaPlayer getMediaPlayer() {
             return sMediaPlayer;
         }
     }