Merge remote-tracking branch 'origin/master'

Doikki · Dec 5, 2018 · c4d4d9c · c4d4d9c
2 parents baac64f + aa48205
commit c4d4d9c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTokActivity.java b/app/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTokActivity.java
@@ -82,10 +82,6 @@ public void onPageRelease(boolean isNext, int position) {
             @Override
             public void onPageSelected(int position, boolean isBottom) {
                 if (mCurrentPosition == position) return;
-                ViewParent parent = mIjkVideoView.getParent();
-                if (parent != null && parent instanceof FrameLayout) {
-                    ((FrameLayout) parent).removeView(mIjkVideoView);
-                }
                 startPlay(position);
                 mCurrentPosition = position;
             }
@@ -99,6 +95,10 @@ private void startPlay(int position) {
                 .load(mVideoList.get(position).getThumb())
                 .placeholder(android.R.color.white)
                 .into(mTikTokController.getThumb());
+        ViewParent parent = mIjkVideoView.getParent();
+        if (parent != null && parent instanceof FrameLayout) {
+            ((FrameLayout) parent).removeView(mIjkVideoView);
+        }
         frameLayout.addView(mIjkVideoView);
         mIjkVideoView.setUrl(mVideoList.get(position).getUrl());
         mIjkVideoView.setScreenScale(IjkVideoView.SCREEN_SCALE_CENTER_CROP);