diff --git a/app/build.gradle b/app/build.gradle index 71707e965..b9cd8530a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,12 +22,12 @@ android { leanback { dimension "mode" versionCode 76 - versionName "20230514#1" + versionName "20230516#1" } mobile { dimension "mode" versionCode 14 - versionName "1.1.4" + versionName "20230516#1" } java { dimension "api" 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 805c072dc..0dbd67b21 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 @@ -65,8 +65,7 @@ public class History { } public static List arrayFrom(String str) { - Type listType = new TypeToken>() { - }.getType(); + Type listType = new TypeToken>() {}.getType(); List items = new Gson().fromJson(str, listType); return items == null ? Collections.emptyList() : items; } 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 14a811a39..2216bfba1 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 @@ -235,31 +235,6 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal return mResult == null ? new Result() : mResult; } - private Callback getCallback() { - return new Callback() { - @Override - public void success() { - RefreshEvent.history(); - } - }; - } - - private Callback getCallback(SyncEvent event) { - return new Callback() { - @Override - public void success() { - RefreshEvent.config(); - RefreshEvent.video(); - onSyncEvent(event); - } - - @Override - public void error(int resId) { - Notify.show(resId); - } - }; - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onRefreshEvent(RefreshEvent event) { switch (event.getType()) { @@ -281,12 +256,28 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal @Subscribe(threadMode = ThreadMode.MAIN) public void onSyncEvent(SyncEvent event) { if (ApiConfig.get().getConfig().equals(event.getConfig())) { - History.sync(event.getHistory(), getCallback()); + History.sync(event.getHistory()); } else { ApiConfig.get().clear().config(event.getConfig()).load(getCallback(event)); } } + private Callback getCallback(SyncEvent event) { + return new Callback() { + @Override + public void success() { + RefreshEvent.config(); + RefreshEvent.video(); + onSyncEvent(event); + } + + @Override + public void error(int resId) { + Notify.show(resId); + } + }; + } + @Override public void setSite(Site item) { ApiConfig.get().setHome(item);