diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java index 5921ccb4..5b7753f5 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java @@ -1057,6 +1057,7 @@ public class DetailActivity extends BaseActivity { mGridView.setVisibility(fullWindows ? View.GONE : View.VISIBLE); mGridViewFlag.setVisibility(fullWindows ? View.GONE : View.VISIBLE); tvSeriesGroup.setVisibility(fullWindows ? View.GONE : View.VISIBLE); + playFragment.setPlayTitle(fullWindows); toggleSubtitleTextSize(); } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java index 3641e685..8d6d6b4a 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java @@ -44,7 +44,6 @@ public class HomeHotVodAdapter extends BaseQuickAdapter>(); } + public void setPlayTitle(boolean show) + { + if(show){ + String playTitleInfo= ""; + if(mVodInfo!=null){ + playTitleInfo = mVodInfo.name + " " + mVodInfo.seriesMap.get(mVodInfo.playFlag).get(mVodInfo.playIndex).name; + } + mController.setTitle(playTitleInfo); + }else { + mController.setTitle(""); + } + } + public void play(boolean reset) { if(mVodInfo==null)return; VodInfo.VodSeries vs = mVodInfo.seriesMap.get(mVodInfo.playFlag).get(mVodInfo.playIndex); diff --git a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java index bf3f63cf..46b3c6b4 100644 --- a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java +++ b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java @@ -140,7 +140,7 @@ public class SourceViewModel extends ViewModel { }); String sortJson = null; try { - sortJson = future.get(15, TimeUnit.SECONDS); + sortJson = future.get(20, TimeUnit.SECONDS); } catch (TimeoutException e) { e.printStackTrace(); future.cancel(true); diff --git a/app/src/main/res/layout/player_vod_control_view.xml b/app/src/main/res/layout/player_vod_control_view.xml index 7079f66a..c4ecff21 100644 --- a/app/src/main/res/layout/player_vod_control_view.xml +++ b/app/src/main/res/layout/player_vod_control_view.xml @@ -30,7 +30,6 @@ android:layout_gravity="left" android:ellipsize="end" android:singleLine="true" - android:width="680dp" android:paddingTop="@dimen/vs_5" android:paddingLeft="@dimen/vs_10" android:text="@string/http"