pull/149/head
FongMi 3 years ago
parent 646839fece
commit eb299cf825
  1. 18
      app/src/main/java/com/fongmi/android/tv/bean/Episode.java
  2. 1
      app/src/main/res/color/text.xml
  3. 5
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  4. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java
  5. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/holder/EpisodeGridHolder.java
  6. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/holder/EpisodeHoriHolder.java

@ -19,6 +19,7 @@ public class Episode implements Parcelable {
private int number;
private boolean activated;
private boolean selected;
public static Episode create(String name, String url) {
return new Episode(name, "", url);
@ -66,12 +67,21 @@ public class Episode implements Parcelable {
return activated;
}
public void setActivated(boolean activated) {
this.activated = activated;
this.selected = activated;
}
public void deactivated() {
this.activated = false;
setActivated(false);
}
public void setActivated(boolean activated) {
this.activated = activated;
public boolean isSelected() {
return selected;
}
public void setSelected(boolean selected) {
this.selected = selected;
}
public boolean rule1(String name) {
@ -114,6 +124,7 @@ public class Episode implements Parcelable {
dest.writeString(this.url);
dest.writeInt(this.number);
dest.writeByte(this.activated ? (byte) 1 : (byte) 0);
dest.writeByte(this.selected ? (byte) 1 : (byte) 0);
}
protected Episode(Parcel in) {
@ -122,6 +133,7 @@ public class Episode implements Parcelable {
this.url = in.readString();
this.number = in.readInt();
this.activated = in.readByte() != 0;
this.selected = in.readByte() != 0;
}
public static final Creator<Episode> CREATOR = new Creator<>() {

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/yellow_500" android:state_activated="true" />
<item android:color="@color/yellow_500" android:state_selected="true" />
<item android:color="@color/yellow_500" android:state_checked="true" />
<item android:color="@color/white" />
</selector>

@ -593,9 +593,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
setQualityVisible(episode != null && episode.isActivated() && mQualityAdapter.getItemCount() > 1);
if (episode == null || episode.isActivated()) return;
if (Setting.getFlag() == 1) {
episode.setActivated(true);
mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition());
episode.setActivated(false);
episode.setSelected(true);
mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition(episode));
} else {
mHistory.setVodRemarks(episode.getName());
onItemClick(episode);

@ -51,6 +51,10 @@ public class EpisodeAdapter extends RecyclerView.Adapter<BaseEpisodeHolder> {
return 0;
}
public int getPosition(Episode item) {
return mItems.indexOf(item);
}
public Episode getActivated() {
return mItems.get(getPosition());
}

@ -20,7 +20,7 @@ public class EpisodeGridHolder extends BaseEpisodeHolder {
@Override
public void initView(Episode item) {
binding.text.setSelected(item.isActivated());
binding.text.setSelected(item.isSelected());
binding.text.setActivated(item.isActivated());
binding.text.setText(item.getDesc().concat(item.getName()));
binding.text.setOnClickListener(v -> listener.onItemClick(item));

@ -22,7 +22,7 @@ public class EpisodeHoriHolder extends BaseEpisodeHolder {
@Override
public void initView(Episode item) {
binding.text.setMaxEms(Product.getEms());
binding.text.setSelected(item.isActivated());
binding.text.setSelected(item.isSelected());
binding.text.setActivated(item.isActivated());
binding.text.setText(item.getDesc().concat(item.getName()));
binding.text.setOnClickListener(v -> listener.onItemClick(item));

Loading…
Cancel
Save