gongyun/app
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 7 Activity

Android Feature Optimization and Updates
Build Android Release / Build Android (push) Failing after 7s
Details

Browse Source
This commit is contained in:
公云存储
2026-05-21 10:31:43 +08:00
parent 31acfd4e13
commit 1d9e0a831f
19 changed files with 2506 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/presentation/pages/auth/register_page.dart
+65 -8
View File
@@ -1,12 +1,17 @@
import 'package:cloudreve4_flutter/data/models/login_config_model.dart';
import 'package:cloudreve4_flutter/presentation/widgets/desktop_constrained.dart';
import 'package:cloudreve4_flutter/services/captcha_service.dart';
import 'package:flutter/material.dart';
import 'package:lucide_icons/lucide_icons.dart';
import '../../../core/validators/string_validator.dart';
import '../../../services/auth_service.dart';
import '../../../services/server_service.dart';
import '../../widgets/toast_helper.dart';
class RegisterPage extends StatefulWidget {
const RegisterPage({super.key});
final LoginConfigModel loginConfig;
const RegisterPage({super.key, this.loginConfig = const LoginConfigModel()});
@override
State<RegisterPage> createState() => _RegisterPageState();
@@ -22,6 +27,21 @@ class _RegisterPageState extends State<RegisterPage> {
bool _isLoading = false;
String? _errorMessage;
@override
void initState() {
super.initState();
if (widget.loginConfig.regCaptcha) {
WidgetsBinding.instance.addPostFrameCallback((_) {
final server = ServerService.instance.currentServer;
if (server != null) {
CaptchaService.instance.loadCaptcha(server.baseUrl).then((_) {
if (mounted) setState(() {});
});
}
});
}
}
@override
void dispose() {
_emailController.dispose();
@@ -38,16 +58,28 @@ class _RegisterPageState extends State<RegisterPage> {
return;
}
final captcha = CaptchaService.instance;
if (widget.loginConfig.regCaptcha && !captcha.isWebCaptchaVerified) {
ToastHelper.failure('请先完成人机验证');
return;
}
setState(() {
_isLoading = true;
_errorMessage = null;
});
try {
final captchaParams = widget.loginConfig.regCaptcha
? captcha.getCaptchaParams()
: <String, String>{};
final response = await AuthService.instance.signUp(
email: _emailController.text.trim(),
password: _passwordController.text,
language: 'zh-CN',
captcha: captchaParams['captcha'],
ticket: captchaParams['ticket'],
);
if (mounted) {
@@ -58,6 +90,10 @@ class _RegisterPageState extends State<RegisterPage> {
}
} catch (e) {
if (mounted) {
if (widget.loginConfig.regCaptcha) {
await captcha.refreshCaptcha();
setState(() {});
}
setState(() => _errorMessage = e.toString());
}
} finally {
@@ -68,6 +104,7 @@ class _RegisterPageState extends State<RegisterPage> {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final captcha = CaptchaService.instance;
return Scaffold(
appBar: AppBar(title: const Text('注册')),
@@ -109,10 +146,14 @@ class _RegisterPageState extends State<RegisterPage> {
prefixIcon: const Icon(LucideIcons.lock),
suffixIcon: IconButton(
icon: Icon(
_obscurePassword ? LucideIcons.eye : LucideIcons.eyeOff,
_obscurePassword
? LucideIcons.eye
: LucideIcons.eyeOff,
size: 20,
),
onPressed: () => setState(() => _obscurePassword = !_obscurePassword),
onPressed: () => setState(
() => _obscurePassword = !_obscurePassword,
),
),
),
),
@@ -122,7 +163,9 @@ class _RegisterPageState extends State<RegisterPage> {
obscureText: _obscureConfirmPassword,
validator: (value) {
if (value == null || value.isEmpty) return '请确认密码';
if (value != _passwordController.text) return '两次输入的密码不一致';
if (value != _passwordController.text) {
return '两次输入的密码不一致';
}
return null;
},
decoration: InputDecoration(
@@ -131,17 +174,29 @@ class _RegisterPageState extends State<RegisterPage> {
prefixIcon: const Icon(LucideIcons.lock),
suffixIcon: IconButton(
icon: Icon(
_obscureConfirmPassword ? LucideIcons.eye : LucideIcons.eyeOff,
_obscureConfirmPassword
? LucideIcons.eye
: LucideIcons.eyeOff,
size: 20,
),
onPressed: () => setState(() => _obscureConfirmPassword = !_obscureConfirmPassword),
onPressed: () => setState(
() => _obscureConfirmPassword =
!_obscureConfirmPassword,
),
),
),
),
if (widget.loginConfig.regCaptcha) ...[
const SizedBox(height: 16),
captcha.buildCaptchaInput(context),
],
if (_errorMessage != null) ...[
const SizedBox(height: 16),
Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
padding: const EdgeInsets.symmetric(
horizontal: 12,
vertical: 8,
),
decoration: BoxDecoration(
color: theme.colorScheme.errorContainer,
borderRadius: BorderRadius.circular(8),
@@ -168,7 +223,9 @@ class _RegisterPageState extends State<RegisterPage> {
? const SizedBox(
width: 24,
height: 24,
child: CircularProgressIndicator(strokeWidth: 2),
child: CircularProgressIndicator(
strokeWidth: 2,
),
)
: const Text('注册'),
),