hg
/
JY-TVBoxOS
mirror of https://github.com/q215613905/TVBoxOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fixed

Browse Source
pull/28/head
21561 3 years ago
parent a37da86a8a
commit e0f3cccb8a
2 changed files with 10 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      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

12
app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
Unescape View File

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

6
app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save