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

修正集数分组倒叙问题;修正集数分组偶发性滚动不到位的问题

Browse Source
pull/73/head
21561 3 years ago
parent ecb3f6d532
commit 3da3ebec20
1 changed files with 38 additions and 24 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. 62
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java

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

@ -135,7 +135,7 @@ public class DetailActivity extends BaseActivity {
private HashMap<String, String> mCheckSources = null;
private final ArrayList<String> seriesGroupOptions = new ArrayList<>();
private View currentSeriesGroupView;
private int GroupCount = 24 ;
private int GroupCount;
@Override
protected int getLayoutResID() {
@ -176,8 +176,9 @@ public class DetailActivity extends BaseActivity {
mGridView = findViewById(R.id.mGridView);
mGridView.setHasFixedSize(true);
mGridView.setHasFixedSize(false);
this.mGridViewLayoutMgr = new V7GridLayoutManager(this.mContext, isBaseOnWidth() ? 6 : 7);
this.mGridViewLayoutMgr = new V7GridLayoutManager(this.mContext, 6);
mGridView.setLayoutManager(this.mGridViewLayoutMgr);
// mGridView.setLayoutManager(new V7LinearLayoutManager(this.mContext, 0, false));
seriesAdapter = new SeriesAdapter();
mGridView.setAdapter(seriesAdapter);
mGridViewFlag = findViewById(R.id.mGridViewFlag);
@ -223,7 +224,7 @@ public class DetailActivity extends BaseActivity {
vodInfo.playIndex=(vodInfo.seriesMap.get(vodInfo.playFlag).size()-1)-vodInfo.playIndex;
// insertVod(sourceKey, vodInfo);
firstReverse = true;
Collections.reverse(seriesGroupOptions);
setSeriesGroupOptions();
seriesAdapter.notifyDataSetChanged();
}
}
@ -397,7 +398,7 @@ public class DetailActivity extends BaseActivity {
public void onItemPreSelected(TvRecyclerView parent, View itemView, int position) {
TextView txtView = itemView.findViewById(R.id.tvSeriesGroup);
txtView.setTextColor(Color.WHITE);
currentSeriesGroupView = null;
// currentSeriesGroupView = null;
}
@Override
@ -405,8 +406,8 @@ public class DetailActivity extends BaseActivity {
TextView txtView = itemView.findViewById(R.id.tvSeriesGroup);
txtView.setTextColor(mContext.getResources().getColor(R.color.color_02F8E1));
if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) {
int targetPos = position * GroupCount;
mGridView.scrollToPosition(targetPos);
int targetPos = position * GroupCount+1;
mGridView.smoothScrollToPosition(targetPos);
}
currentSeriesGroupView = itemView;
currentSeriesGroupView.isSelected();
@ -419,15 +420,16 @@ public class DetailActivity extends BaseActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
FastClickCheckUtil.check(view);
if(currentSeriesGroupView != null) {
TextView txtView = currentSeriesGroupView.findViewById(R.id.tvSeriesGroup);
txtView.setTextColor(Color.WHITE);
}
TextView newTxtView = view.findViewById(R.id.tvSeriesGroup);
newTxtView.setTextColor(mContext.getResources().getColor(R.color.color_02F8E1));
if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) {
int targetPos = position * GroupCount;
mGridView.scrollToPosition(targetPos);
int targetPos = position * GroupCount+1;
// mGridView.scrollToPosition(targetPos);
mGridView.smoothScrollToPosition(targetPos);
}
if(currentSeriesGroupView != null) {
TextView txtView = currentSeriesGroupView.findViewById(R.id.tvSeriesGroup);
txtView.setTextColor(Color.WHITE);
}
currentSeriesGroupView = view;
currentSeriesGroupView.isSelected();
@ -522,38 +524,50 @@ public class DetailActivity extends BaseActivity {
mGridViewLayoutMgr.setSpanCount(offset);
seriesAdapter.setNewData(vodInfo.seriesMap.get(vodInfo.playFlag));
setSeriesGroupOptions();
mGridView.postDelayed(new Runnable() {
@Override
public void run() {
mGridView.smoothScrollToPosition(vodInfo.playIndex);
}
}, 100);
}
@SuppressLint("NotifyDataSetChanged")
private void setSeriesGroupOptions(){
List<VodInfo.VodSeries> list = vodInfo.seriesMap.get(vodInfo.playFlag);
int listSize = list.size();
int offset = mGridViewLayoutMgr.getSpanCount();
seriesGroupOptions.clear();
if(listSize>100 && listSize<=400)GroupCount=50;
if(listSize>400)GroupCount=200;
GroupCount=(offset==3 || offset==6)?30:20;
if(listSize>100 && listSize<=400)GroupCount=60;
if(listSize>400)GroupCount=120;
if(listSize > GroupCount) {
mSeriesGroupView.setVisibility(View.VISIBLE);
int remainedOptionSize = listSize % GroupCount;
int optionSize = listSize / GroupCount;
for(int i = 0; i < optionSize; i++) {
if(vodInfo.reverseSort)
seriesGroupOptions.add(String.format("%d - %d", i * GroupCount + GroupCount, i * GroupCount + 1));
// seriesGroupOptions.add(String.format("%d - %d", i * GroupCount + GroupCount, i * GroupCount + 1));
seriesGroupOptions.add(String.format("%d - %d", listSize - (i * GroupCount + 1)+1, listSize - (i * GroupCount + GroupCount)+1));
else
seriesGroupOptions.add(String.format("%d - %d", i * GroupCount + 1, i * GroupCount + GroupCount));
}
if(remainedOptionSize > 0) {
if(vodInfo.reverseSort)
seriesGroupOptions.add(String.format("%d - %d", optionSize * GroupCount + remainedOptionSize, optionSize * GroupCount + 1));
// seriesGroupOptions.add(String.format("%d - %d", optionSize * GroupCount + remainedOptionSize, optionSize * GroupCount + 1));
seriesGroupOptions.add(String.format("%d - %d", listSize - (optionSize * GroupCount + 1)+1, listSize - (optionSize * GroupCount + remainedOptionSize)+1));
else
seriesGroupOptions.add(String.format("%d - %d", optionSize * GroupCount + 1, optionSize * GroupCount + remainedOptionSize));
}
if(vodInfo.reverseSort) Collections.reverse(seriesGroupOptions);
// if(vodInfo.reverseSort) Collections.reverse(seriesGroupOptions);
seriesGroupAdapter.notifyDataSetChanged();
}else {
mSeriesGroupView.setVisibility(View.GONE);
}
mGridView.postDelayed(new Runnable() {
@Override
public void run() {
mGridView.smoothScrollToPosition(vodInfo.playIndex);
}
}, 100);
}
private void setTextShow(TextView view, String tag, String info) {

Write Preview
Loading…
Cancel
Save