pull/594/head
jhengazuki 3 months ago
parent 691b28848d
commit b8282a462a
  1. 6
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java
  2. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/FolderFragment.java
  3. 12
      app/src/leanback/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java
  4. 0
      app/src/leanback/res/layout/fragment_type.xml

@ -18,7 +18,7 @@ import com.fongmi.android.tv.R;
import com.fongmi.android.tv.bean.Collect; import com.fongmi.android.tv.bean.Collect;
import com.fongmi.android.tv.bean.Result; import com.fongmi.android.tv.bean.Result;
import com.fongmi.android.tv.bean.Vod; import com.fongmi.android.tv.bean.Vod;
import com.fongmi.android.tv.databinding.FragmentVodBinding; import com.fongmi.android.tv.databinding.FragmentTypeBinding;
import com.fongmi.android.tv.model.SiteViewModel; import com.fongmi.android.tv.model.SiteViewModel;
import com.fongmi.android.tv.ui.activity.VideoActivity; import com.fongmi.android.tv.ui.activity.VideoActivity;
import com.fongmi.android.tv.ui.activity.VodActivity; import com.fongmi.android.tv.ui.activity.VodActivity;
@ -35,7 +35,7 @@ import java.util.List;
public class CollectFragment extends BaseFragment implements CustomScroller.Callback, VodPresenter.OnClickListener { public class CollectFragment extends BaseFragment implements CustomScroller.Callback, VodPresenter.OnClickListener {
private FragmentVodBinding mBinding; private FragmentTypeBinding mBinding;
private ArrayObjectAdapter mAdapter; private ArrayObjectAdapter mAdapter;
private ArrayObjectAdapter mLast; private ArrayObjectAdapter mLast;
private CustomScroller mScroller; private CustomScroller mScroller;
@ -62,7 +62,7 @@ public class CollectFragment extends BaseFragment implements CustomScroller.Call
@Override @Override
protected ViewBinding getBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup container) { protected ViewBinding getBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup container) {
return mBinding = FragmentVodBinding.inflate(inflater, container, false); return mBinding = FragmentTypeBinding.inflate(inflater, container, false);
} }
@Override @Override

@ -55,8 +55,8 @@ public class FolderFragment extends BaseFragment {
return (HashMap<String, String>) getArguments().getSerializable("extend"); return (HashMap<String, String>) getArguments().getSerializable("extend");
} }
private VodFragment getChild() { private TypeFragment getChild() {
return (VodFragment) getChildFragmentManager().findFragmentById(R.id.container); return (TypeFragment) getChildFragmentManager().findFragmentById(R.id.container);
} }
private VodActivity getParent() { private VodActivity getParent() {
@ -70,12 +70,12 @@ public class FolderFragment extends BaseFragment {
@Override @Override
protected void initView() { protected void initView() {
getChildFragmentManager().beginTransaction().replace(R.id.container, VodFragment.newInstance(getKey(), getTypeId(), getStyle(), getExtend(), getFolder())).commit(); getChildFragmentManager().beginTransaction().replace(R.id.container, TypeFragment.newInstance(getKey(), getTypeId(), getStyle(), getExtend(), getFolder())).commit();
} }
public void openFolder(String typeId, HashMap<String, String> extend) { public void openFolder(String typeId, HashMap<String, String> extend) {
Prefers.put("filter_" + getKey() + "_" + typeId, Prefers.getString("filter_" + getKey() + "_" + getTypeId())); Prefers.put("filter_" + getKey() + "_" + typeId, Prefers.getString("filter_" + getKey() + "_" + getTypeId()));
VodFragment next = VodFragment.newInstance(getKey(), typeId, getStyle(), extend, getFolder()); TypeFragment next = TypeFragment.newInstance(getKey(), typeId, getStyle(), extend, getFolder());
FragmentTransaction ft = getChildFragmentManager().beginTransaction(); FragmentTransaction ft = getChildFragmentManager().beginTransaction();
Optional.ofNullable(getParent()).ifPresent(VodActivity::closeFilter); Optional.ofNullable(getParent()).ifPresent(VodActivity::closeFilter);
Optional.ofNullable(getChild()).ifPresent(ft::hide); Optional.ofNullable(getChild()).ifPresent(ft::hide);
@ -89,7 +89,7 @@ public class FolderFragment extends BaseFragment {
} }
public void onRefresh() { public void onRefresh() {
Optional.ofNullable(getChild()).ifPresent(VodFragment::onRefresh); Optional.ofNullable(getChild()).ifPresent(TypeFragment::onRefresh);
} }
public boolean canBack() { public boolean canBack() {

@ -25,7 +25,7 @@ import com.fongmi.android.tv.bean.Site;
import com.fongmi.android.tv.bean.Style; import com.fongmi.android.tv.bean.Style;
import com.fongmi.android.tv.bean.Value; import com.fongmi.android.tv.bean.Value;
import com.fongmi.android.tv.bean.Vod; import com.fongmi.android.tv.bean.Vod;
import com.fongmi.android.tv.databinding.FragmentVodBinding; import com.fongmi.android.tv.databinding.FragmentTypeBinding;
import com.fongmi.android.tv.model.SiteViewModel; import com.fongmi.android.tv.model.SiteViewModel;
import com.fongmi.android.tv.ui.activity.CollectActivity; import com.fongmi.android.tv.ui.activity.CollectActivity;
import com.fongmi.android.tv.ui.activity.VideoActivity; import com.fongmi.android.tv.ui.activity.VideoActivity;
@ -44,10 +44,10 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
public class VodFragment extends BaseFragment implements CustomScroller.Callback, VodPresenter.OnClickListener { public class TypeFragment extends BaseFragment implements CustomScroller.Callback, VodPresenter.OnClickListener {
private HashMap<String, String> mExtends; private HashMap<String, String> mExtends;
private FragmentVodBinding mBinding; private FragmentTypeBinding mBinding;
private ArrayObjectAdapter mAdapter; private ArrayObjectAdapter mAdapter;
private ArrayObjectAdapter mLast; private ArrayObjectAdapter mLast;
private CustomScroller mScroller; private CustomScroller mScroller;
@ -56,14 +56,14 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
private boolean headerVisible; private boolean headerVisible;
private boolean filterVisible; private boolean filterVisible;
public static VodFragment newInstance(String key, String typeId, Style style, HashMap<String, String> extend, boolean folder) { public static TypeFragment newInstance(String key, String typeId, Style style, HashMap<String, String> extend, boolean folder) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("key", key); args.putString("key", key);
args.putString("typeId", typeId); args.putString("typeId", typeId);
args.putBoolean("folder", folder); args.putBoolean("folder", folder);
args.putParcelable("style", style); args.putParcelable("style", style);
args.putSerializable("extend", extend); args.putSerializable("extend", extend);
VodFragment fragment = new VodFragment(); TypeFragment fragment = new TypeFragment();
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
@ -102,7 +102,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
@Override @Override
protected ViewBinding getBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup container) { protected ViewBinding getBinding(@NonNull LayoutInflater inflater, @Nullable ViewGroup container) {
return mBinding = FragmentVodBinding.inflate(inflater, container, false); return mBinding = FragmentTypeBinding.inflate(inflater, container, false);
} }
@Override @Override
Loading…
Cancel
Save