hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add site name

Browse Source
pull/594/head
jhengazuki 7 months ago
parent 94e126b450
commit ef3f6ac51b
3 changed files with 48 additions and 69 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. 4
      app/src/main/res/drawable/ic_img_error.xml
  2. 74
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
  3. 39
      app/src/mobile/res/layout/fragment_vod.xml

4
app/src/main/res/drawable/ic_img_error.xml
Unescape View File

@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="48dp"
android:height="48dp"
android:tint="@color/white"
android:viewportWidth="960"
android:viewportHeight="960">

74
app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
Unescape View File

@ -23,10 +23,9 @@ import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.R;
import com.fongmi.android.tv.Setting;
import com.fongmi.android.tv.api.config.VodConfig;
import com.fongmi.android.tv.bean.Class;
import com.fongmi.android.tv.bean.Hot;
import com.fongmi.android.tv.bean.Config;
import com.fongmi.android.tv.bean.Result;
import com.fongmi.android.tv.bean.Site;
import com.fongmi.android.tv.bean.Value;
@ -35,6 +34,7 @@ import com.fongmi.android.tv.event.CastEvent;
import com.fongmi.android.tv.event.RefreshEvent;
import com.fongmi.android.tv.event.StateEvent;
import com.fongmi.android.tv.impl.Callback;
import com.fongmi.android.tv.impl.ConfigCallback;
import com.fongmi.android.tv.impl.FilterCallback;
import com.fongmi.android.tv.impl.SiteCallback;
import com.fongmi.android.tv.model.SiteViewModel;
@ -45,36 +45,27 @@ import com.fongmi.android.tv.ui.activity.VideoActivity;
import com.fongmi.android.tv.ui.adapter.TypeAdapter;
import com.fongmi.android.tv.ui.base.BaseFragment;
import com.fongmi.android.tv.ui.dialog.FilterDialog;
import com.fongmi.android.tv.ui.dialog.HistoryDialog;
import com.fongmi.android.tv.ui.dialog.LinkDialog;
import com.fongmi.android.tv.ui.dialog.ReceiveDialog;
import com.fongmi.android.tv.ui.dialog.SiteDialog;
import com.fongmi.android.tv.utils.FileChooser;
import com.fongmi.android.tv.utils.Notify;
import com.fongmi.android.tv.utils.ResUtil;
import com.fongmi.android.tv.utils.UrlUtil;
import com.github.catvod.net.OkHttp;
import com.google.common.net.HttpHeaders;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import okhttp3.Call;
import okhttp3.Headers;
import okhttp3.Response;
public class VodFragment extends BaseFragment implements SiteCallback, FilterCallback, TypeAdapter.OnClickListener {
public class VodFragment extends BaseFragment implements ConfigCallback, SiteCallback, FilterCallback, TypeAdapter.OnClickListener {
private FragmentVodBinding mBinding;
private SiteViewModel mViewModel;
private TypeAdapter mAdapter;
private Runnable mRunnable;
private List<String> mHots;
private Result mResult;
public static VodFragment newInstance() {
@ -101,14 +92,12 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
setViewModel();
showProgress();
setLogo();
initHot();
getHot();
}
@Override
protected void initEvent() {
mBinding.hot.setOnClickListener(this::onHot);
mBinding.top.setOnClickListener(this::onTop);
mBinding.site.setOnClickListener(this::onSite);
mBinding.link.setOnClickListener(this::onLink);
mBinding.logo.setOnClickListener(this::onLogo);
mBinding.keep.setOnClickListener(this::onKeep);
@ -139,26 +128,6 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
mViewModel.result.observe(getViewLifecycleOwner(), result -> setAdapter(mResult = result));
}
private void initHot() {
mHots = Hot.get(Setting.getHot());
App.post(mRunnable = this::updateHot, 0);
}
private void getHot() {
OkHttp.newCall("https://api.web.360kan.com/v1/rank?cat=1", Headers.of(HttpHeaders.REFERER, "https://www.360kan.com/rank/general")).enqueue(new Callback() {
@Override
public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
mHots = Hot.get(response.body().string());
}
});
}
private void updateHot() {
App.post(mRunnable, TimeUnit.SECONDS.toMillis(10));
if (mHots.isEmpty() || mHots.size() < 10) return;
mBinding.hot.setText(mHots.get(new Random().nextInt(11)));
}
private Result handle(Result result) {
List<Class> types = new ArrayList<>();
for (Class type : result.getTypes()) if (result.getFilters().containsKey(type.getTypeId())) type.setFilters(result.getFilters().get(type.getTypeId()));
@ -208,6 +177,10 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
}
private void onLogo(View view) {
HistoryDialog.create(this).type(0).show();
}
private void onSite(View view) {
SiteDialog.create(this).change().show();
}
@ -223,12 +196,8 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
if (mAdapter.getItemCount() > 0) FilterDialog.create().filter(mAdapter.get(mBinding.pager.getCurrentItem()).getFilters()).show(this);
}
private void onHot(View view) {
CollectActivity.start(getActivity());
}
private void onSearch(View view) {
CollectActivity.start(getActivity(), mBinding.hot.getText().toString());
CollectActivity.start(getActivity());
}
private void onHistory(View view) {
@ -249,6 +218,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
setFabVisible(0);
mAdapter.clear();
mViewModel.homeContent();
mBinding.site.setText(getSite().getName());
mBinding.pager.setAdapter(new PageAdapter(getChildFragmentManager()));
}
@ -308,6 +278,25 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
ReceiveDialog.create().event(event).show(this);
}
@Override
public void setConfig(Config config) {
Notify.progress(getActivity());
VodConfig.load(config, new Callback() {
@Override
public void success() {
RefreshEvent.config();
RefreshEvent.video();
Notify.dismiss();
}
@Override
public void error(String msg) {
Notify.show(msg);
Notify.dismiss();
}
});
}
@Override
public void setSite(Site item) {
VodConfig.get().setHome(item);
@ -342,7 +331,6 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
@Override
public void onDestroyView() {
super.onDestroyView();
App.removeCallbacks(mRunnable);
EventBus.getDefault().unregister(this);
}

39
app/src/mobile/res/layout/fragment_vod.xml
Unescape View File

@ -31,35 +31,26 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_logo" />
<LinearLayout
<TextView
android:id="@+id/site"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:background="@drawable/selector_item_round"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/hot"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="14sp"
tools:ignore="NestedWeights"
tools:text="狂飆" />
<ImageView
android:id="@+id/search"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_action_search" />
</LinearLayout>
android:singleLine="true"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:text="量子" />
<ImageView
android:id="@+id/search"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_action_search" />
<ImageView
android:id="@+id/keep"

Write Preview
Loading…
Cancel
Save