1修复播放偶现APP闪退;2解决TV端详情页小窗预览顶到屏幕顶部边缘;3修正上一版当前集和全屏功能一致造成的换源不生效的BUG;

.idea/misc.xml

@@ -7,6 +7,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/21561/Desktop/TVBOX/TVBoxOS/app/src/main/res/layout/activity_detail.xml" value="0.16893115942028986" />
         <entry key="..\:/android/repository/TVBoxOSC/app/src/main/res/layout/activity_live_play.xml" value="0.1" />
         <entry key="..\:/android/repository/TVBoxOSC/app/src/main/res/layout/item_channel_group_layout.xml" value="0.22826086956521738" />
         <entry key="..\:/android/repository/TVBoxOSC/app/src/main/res/layout/item_live_channel_layout.xml" value="0.22826086956521738" />

app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java

@@ -232,7 +232,6 @@ public class DetailActivity extends BaseActivity {
 
             @Override
             public void onItemClick(TvRecyclerView parent, View itemView, int position) {
-
             }
         });
         mGridViewFlag.setOnItemListener(new TvRecyclerView.OnItemListener() {
@@ -283,10 +282,15 @@ public class DetailActivity extends BaseActivity {
                         seriesAdapter.getData().get(position).selected = true;
                         seriesAdapter.notifyItemChanged(position);
                         vodInfo.playIndex = position;
-                        reload=true;
+                        reload = true;
                     }
-                    seriesAdapter.getData().get(vodInfo.playIndex).selected = true;
-                    seriesAdapter.notifyItemChanged(vodInfo.playIndex);
+                    //解决当前集不刷新的BUG
+                    if(!vodInfo.playFlag.equals(preFlag)) {
+                        reload = true;
+                    }
+
+//                    seriesAdapter.getData().get(vodInfo.playIndex).selected = true;
+//                    seriesAdapter.notifyItemChanged(vodInfo.playIndex);
                     //选集全屏 想选集不全屏的注释下面一行
                     if (showPreview && !fullWindows) toggleFullPreview();
                     if (!showPreview || reload) jumpToPlay();
@@ -298,8 +302,10 @@ public class DetailActivity extends BaseActivity {
 
     private List<Runnable> pauseRunnable = null;
 
+    private String preFlag="";
     private void jumpToPlay() {
         if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) {
+            preFlag = vodInfo.playFlag;
             Bundle bundle = new Bundle();
             //保存历史
             insertVod(sourceKey, vodInfo);
@@ -717,7 +723,7 @@ public class DetailActivity extends BaseActivity {
 //            playerParent.addView(playerRoot);
 //            llLayoutParent.addView(llLayout);
 //        }
-        llPlayerFragmentContainerBlock.setVisibility(fullWindows ? View.GONE : View.VISIBLE);
         llPlayerFragmentContainer.setLayoutParams(fullWindows ? windowsFull : windowsPreview);
+        llPlayerFragmentContainerBlock.setVisibility(fullWindows ? View.GONE : View.VISIBLE);
     }
 }

app/src/main/res/layout/activity_detail.xml

@@ -268,19 +268,21 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/previewPlayer"
-        android:layout_width="@dimen/vs_480"
-        android:layout_height="@dimen/vs_320"
+        android:layout_width="@dimen/vs_470"
+        android:layout_height="@dimen/vs_300"
         android:layout_marginStart="@dimen/vs_50"
         android:layout_marginLeft="@dimen/vs_50"
-        android:layout_marginTop="@dimen/vs_10"
+        android:layout_marginTop="@dimen/vs_20"
+        android:layout_marginBottom="@dimen/vs_10"
         android:visibility="gone" />
 
     <View
         android:id="@+id/previewPlayerBlock"
-        android:layout_width="@dimen/vs_480"
-        android:layout_height="@dimen/vs_320"
+        android:layout_width="@dimen/vs_470"
+        android:layout_height="@dimen/vs_300"
         android:layout_marginStart="@dimen/vs_50"
         android:layout_marginLeft="@dimen/vs_50"
-        android:layout_marginTop="@dimen/vs_10"
+        android:layout_marginTop="@dimen/vs_20"
+        android:layout_marginBottom="@dimen/vs_10"
         android:visibility="gone" />
 </FrameLayout>