1.升级ijkplayer至0.8.8

2.抖音demo
Doikki · Apr 2, 2018 · 37eec8f · 37eec8f
1 parent 969e180
commit 37eec8f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ A video player based on [IjkPlayer](https://github.com/Bilibili/ijkplayer).
 * **支持悬浮窗播放。**
 * **支持广告播放。**
 * **支持弹幕，使用了[DanmakuFlameMaster](https://github.com/Bilibili/DanmakuFlameMaster)。**
+* **抖音demo。**
 
 [demo下载](https://fir.im/1r3u)
 ## 使用
@@ -40,7 +41,7 @@ Step 1.Add it in your root build.gradle at the end of repositories:
 Step 2. Add the dependency
 
 	dependencies {
-	        compile 'com.github.dueeeke:dkplayer:1.4.3'
+	        compile 'com.github.dueeeke:dkplayer:1.5'
 	}
 ```
 或者将library下载并导入项目中使用

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.dueeeke.dkplayer"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 11
-        versionName "1.4.3"
+        versionCode 12
+        versionName "1.5"
     }
 
 

diff --git a/app/src/main/java/com/dueeeke/dkplayer/activity/DouYinActivity.java b/app/src/main/java/com/dueeeke/dkplayer/activity/DouYinActivity.java
@@ -52,7 +52,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setStatusBarTransparent();
 
         mIjkVideoView = new IjkVideoView(this);
-        mIjkVideoView.enableMediaCodec();
+        mIjkVideoView.setScreenScale(IjkVideoView.SCREEN_SCALE_MATCH_PARENT);
+        mIjkVideoView.setLooping();
         mDouYinController = new DouYinController(this);
         mIjkVideoView.setVideoController(mDouYinController);
         mVerticalViewPager = findViewById(R.id.vvp);

diff --git a/app/src/main/java/com/dueeeke/dkplayer/widget/controller/DouYinController.java b/app/src/main/java/com/dueeeke/dkplayer/widget/controller/DouYinController.java
@@ -10,6 +10,7 @@
 import com.dueeeke.dkplayer.R;
 import com.dueeeke.videoplayer.controller.BaseVideoController;
 import com.dueeeke.videoplayer.player.IjkVideoView;
+import com.dueeeke.videoplayer.util.L;
 
 /**
  * 抖音
@@ -48,15 +49,15 @@ public void setPlayState(int playState) {
 
         switch (playState) {
             case IjkVideoView.STATE_IDLE:
+                L.e("STATE_IDLE");
                 thumb.setVisibility(VISIBLE);
                 break;
             case IjkVideoView.STATE_PLAYING:
-                postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        thumb.setVisibility(GONE);
-                    }
-                }, 400);
+                L.e("STATE_PLAYING");
+                thumb.setVisibility(GONE);
+                break;
+            case IjkVideoView.STATE_PREPARED:
+                L.e("STATE_PREPARED");
                 break;
         }
     }

diff --git a/app/src/main/res/layout/item_douyin.xml b/app/src/main/res/layout/item_douyin.xml
@@ -7,6 +7,7 @@
     <ImageView
         android:id="@+id/thumb"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"/>
 
 </FrameLayout>
diff --git a/library/build.gradle b/library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 11
-        versionName "1.4.3"
+        versionCode 12
+        versionName "1.5"
     }
 
     sourceSets {

diff --git a/library/src/main/java/com/dueeeke/videoplayer/player/BaseIjkVideoView.java b/library/src/main/java/com/dueeeke/videoplayer/player/BaseIjkVideoView.java
@@ -421,7 +421,6 @@ public void onPrepared() {
         if (mCurrentPosition > 0) {
             seekTo(mCurrentPosition);
         }
-        start();
     }
 
     /**

diff --git a/library/src/main/java/com/dueeeke/videoplayer/player/IjkVideoView.java b/library/src/main/java/com/dueeeke/videoplayer/player/IjkVideoView.java
@@ -261,6 +261,12 @@ public boolean isFullScreen() {
         return isFullScreen;
     }
 
+    @Override
+    public void onPrepared() {
+        super.onPrepared();
+        if (useAndroidMediaPlayer) mMediaPlayer.start();
+    }
+
     @Override
     public void onError() {
         super.onError();