release
jhengazuji 5 months ago
parent 557ffc7d3e
commit 7325a55c1c
  1. 1
      app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/player/Players.java
  3. 1
      app/src/main/java/com/fongmi/android/tv/player/danmaku/DanPlayer.java
  4. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  5. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java

@ -215,6 +215,7 @@ public class SiteViewModel extends ViewModel {
}
public void searchContent(List<Site> sites, String keyword, boolean quick) {
stopSearch();
sites.forEach(site -> searchFuture.add(App.submitSearch(SearchTask.create(this, site, keyword, quick).run())));
}

@ -488,7 +488,7 @@ public class Players implements Player.Listener, ParseCallback {
}
public void setDanmaku(Danmaku item) {
danPlayer.cancel().setDanmaku(item);
danPlayer.setDanmaku(item);
if (danmakus == null) danmakus = new ArrayList<>();
if (!item.isEmpty() && !danmakus.contains(item)) danmakus.add(0, item);
for (int i = 0; i < danmakus.size(); i++) danmakus.get(i).setSelected(danmakus.get(i).getUrl().equals(item.getUrl()) && !danmakus.get(i).isSelected());

@ -103,6 +103,7 @@ public class DanPlayer implements DrawHandler.Callback {
}
public void setDanmaku(Danmaku item) {
cancel();
future = App.submit(() -> {
if (view != null) view.release();
if (item.isEmpty() || view == null) return;

@ -1316,7 +1316,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
private void startSearch(String keyword) {
mQuickAdapter.clear();
mViewModel.stopSearch();
List<Site> sites = new ArrayList<>();
for (Site item : VodConfig.get().getSites()) if (isPass(item)) sites.add(item);
mViewModel.searchContent(sites, keyword, true);

@ -114,7 +114,6 @@ public class CollectFragment extends BaseFragment implements MenuProvider, Colle
}
private void search() {
mViewModel.stopSearch();
if (mSites.isEmpty()) return;
mCollectAdapter.setItems(List.of(Collect.all()), () -> mViewModel.searchContent(mSites, getKeyword(), false));
}

Loading…
Cancel
Save