修正小窗播放时标题溢出

main
于俊 12 months ago
parent fd98eb3489
commit 791c47baa0
  1. 1
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  2. 1
      app/src/main/java/com/github/tvbox/osc/ui/adapter/HomeHotVodAdapter.java
  3. 13
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  4. 2
      app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java
  5. 1
      app/src/main/res/layout/player_vod_control_view.xml

@ -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();
}

@ -44,7 +44,6 @@ public class HomeHotVodAdapter extends BaseQuickAdapter<Movie.Video, BaseViewHol
@Override
protected void convert(BaseViewHolder helper, Movie.Video item) {
// takagen99: Add Delete Mode
FrameLayout tvDel = helper.getView(R.id.delFrameLayout);
if (HawkConfig.hotVodDelete) {
tvDel.setVisibility(View.VISIBLE);

@ -965,6 +965,19 @@ public class PlayFragment extends BaseLazyFragment {
loadFoundVideoUrlsHeader = new HashMap<String, HashMap<String, String>>();
}
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);

@ -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);

@ -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"

Loading…
Cancel
Save