Merge branch 'develop' of https://github.com/Jzvd/JiaoZiVideoPlayer i…

…nto develop
Jzvd · May 27, 2020 · e0068a9 · e0068a9
2 parents 345823a + b2d4ea6
commit e0068a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -42,14 +42,10 @@ implementation 'cn.jzvd:jiaozivideoplayer:7.4.0'
 
 2.添加布局
 ```xml
-<LinearLayout
+<cn.jzvd.demo.CustomJzvd.MyJzvdStd
+    android:id="@+id/jz_video"
     android:layout_width="match_parent"
-    android:layout_height="200dp">
-    <cn.jzvd.demo.CustomJzvd.MyJzvdStd
-        android:id="@+id/jz_video"
-        android:layout_width="match_parent"
-        android:layout_height="200dp" />
-</LinearLayout>
+    android:layout_height="200dp" />
 ```
 
 3.设置视频地址、缩略图地址、标题

diff --git a/library/src/main/java/cn/jzvd/Jzvd.java b/library/src/main/java/cn/jzvd/Jzvd.java
@@ -671,11 +671,9 @@ public void gotoNormalCompletion() {
         ViewGroup vg = (ViewGroup) (JZUtils.scanForActivity(jzvdContext)).getWindow().getDecorView();
         vg.removeView(this);
         textureViewContainer.removeView(textureView);
-        CONTAINER_LIST.getLast().removeAllViews();
-        CONTAINER_LIST.getLast().addView(this, new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        CONTAINER_LIST.getLast().removeViewAt(blockIndex);//remove block
+        CONTAINER_LIST.getLast().addView(this, blockIndex, blockLayoutParams);
         CONTAINER_LIST.pop();
-
         setScreenNormal();
         JZUtils.showStatusBar(jzvdContext);
         JZUtils.setRequestedOrientation(jzvdContext, NORMAL_ORIENTATION);