🐛 Fix compability issue on web platform

This commit is contained in:
2025-05-16 22:48:23 +08:00
parent a9da4b4f4f
commit 1e10ca626b
26 changed files with 989 additions and 251 deletions

View File

@ -1,17 +1,23 @@
// ignore_for_file: invalid_runtime_check_with_js_interop_types
import 'dart:ui_web' as ui;
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/pods/config.dart';
import 'package:island/widgets/app_scaffold.dart';
import 'package:web/web.dart' as web;
import 'package:flutter/material.dart';
class CaptchaScreen extends HookConsumerWidget {
class CaptchaScreen extends ConsumerStatefulWidget {
const CaptchaScreen({super.key});
void _setupWebListener(BuildContext context, String serverUrl) {
@override
ConsumerState<CaptchaScreen> createState() => _CaptchaScreenState();
}
class _CaptchaScreenState extends ConsumerState<CaptchaScreen> {
bool _isInitialized = false;
void _setupWebListener(String serverUrl) {
web.window.onMessage.listen((event) {
if (event.data != null && event.data is String) {
final message = event.data as String;
@ -24,7 +30,7 @@ class CaptchaScreen extends HookConsumerWidget {
final iframe =
web.HTMLIFrameElement()
..src = '$serverUrl/captcha'
..src = '$serverUrl/auth/captcha'
..style.border = 'none'
..width = '100%'
..height = '100%';
@ -34,18 +40,29 @@ class CaptchaScreen extends HookConsumerWidget {
'captcha-iframe',
(int viewId) => iframe,
);
setState(() {
_isInitialized = true;
});
}
@override
Widget build(BuildContext context, WidgetRef ref) {
useCallback(() {
void initState() {
super.initState();
Future.delayed(Duration.zero, () {
final serverUrl = ref.watch(serverUrlProvider);
_setupWebListener(context, serverUrl);
}, []);
_setupWebListener(serverUrl);
});
}
@override
Widget build(BuildContext context) {
return AppScaffold(
appBar: AppBar(title: Text("Anti-Robot")),
body: HtmlElementView(viewType: 'captcha-iframe'),
body:
_isInitialized
? HtmlElementView(viewType: 'captcha-iframe')
: Center(child: CircularProgressIndicator()),
);
}
}

View File

@ -47,6 +47,7 @@ class CreateAccountScreen extends HookConsumerWidget {
if (!context.mounted) return;
try {
showLoadingModal(context);
final client = ref.watch(apiClientProvider);
await client.post(
'/accounts',
@ -59,10 +60,11 @@ class CreateAccountScreen extends HookConsumerWidget {
'captcha_token': captchaTk,
},
);
if (!context.mounted) return;
hideLoadingModal(context);
showPostCreateModal();
} catch (err) {
if (context.mounted) hideLoadingModal(context);
showErrorAlert(err);
}
}

View File

@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_udid/flutter_udid.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:gap/gap.dart';
import 'package:island/models/auth.dart';
@ -13,6 +12,7 @@ import 'package:island/pods/network.dart';
import 'package:island/pods/userinfo.dart';
import 'package:island/pods/websocket.dart';
import 'package:island/services/notify.dart';
import 'package:island/services/udid.dart';
import 'package:island/widgets/alert.dart';
import 'package:island/widgets/app_scaffold.dart';
import 'package:material_symbols_icons/symbols.dart';
@ -150,8 +150,8 @@ class _LoginCheckScreen extends HookConsumerWidget {
subscribePushNotification(apiClient);
final wsNotifier = ref.read(websocketStateProvider.notifier);
wsNotifier.connect();
if (context.mounted) Navigator.pop(context, true);
});
Navigator.pop(context, true);
} catch (err) {
showErrorAlert(err);
return;
@ -379,7 +379,7 @@ class _LoginLookupScreen extends HookConsumerWidget {
'/auth/challenge',
data: {
'account': uname,
'device_id': await FlutterUdid.consistentUdid,
'device_id': await getUdid(),
'platform':
kIsWeb
? 1