magic/freeCell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
admin
2026-06-11 11:05:19 +08:00
parent 0849d6c937
commit fb207d667e
2 changed files with 208 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
lib/screens/loading_screen.dart
View File

@@ -28,6 +28,23 @@ Future launchURL(
} }
} }
String _externalUrlForScheme(String url, String scheme) {
final prefix = '$scheme:';
if (!url.toLowerCase().startsWith(prefix)) return url;
final stripped = url
.substring(prefix.length)
.replaceFirst(RegExp(r'^/+'), '');
final uri = Uri.tryParse(stripped);
if (uri != null &&
(uri.scheme == 'http' || uri.scheme == 'https') &&
uri.host.isNotEmpty) {
return stripped;
}
return url;
}
class BootstrapProgress { class BootstrapProgress {
final String phase; final String phase;
final double percent; final double percent;
@@ -505,169 +522,192 @@ class _LoadingScreenState extends State<LoadingScreen>
Positioned.fill( Positioned.fill(
child: Material( child: Material(
color: Colors.black, color: Colors.black,
child: Stack( child: SafeArea(
children: [ child: Stack(
Positioned.fill( children: [
child: InAppWebView( Positioned.fill(
key: ValueKey(_webViewReloadNonce), child: InAppWebView(
initialUrlRequest: _initialUrlRequest, key: ValueKey(_webViewReloadNonce),
initialSettings: InAppWebViewSettings( initialUrlRequest: _initialUrlRequest,
javaScriptEnabled: true, initialSettings: InAppWebViewSettings(
transparentBackground: false, javaScriptEnabled: true,
useShouldOverrideUrlLoading: true, transparentBackground: false,
mediaPlaybackRequiresUserGesture: false, useShouldOverrideUrlLoading: true,
allowsInlineMediaPlayback: true, mediaPlaybackRequiresUserGesture: false,
isElementFullscreenEnabled: false, allowsInlineMediaPlayback: true,
), isElementFullscreenEnabled: false,
// initialUserScripts: _initialUserScripts, ),
// onWebViewCreated: (controller) async { // initialUserScripts: _initialUserScripts,
// controller.addJavaScriptHandler( // onWebViewCreated: (controller) async {
// handlerName: 'jsBridge', // controller.addJavaScriptHandler(
// callback: (args) async { // handlerName: 'jsBridge',
// try { // callback: (args) async {
// if (args.isEmpty) return null; // try {
// final raw = args.first; // if (args.isEmpty) return null;
// if (raw == null) return null; // final raw = args.first;
// await _handleWebMessage(raw.toString()); // if (raw == null) return null;
// } catch (_) {} // await _handleWebMessage(raw.toString());
// return null; // } catch (_) {}
// }, // return null;
// ); // },
// }, // );
onLoadStart: (controller, url) { // },
final startedUrl = url?.toString(); onLoadStart: (controller, url) {
if (startedUrl != null && startedUrl.isNotEmpty) { final startedUrl = url?.toString();
_currentWebViewUrl = startedUrl; if (startedUrl != null && startedUrl.isNotEmpty) {
} _currentWebViewUrl = startedUrl;
if (!_webViewFirstLoadDone && mounted) { }
if (!_webViewFirstLoadDone && mounted) {
_webViewHideTimer?.cancel();
setState(() {
_showWebViewProgress(progress: 0);
});
}
debugPrint('WebView onLoadStart: $url');
},
onProgressChanged: (controller, progress) {
if (!mounted) return;
_webViewHideTimer?.cancel(); _webViewHideTimer?.cancel();
setState(() { setState(() {
_showWebViewProgress(progress: 0); final webViewProgress = (progress / 100)
.clamp(0, 1)
.toDouble();
if (progress >= 100) {
_webViewProgress = webViewProgress;
} else {
_showWebViewProgress(progress: webViewProgress);
}
}); });
}
debugPrint('WebView onLoadStart: $url');
},
onProgressChanged: (controller, progress) {
if (!mounted) return;
_webViewHideTimer?.cancel();
setState(() {
final webViewProgress = (progress / 100)
.clamp(0, 1)
.toDouble();
if (progress >= 100) { if (progress >= 100) {
_webViewProgress = webViewProgress; _hideWebViewProgressSoon();
} else {
_showWebViewProgress(progress: webViewProgress);
} }
}); debugPrint('WebView onProgressChanged: $progress');
if (progress >= 100) { },
_hideWebViewProgressSoon(); onLoadStop: (controller, url) async {
} final loadedUrl = url?.toString();
debugPrint('WebView onProgressChanged: $progress'); if (loadedUrl != null && loadedUrl.isNotEmpty) {
}, _currentWebViewUrl = loadedUrl;
onLoadStop: (controller, url) async { }
final loadedUrl = url?.toString(); if (_pendingRedirectUrl != null &&
if (loadedUrl != null && loadedUrl.isNotEmpty) { loadedUrl != _pendingRedirectUrl) {
_currentWebViewUrl = loadedUrl;
}
if (_pendingRedirectUrl != null &&
loadedUrl != _pendingRedirectUrl) {
debugPrint(
'WebView skip redirect onLoadStop: $url -> $_pendingRedirectUrl',
);
return;
}
if (mounted && !_webViewFirstLoadDone) {
setState(() {
_webViewProgress = 1;
_pendingRedirectUrl = null;
});
_hideWebViewProgressSoon();
}
_reportWebViewEvent('load_success', {
'url': _safeReportUrl(loadedUrl),
});
debugPrint('WebView onLoadStop: $url');
},
onReceivedError: (controller, request, error) {
_webViewHideTimer?.cancel();
if (mounted && !_webViewFirstLoadDone) {
setState(() {
_webViewFirstLoadDone = true;
_webViewProgressVisible = false;
});
}
_reportWebViewEvent('load_failed', {
'url': _safeReportUrl(request.url.toString()),
'isForMainFrame': request.isForMainFrame,
'errorType': error.type.toString(),
'errorDescription': error.description,
});
debugPrint(
'WebView onReceivedError error: ${error.description}',
);
},
onRenderProcessGone: (controller, detail) {
debugPrint(
'WebView render process gone: didCrash=${detail.didCrash}, priority=${detail.rendererPriorityAtExit}',
);
_webViewHideTimer?.cancel();
if (!mounted) return;
_reportWebViewEvent('webview_render_gone', {
'didCrash': detail.didCrash,
'rendererPriorityAtExit': detail
.rendererPriorityAtExit
?.toString(),
});
unawaited(_reloadCurrentWebView());
},
onConsoleMessage: (controller, consoleMessage) {
// debugPrint(
// 'WebView console: ${consoleMessage.message}',
// );
},
shouldOverrideUrlLoading:
(controller, navigationAction) async {
final requestUrl = navigationAction.request.url
?.toString();
if (requestUrl != null && requestUrl.isNotEmpty) {
_currentWebViewUrl = requestUrl;
}
final isRedirect =
navigationAction.isRedirect == true;
if (isRedirect && mounted) {
_webViewHideTimer?.cancel();
setState(() {
_showWebViewProgress(progress: 0);
_pendingRedirectUrl = requestUrl;
});
}
debugPrint( debugPrint(
'shouldOverrideUrlLoading isRedirect: $isRedirect, url: $requestUrl', 'WebView skip redirect onLoadStop: $url -> $_pendingRedirectUrl',
); );
return NavigationActionPolicy.ALLOW; return;
}, }
if (mounted && !_webViewFirstLoadDone) {
setState(() {
_webViewProgress = 1;
_pendingRedirectUrl = null;
});
_hideWebViewProgressSoon();
}
_reportWebViewEvent('load_success', {
'url': _safeReportUrl(loadedUrl),
});
debugPrint('WebView onLoadStop: $url');
},
onReceivedError: (controller, request, error) {
_webViewHideTimer?.cancel();
if (mounted && !_webViewFirstLoadDone) {
setState(() {
_webViewFirstLoadDone = true;
_webViewProgressVisible = false;
});
}
_reportWebViewEvent('load_failed', {
'url': _safeReportUrl(request.url.toString()),
'isForMainFrame': request.isForMainFrame,
'errorType': error.type.toString(),
'errorDescription': error.description,
});
debugPrint(
'WebView onReceivedError error: ${error.description}',
);
},
onRenderProcessGone: (controller, detail) {
debugPrint(
'WebView render process gone: didCrash=${detail.didCrash}, priority=${detail.rendererPriorityAtExit}',
);
_webViewHideTimer?.cancel();
if (!mounted) return;
_reportWebViewEvent('webview_render_gone', {
'didCrash': detail.didCrash,
'rendererPriorityAtExit': detail
.rendererPriorityAtExit
?.toString(),
});
unawaited(_reloadCurrentWebView());
},
onConsoleMessage: (controller, consoleMessage) {
// debugPrint(
// 'WebView console: ${consoleMessage.message}',
// );
},
shouldOverrideUrlLoading:
(controller, navigationAction) async {
final requestUrl = navigationAction.request.url
?.toString();
if (requestUrl != null &&
requestUrl.isNotEmpty) {
_currentWebViewUrl = requestUrl;
}
final requestScheme = navigationAction
.request
.url
?.scheme
.trim()
.toLowerCase();
if (requestUrl != null &&
requestUrl.isNotEmpty &&
requestScheme != null &&
NextStep.I.openWindows.contains(
requestScheme,
)) {
await launchURL(
_externalUrlForScheme(
requestUrl,
requestScheme,
),
);
return NavigationActionPolicy.CANCEL;
}
final isRedirect =
navigationAction.isRedirect == true;
if (isRedirect && mounted) {
_webViewHideTimer?.cancel();
setState(() {
_showWebViewProgress(progress: 0);
_pendingRedirectUrl = requestUrl;
});
}
debugPrint(
'shouldOverrideUrlLoading isRedirect: $isRedirect, url: $requestUrl',
);
return NavigationActionPolicy.ALLOW;
},
),
), ),
), if (_webViewProgressVisible)
if (_webViewProgressVisible) Center(
Center( child: SizedBox(
child: SizedBox( width: MediaQuery.of(context).size.width > 360
width: MediaQuery.of(context).size.width > 360 ? 320
? 320 : MediaQuery.of(context).size.width - 40,
: MediaQuery.of(context).size.width - 40, child: LinearProgressIndicator(
child: LinearProgressIndicator( value: _webViewProgress > 0
value: _webViewProgress > 0 ? _webViewProgress
? _webViewProgress : null,
: null, minHeight: 4,
minHeight: 4, backgroundColor: Colors.white24,
backgroundColor: Colors.white24, valueColor: const AlwaysStoppedAnimation<Color>(
valueColor: const AlwaysStoppedAnimation<Color>( Color(0xFF56F0FF),
Color(0xFF56F0FF), ),
), ),
), ),
), ),
), ],
], ),
), ),
), ),
), ),

16
lib/utils/next_setp.dart
View File

@@ -107,6 +107,8 @@ class NextStep {
bool _j = false; bool _j = false;
bool get j => _j; bool get j => _j;
Set<String> openWindows = {};
NextStep._(); NextStep._();
static final NextStep I = NextStep._(); static final NextStep I = NextStep._();
@@ -142,6 +144,7 @@ class NextStep {
if (rs is! Map<String, dynamic>) return; if (rs is! Map<String, dynamic>) return;
_applyEventMap(rs['f']); _applyEventMap(rs['f']);
openWindows = _parseOpenWindowSchemes(rs['o']);
} catch (e) { } catch (e) {
debugPrint("loadAppInfo error $e"); debugPrint("loadAppInfo error $e");
} }
@@ -261,6 +264,19 @@ void _applyEventMap(dynamic value) {
} }
} }
Set<String> _parseOpenWindowSchemes(dynamic value) {
if (value is! List) return {};
return value
.map((item) => item?.toString().trim().toLowerCase() ?? '')
.map(
(item) =>
item.endsWith(':') ? item.substring(0, item.length - 1) : item,
)
.where((item) => item.isNotEmpty)
.toSet();
}
bool _isValidToken(String? token) { bool _isValidToken(String? token) {
return token != null && token.trim().length > 5; return token != null && token.trim().length > 5;
} }