diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 42582874b..5902ffdf8 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -58,7 +58,6 @@ import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.impl.SubtitleCallback; import com.fongmi.android.tv.model.SiteViewModel; import com.fongmi.android.tv.player.Players; -import com.fongmi.android.tv.player.Source; import com.fongmi.android.tv.player.exo.ExoUtil; import com.fongmi.android.tv.ui.adapter.QualityAdapter; import com.fongmi.android.tv.ui.base.BaseActivity; @@ -583,7 +582,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setQualityActivated(Result result) { try { - result.setUrl(Source.get().fetch(result)); mPlayers.start(result, isUseParse(), getSite().isChangeable() ? getSite().getTimeout() : -1); } catch (Exception e) { ErrorEvent.extract(e.getMessage()); 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 bd196cec6..e588c680f 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 @@ -189,6 +189,7 @@ public class SiteViewModel extends ViewModel { result.setFlag(flag); result.setHeader(site.getHeader()); result.setPlayUrl(site.getPlayUrl()); + result.setUrl(Source.get().fetch(result)); result.setParse(Sniffer.isVideoFormat(url.v()) && result.getPlayUrl().isEmpty() ? 0 : 1); SpiderDebug.log(result.toString()); return result; diff --git a/app/src/main/java/com/fongmi/android/tv/player/Source.java b/app/src/main/java/com/fongmi/android/tv/player/Source.java index e34ef7f2c..86b9cce8b 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Source.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Source.java @@ -9,7 +9,6 @@ import com.fongmi.android.tv.player.extractor.TVBus; import com.fongmi.android.tv.player.extractor.Thunder; import com.fongmi.android.tv.player.extractor.Video; import com.fongmi.android.tv.player.extractor.Youtube; -import com.fongmi.android.tv.player.extractor.ZLive; import com.fongmi.android.tv.utils.UrlUtil; import java.util.ArrayList; @@ -36,7 +35,6 @@ public class Source { extractors.add(new TVBus()); extractors.add(new Video()); extractors.add(new Youtube()); - extractors.add(new ZLive()); } private Extractor getExtractor(String url) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index cedffa901..02c70e0a8 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -63,7 +63,6 @@ import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.impl.SubtitleCallback; import com.fongmi.android.tv.model.SiteViewModel; import com.fongmi.android.tv.player.Players; -import com.fongmi.android.tv.player.Source; import com.fongmi.android.tv.player.exo.ExoUtil; import com.fongmi.android.tv.service.PlaybackService; import com.fongmi.android.tv.ui.adapter.EpisodeAdapter; @@ -572,7 +571,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Override public void onItemClick(Result result) { try { - result.setUrl(Source.get().fetch(result)); mPlayers.start(result, isUseParse(), getSite().isChangeable() ? getSite().getTimeout() : -1); } catch (Exception e) { ErrorEvent.extract(e.getMessage());