pull/321/head
okjack 2 years ago
parent e21f124252
commit eda3e34a3c
  1. 3
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java
  2. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  3. 3
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  4. 3
      app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java
  5. 1
      app/src/main/res/values-zh-rCN/strings.xml
  6. 1
      app/src/main/res/values-zh-rTW/strings.xml
  7. 1
      app/src/main/res/values/strings.xml
  8. 3
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java

@ -6,6 +6,7 @@ import android.view.View;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.viewbinding.ViewBinding;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.Product;
import com.fongmi.android.tv.bean.History;
import com.fongmi.android.tv.databinding.ActivityHistoryBinding;
@ -54,7 +55,7 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl
private void getHistory() {
mAdapter.addAll(History.get());
mBinding.delete.setVisibility(mAdapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
mBinding.recycler.requestFocus();
App.post(() -> mBinding.recycler.requestFocus(), 300);
}
private void onDelete(View view) {

@ -401,8 +401,10 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@Override
public void onRefresh() {
Notify.progress(this);
FileUtil.clearCache(null);
initConfig();
App.post(() -> Notify.show(ResUtil.getString(R.string.config_refreshed)), 2000);
}
@Override

@ -397,8 +397,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
int itemCount = getEpisodeView().getAdapter().getItemCount();
if (itemCount <= 0) return;
int columns = mEpisodePresenter.getNumColumns();
int numRows = mEpisodePresenter.getNumRows();
if (((int)Math.ceil((position + 1)/columns) + 1 == numRows) && (position + columns >= itemCount)) {
if ((position + columns >= itemCount) && ((position % columns) + 1 > (itemCount % columns))) {
child.itemView.setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {

@ -116,8 +116,7 @@ public class EpisodeDialog extends BaseDialog implements ArrayPresenter.OnClickL
int itemCount = binding.episodeVert.getAdapter().getItemCount();
if (itemCount <= 0) return;
int columns = mEpisodePresenter.getNumColumns();
int numRows = mEpisodePresenter.getNumRows();
if (((int)Math.ceil((position + 1)/columns) + 1 == numRows) && (position + columns >= itemCount)) {
if ((position + columns >= itemCount) && ((position % columns) + 1 > (itemCount % columns))) {
child.itemView.setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {

@ -152,6 +152,7 @@
<!-- Hint -->
<string name="copied">已复制</string>
<string name="config_refreshed">接口已刷新</string>
<!-- UNIT -->
<string name="all">全部</string>

@ -152,6 +152,7 @@
<!-- Hint -->
<string name="copied">已複製</string>
<string name="config_refreshed">接口已刷新</string>
<!-- UNIT -->
<string name="all">全部</string>

@ -152,6 +152,7 @@
<!-- Hint -->
<string name="copied">Copied</string>
<string name="config_refreshed">Config rereshed</string>
<!-- UNIT -->
<string name="all">All</string>

@ -17,6 +17,7 @@ import androidx.viewbinding.ViewBinding;
import androidx.viewpager.widget.ViewPager;
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;
@ -48,6 +49,7 @@ import com.fongmi.android.tv.ui.dialog.SiteDialog;
import com.fongmi.android.tv.utils.FileChooser;
import com.fongmi.android.tv.utils.FileUtil;
import com.fongmi.android.tv.utils.Notify;
import com.fongmi.android.tv.utils.ResUtil;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Trans;
import com.google.common.net.HttpHeaders;
@ -211,6 +213,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
private boolean onRefresh(View view) {
FileUtil.clearCache(null);
if (getActivity() instanceof MainActivity) ((MainActivity) getActivity()).initConfig();
App.post(() -> Notify.show(ResUtil.getString(R.string.config_refreshed)), 2000);
return true;
}

Loading…
Cancel
Save