pull/28/head
21561 3 years ago
parent a37da86a8a
commit e0f3cccb8a
  1. 14
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  2. 6
      app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java

@ -155,7 +155,6 @@ public class DetailActivity extends BaseActivity {
getSupportFragmentManager().beginTransaction().show(playFragment).commitAllowingStateLoss();
tvPlay.setText("全屏");
}
tvPlay.requestFocus();
tvSort.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -273,20 +272,21 @@ public class DetailActivity extends BaseActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
FastClickCheckUtil.check(view);
if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) {
boolean reload = false;
// boolean reload = false;
if (vodInfo.playIndex != position) {
seriesAdapter.getData().get(vodInfo.playIndex).selected = false;
seriesAdapter.notifyItemChanged(vodInfo.playIndex);
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);
//选集全屏 想选集不全屏的注释下面一行
if (showPreview && !fullWindows) toggleFullPreview();
if (reload || !showPreview) jumpToPlay();
// if (!showPreview || reload) jumpToPlay();
jumpToPlay();
}
}
});
@ -679,7 +679,7 @@ public class DetailActivity extends BaseActivity {
}
// preview
boolean showPreview = Hawk.get(HawkConfig.SHOW_PREVIEW, true);; // true 开启 false 关闭
boolean showPreview = Hawk.get(HawkConfig.SHOW_PREVIEW, false);; // true 开启 false 关闭
boolean fullWindows = false;
ViewGroup.LayoutParams windowsPreview = null;
ViewGroup.LayoutParams windowsFull = null;
@ -704,8 +704,7 @@ public class DetailActivity extends BaseActivity {
llLayoutParent = (ViewGroup) llLayout.getParent();
fullWindows = !fullWindows;
// llPlayerFragmentContainer.setLayoutParams(fullWindows ? windowsFull : windowsPreview);
llPlayerFragmentContainerBlock.setVisibility(fullWindows ? View.GONE : View.VISIBLE);
// llPlayerFragmentContainer.setLayoutParams(fullWindows ? windowsFull : windowsPreview);
if (fullWindows) {
playerParent.removeView(playerRoot);
((ViewGroup) getWindow().getDecorView()).addView(playerRoot);
@ -715,5 +714,6 @@ public class DetailActivity extends BaseActivity {
playerParent.addView(playerRoot);
llLayoutParent.addView(llLayout);
}
llPlayerFragmentContainerBlock.setVisibility(fullWindows ? View.GONE : View.VISIBLE);
}
}

@ -76,7 +76,7 @@ public class ModelSettingFragment extends BaseLazyFragment {
@Override
protected void init() {
tvShowPreviewText = findViewById(R.id.showPreviewText);
tvShowPreviewText.setText(Hawk.get(HawkConfig.SHOW_PREVIEW, true) ? "开启" : "关闭");
tvShowPreviewText.setText(Hawk.get(HawkConfig.SHOW_PREVIEW, false) ? "开启" : "关闭");
tvDebugOpen = findViewById(R.id.tvDebugOpen);
tvParseWebView = findViewById(R.id.tvParseWebView);
tvMediaCodec = findViewById(R.id.tvMediaCodec);
@ -506,8 +506,8 @@ public class ModelSettingFragment extends BaseLazyFragment {
@Override
public void onClick(View v) {
FastClickCheckUtil.check(v);
Hawk.put(HawkConfig.SHOW_PREVIEW, !Hawk.get(HawkConfig.SHOW_PREVIEW, true));
tvShowPreviewText.setText(Hawk.get(HawkConfig.SHOW_PREVIEW, true) ? "开启" : "关闭");
Hawk.put(HawkConfig.SHOW_PREVIEW, !Hawk.get(HawkConfig.SHOW_PREVIEW, false));
tvShowPreviewText.setText(Hawk.get(HawkConfig.SHOW_PREVIEW, true) ? "开启" : "关闭");
}
});
}

Loading…
Cancel
Save