release
FongMi 2 months ago
parent aadbe2652a
commit 2ca26f5a4b
  1. 6
      app/src/leanback/java/com/fongmi/android/tv/bean/Cache.java
  2. 5
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/FolderFragment.java
  3. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
  4. 13
      app/src/main/java/com/fongmi/android/tv/bean/Filter.java
  5. 6
      app/src/main/java/com/fongmi/android/tv/bean/Value.java

@ -35,6 +35,12 @@ public class Cache {
return filters == null ? Collections.emptyList() : filters;
}
public static List<Filter> copy(String typeId) {
List<Filter> filters = get().cache.get(typeId);
if (filters == null) return Collections.emptyList();
return filters.stream().map(Filter::copy).toList();
}
public static Cache clear() {
get().cache.clear();
return get();

@ -18,7 +18,6 @@ import com.fongmi.android.tv.ui.activity.VodActivity;
import com.fongmi.android.tv.ui.base.BaseFragment;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
public class FolderFragment extends BaseFragment {
@ -63,10 +62,8 @@ public class FolderFragment extends BaseFragment {
}
private HashMap<String, String> getExtend() {
List<Filter> cache = Cache.get(mType);
HashMap<String, String> extend = new HashMap<>();
for (Filter filter : cache) filter.getValue().forEach(value -> value.setActivated(false));
for (Filter filter : cache) if (filter.getInit() != null) extend.put(filter.getKey(), filter.getInit());
for (Filter filter : Cache.get(mType)) if (filter.getInit() != null) extend.put(filter.getKey(), filter.getInit());
return extend;
}

@ -90,7 +90,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
}
private List<Filter> getFilter() {
return Cache.get(getTypeId());
return Cache.copy(getTypeId());
}
private Site getSite() {

@ -38,6 +38,9 @@ public class Filter implements Parcelable {
return items == null ? Collections.emptyList() : items;
}
public Filter() {
}
public String getKey() {
return key;
}
@ -64,6 +67,16 @@ public class Filter implements Parcelable {
return this;
}
public Filter copy() {
Filter copy = new Filter();
copy.key = this.key;
copy.name = this.name;
copy.init = this.init;
copy.value = new ArrayList<>();
getValue().forEach(item -> copy.value.add(item.copy()));
return copy;
}
public Filter trans() {
if (Trans.pass()) return this;
getValue().forEach(Value::trans);

@ -64,6 +64,12 @@ public class Value implements Parcelable, Diffable<Value> {
else activated = equal;
}
public Value copy() {
Value copy = new Value(n, v);
copy.activated = this.activated;
return copy;
}
public Value trans() {
this.n = Trans.s2t(n);
return this;

Loading…
Cancel
Save