diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 3373e6ee6..ef75d1699 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -250,7 +250,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen boolean exist = recommendIndex - historyIndex == 2; if (renew) mHistoryAdapter = new ArrayObjectAdapter(mPresenter = new HistoryPresenter(this)); if ((items.isEmpty() && exist) || (renew && exist)) mAdapter.removeItems(historyIndex, 1); - if ((items.size() > 0 && !exist) || (renew && exist)) mAdapter.add(historyIndex, new ListRow(mHistoryAdapter)); + if ((!items.isEmpty() && !exist) || (renew && exist)) mAdapter.add(historyIndex, new ListRow(mHistoryAdapter)); mHistoryAdapter.setItems(items, null); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 58d8cb94a..fd619ab78 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -520,7 +520,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Override public void onItemClick(Channel item) { - if (item.getData().getList().size() > 0 && item.isSelected() && mChannel != null && mChannel.equals(item) && mChannel.getGroup().equals(mGroup)) { + if (!item.getData().getList().isEmpty() && item.isSelected() && mChannel != null && mChannel.equals(item) && mChannel.getGroup().equals(mGroup)) { showEpg(item); } else { mGroup.setPosition(mBinding.channel.getSelectedPosition()); diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java index f12fa56ff..d7ccc6b81 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java @@ -197,7 +197,7 @@ public class VodConfig { } private void initOther(JsonObject object) { - if (parses.size() > 0) parses.add(0, Parse.god()); + if (!parses.isEmpty()) parses.add(0, Parse.god()); if (home == null) setHome(sites.isEmpty() ? new Site() : sites.get(0)); if (parse == null) setParse(parses.isEmpty() ? new Parse() : parses.get(0)); setRules(Rule.arrayFrom(object.getAsJsonArray("rules"))); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/History.java b/app/src/main/java/com/fongmi/android/tv/bean/History.java index af43a466c..541f6e1cd 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/History.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/History.java @@ -300,9 +300,9 @@ public class History { } public void findEpisode(List flags) { - if (flags.size() > 0) { + if (!flags.isEmpty()) { setVodFlag(flags.get(0).getFlag()); - if (flags.get(0).getEpisodes().size() > 0) { + if (!flags.get(0).getEpisodes().isEmpty()) { setVodRemarks(flags.get(0).getEpisodes().get(0).getName()); } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Hot.java b/app/src/main/java/com/fongmi/android/tv/bean/Hot.java index 8d8f65b32..9a1ae4d7e 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Hot.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Hot.java @@ -20,7 +20,7 @@ public class Hot { try { List items = new ArrayList<>(); for (Data item : objectFrom(str).getData()) items.add(item.getTitle()); - if (items.size() > 0) Setting.putHot(str); + if (!items.isEmpty()) Setting.putHot(str); return items; } catch (Exception e) { return new ArrayList<>(); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java index ee5e4913e..91e19366a 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java @@ -157,7 +157,7 @@ public class Result implements Parcelable { } public void setTypes(List types) { - if (types.size() > 0) this.types = types; + if (!types.isEmpty()) this.types = types; } public List getList() { diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java index 290f8f44d..579b5299f 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java @@ -68,7 +68,7 @@ public class SiteViewModel extends ViewModel { String homeContent = spider.homeContent(true); SpiderDebug.log(homeContent); Result result = Result.fromJson(homeContent); - if (result.getList().size() > 0) return result; + if (!result.getList().isEmpty()) return result; String homeVideoContent = spider.homeVideoContent(); SpiderDebug.log(homeVideoContent); result.setList(Result.fromJson(homeVideoContent).getList()); diff --git a/app/src/main/java/com/fongmi/android/tv/server/process/Action.java b/app/src/main/java/com/fongmi/android/tv/server/process/Action.java index fd6f8ab39..69f734717 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/process/Action.java +++ b/app/src/main/java/com/fongmi/android/tv/server/process/Action.java @@ -161,7 +161,7 @@ public class Action implements Process { private void syncKeep(Map params, boolean force) { List targets = Keep.arrayFrom(params.get("targets")); List configs = Config.arrayFrom(params.get("configs")); - if (TextUtils.isEmpty(VodConfig.getUrl()) && configs.size() > 0) { + if (TextUtils.isEmpty(VodConfig.getUrl()) && !configs.isEmpty()) { VodConfig.load(Config.find(configs.get(0)), getCallback(configs, targets)); } else { if (force) Keep.deleteAll(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java index 795b6566a..750549bca 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java @@ -154,7 +154,7 @@ public class CollectActivity extends BaseActivity implements CustomScroller.Call mCollectAdapter.add(result.getList()); }); mViewModel.result.observe(this, result -> { - boolean same = result.getList().size() > 0 && mCollectAdapter.getActivated().getSite().equals(result.getList().get(0).getSite()); + boolean same = !result.getList().isEmpty() && mCollectAdapter.getActivated().getSite().equals(result.getList().get(0).getSite()); if (same) mCollectAdapter.getActivated().getList().addAll(result.getList()); if (same) mSearchAdapter.addAll(result.getList()); mScroller.endLoading(result); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 7e80f5cab..fba2e1bdc 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -556,7 +556,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override public void onItemClick(Channel item) { - if (item.getData().getList().size() > 0 && item.isSelected() && mChannel != null && mChannel.equals(item) && mChannel.getGroup().equals(mGroup)) { + if (!item.getData().getList().isEmpty() && item.isSelected() && mChannel != null && mChannel.equals(item) && mChannel.getGroup().equals(mGroup)) { showEpg(item); } else { mGroup.setPosition(mChannelAdapter.setSelected(item.group(mGroup))); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java index 23aab9cf6..fd90a30c0 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java @@ -44,8 +44,8 @@ public class TypeAdapter extends RecyclerView.Adapter { public void addAll(Result result) { mItems.addAll(result.getTypes()); - if (result.getList().size() > 0) mItems.add(0, home()); - if (mItems.size() > 0) mItems.get(0).setActivated(true); + if (!result.getList().isEmpty()) mItems.add(0, home()); + if (!mItems.isEmpty()) mItems.get(0).setActivated(true); notifyDataSetChanged(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java index c60dfbf56..ff03f44f3 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java @@ -156,7 +156,7 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe @Override public void onFind(List devices) { - if (devices.size() > 0) adapter.addAll(devices); + if (!devices.isEmpty()) adapter.addAll(devices); } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java index 87464275b..e2b0a3f66 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java @@ -151,7 +151,7 @@ public class SyncDialog extends BaseDialog implements DeviceAdapter.OnClickListe @Override public void onFind(List devices) { - if (devices.size() > 0) adapter.addAll(devices); + if (!devices.isEmpty()) adapter.addAll(devices); } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index 73b881b4e..6a8a3f76b 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -179,7 +179,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal mBinding.top.setVisibility(View.INVISIBLE); mBinding.link.setVisibility(View.VISIBLE); mBinding.filter.setVisibility(View.GONE); - } else if (mAdapter.get(position).getFilters().size() > 0) { + } else if (!mAdapter.get(position).getFilters().isEmpty()) { mBinding.top.setVisibility(View.INVISIBLE); mBinding.link.setVisibility(View.GONE); mBinding.filter.show();