Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

chore: clean redundant timer in webview imple

Prediditd79712cc7f5e
diff --git a/lib/providers/webview_video_source_provider.dart b/lib/providers/webview_video_source_provider.dart
index 2e234af2..69f5e6ba 100644
--- a/lib/providers/webview_video_source_provider.dart
+++ b/lib/providers/webview_video_source_provider.dart
@@ -19,7 +19,7 @@ class WebViewVideoSourceProvider implements IVideoSourceProvider {
String episodeUrl, {
required bool useLegacyParser,
int offset = 0,
- Duration timeout = const Duration(seconds: 30),
+ Duration timeout = const Duration(seconds: 15),
}) async {
// 取消之前的解析(如果正在进行)
_cancelCurrentResolve();
diff --git a/lib/webview/webview_controller_impel/webview_android_controller_impel.dart b/lib/webview/webview_controller_impel/webview_android_controller_impel.dart
index 80225fb2..e3d61bec 100644
--- a/lib/webview/webview_controller_impel/webview_android_controller_impel.dart
+++ b/lib/webview/webview_controller_impel/webview_android_controller_impel.dart
@@ -11,7 +11,6 @@ import 'package:flutter_inappwebview_android/flutter_inappwebview_android.dart'
class WebviewAndroidItemControllerImpel
extends WebviewItemController<PlatformInAppWebViewController> {
PlatformHeadlessInAppWebView? headlessWebView;
- Timer? loadingMonitorTimer;
bool hasInjectedScripts = false;
bool shouldInjectIframeRedirect = false;
@@ -64,21 +63,6 @@ class WebviewAndroidItemControllerImpel
videoLoadingEventController.add(true);
await webviewController?.loadUrl(urlRequest: URLRequest(url: WebUri(url)));
- loadingMonitorTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
- if (isVideoSourceLoaded || isIframeLoaded) {
- timer.cancel();
- } else {
- count++;
- if (count >= 15) {
- timer.cancel();
-
- logEventController.add('clear');
- logEventController.add('解析视频资源超时');
- logEventController.add('请切换到其他播放列表或视频源');
- logEventController.add('showDebug');
- }
- }
- });
}
void addJavaScriptHandlers(bool useLegacyParser) {
@@ -291,14 +275,12 @@ class WebviewAndroidItemControllerImpel
@override
Future<void> unloadPage() async {
- loadingMonitorTimer?.cancel();
await webviewController!
.loadUrl(urlRequest: URLRequest(url: WebUri("about:blank")));
}
@override
void dispose() {
- loadingMonitorTimer?.cancel();
headlessWebView?.dispose();
headlessWebView = null;
webviewController = null;
diff --git a/lib/webview/webview_controller_impel/webview_apple_controller_impel.dart b/lib/webview/webview_controller_impel/webview_apple_controller_impel.dart
index fe441e15..6c4d00d5 100644
--- a/lib/webview/webview_controller_impel/webview_apple_controller_impel.dart
+++ b/lib/webview/webview_controller_impel/webview_apple_controller_impel.dart
@@ -8,7 +8,6 @@ import 'package:flutter_inappwebview_platform_interface/flutter_inappwebview_pla
class WebviewAppleItemControllerImpel
extends WebviewItemController<PlatformInAppWebViewController> {
PlatformHeadlessInAppWebView? headlessWebView;
- Timer? loadingMonitorTimer;
bool hasInjectedScripts = false;
@override
@@ -138,22 +137,6 @@ class WebviewAppleItemControllerImpel
videoLoadingEventController.add(true);
await webviewController?.loadUrl(urlRequest: URLRequest(url: WebUri(url)));
-
- loadingMonitorTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
- if (isVideoSourceLoaded || isIframeLoaded) {
- timer.cancel();
- } else {
- count++;
- if (count >= 15) {
- timer.cancel();
-
- logEventController.add('clear');
- logEventController.add('解析视频资源超时');
- logEventController.add('请切换到其他播放列表或视频源');
- logEventController.add('showDebug');
- }
- }
- });
}
void addJavaScriptHandlers(bool useLegacyParser) {
@@ -335,14 +318,12 @@ class WebviewAppleItemControllerImpel
@override
Future<void> unloadPage() async {
- loadingMonitorTimer?.cancel();
await webviewController!
.loadUrl(urlRequest: URLRequest(url: WebUri("about:blank")));
}
@override
void dispose() {
- loadingMonitorTimer?.cancel();
headlessWebView?.dispose();
headlessWebView = null;
webviewController = null;
diff --git a/lib/webview/webview_controller_impel/webview_controller_impel.dart b/lib/webview/webview_controller_impel/webview_controller_impel.dart
index 5516c82c..c2a1cd37 100644
--- a/lib/webview/webview_controller_impel/webview_controller_impel.dart
+++ b/lib/webview/webview_controller_impel/webview_controller_impel.dart
@@ -11,7 +11,6 @@ import 'package:flutter_inappwebview_android/flutter_inappwebview_android.dart'
class WebviewItemControllerImpel
extends WebviewItemController<PlatformInAppWebViewController> {
PlatformHeadlessInAppWebView? headlessWebView;
- Timer? loadingMonitorTimer;
bool hasRegisteredHandlers = false;
bool shouldInjectIframeRedirect = false;
bool useLegacyParser = false;
@@ -71,20 +70,6 @@ class WebviewItemControllerImpel
videoLoadingEventController.add(true);
await webviewController?.loadUrl(urlRequest: URLRequest(url: WebUri(url)));
- loadingMonitorTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
- if (isVideoSourceLoaded || isIframeLoaded) {
- timer.cancel();
- } else {
- count++;
- if (count >= 15) {
- timer.cancel();
- logEventController.add('clear');
- logEventController.add('解析视频资源超时');
- logEventController.add('请切换到其他播放列表或视频源');
- logEventController.add('showDebug');
- }
- }
- });
}
void _addJavaScriptHandlers(bool useLegacyParser) {
@@ -362,14 +347,12 @@ class WebviewItemControllerImpel
@override
Future<void> unloadPage() async {
- loadingMonitorTimer?.cancel();
await webviewController
?.loadUrl(urlRequest: URLRequest(url: WebUri("about:blank")));
}
@override
void dispose() {
- loadingMonitorTimer?.cancel();
headlessWebView?.dispose();
headlessWebView = null;
webviewController = null;