修复bug

Doikki · Doikki · commit b84945dccc38 · 2020-01-06T19:32:31.000+08:00
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/VideoView.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/VideoView.java
@@ -214,6 +214,7 @@ protected boolean startPlay() {
         }
         initPlayer();
         startPrepare(false);
+        addDisplay();
         return true;
     }
 
@@ -449,6 +450,7 @@ public void replay(boolean resetPosition) {
             mCurrentPosition = 0;
         }
         startPrepare(true);
+        addDisplay();
     }
 
     /**
@@ -568,7 +570,6 @@ public void onInfo(int what, int extra) {
     @Override
     public void onPrepared() {
         setPlayState(STATE_PREPARED);
-        addDisplay();
         if (mCurrentPosition > 0) {
             seekTo(mCurrentPosition);
         }
diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/Tiktok2Adapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/Tiktok2Adapter.java
@@ -7,6 +7,7 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.viewpager.widget.PagerAdapter;
@@ -72,6 +73,12 @@ public Object instantiateItem(@NonNull ViewGroup container, int position) {
                 .placeholder(android.R.color.white)
                 .into(viewHolder.mThumb);
         viewHolder.mTitle.setText(item.title);
+        viewHolder.mTitle.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(context, "点击了标题", Toast.LENGTH_SHORT).show();
+            }
+        });
         viewHolder.mPosition = position;
         container.addView(view);
         return view;
diff --git a/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/VodControlView.java b/dkplayer-ui/src/main/java/com/dueeeke/videocontroller/component/VodControlView.java
@@ -73,7 +73,8 @@ public VodControlView(@NonNull Context context, @Nullable AttributeSet attrs, in
         mPlayButton.setOnClickListener(this);
         mBottomProgress = findViewById(R.id.bottom_progress);
 
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP) {
+        //5.1以下系统SeekBar高度需要设置成WRAP_CONTENT
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
             mVideoProgress.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,7 @@ protected boolean startPlay() {`
`214`	`214`	`}`
`215`	`215`	`initPlayer();`
`216`	`216`	`startPrepare(false);`
	`217`	`+ addDisplay();`
`217`	`218`	`return true;`
`218`	`219`	`}`
`219`	`220`
`@@ -449,6 +450,7 @@ public void replay(boolean resetPosition) {`
`449`	`450`	`mCurrentPosition = 0;`
`450`	`451`	`}`
`451`	`452`	`startPrepare(true);`
	`453`	`+ addDisplay();`
`452`	`454`	`}`
`453`	`455`
`454`	`456`	`/**`
`@@ -568,7 +570,6 @@ public void onInfo(int what, int extra) {`
`568`	`570`	`@Override`
`569`	`571`	`public void onPrepared() {`
`570`	`572`	`setPlayState(STATE_PREPARED);`
`571`		`- addDisplay();`
`572`	`573`	`if (mCurrentPosition > 0) {`
`573`	`574`	`seekTo(mCurrentPosition);`
`574`	`575`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ public VodControlView(@NonNull Context context, @Nullable AttributeSet attrs, in`
`73`	`73`	`mPlayButton.setOnClickListener(this);`
`74`	`74`	`mBottomProgress = findViewById(R.id.bottom_progress);`
`75`	`75`
`76`		`- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP) {`
	`76`	`+ //5.1以下系统SeekBar高度需要设置成WRAP_CONTENT`
	`77`	`+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {`
`77`	`78`	`mVideoProgress.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;`
`78`	`79`	`}`
`79`	`80`	`}`