huangsheng/kuaishai2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(settings): 语言/密码/U盘导入改用右侧内嵌面板

Browse Source 
- 新增 LanguagePanel / PasswordPanel / UsbImportPanel 三个 widget
- settings_page 移除 AlertDialog 弹窗逻辑
- 5 个菜单项统一走 _buildContent() switch 切换右侧内容
- 验证：flutter analyze 无新增 issue
This commit is contained in:
Developer
2026-06-04 15:10:03 +08:00
parent e311d09d31
commit 67e2c7c76c
4 changed files with 626 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
lib/features/settings/widgets/language_panel.dart Normal file
View File

@@ -0,0 +1,133 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/localization/locale_provider.dart';
import '../../../core/theme/app_theme.dart';
/// 语言设置面板
///
/// 在设置页右侧主区域渲染语言切换控件，直接调用
/// [LocaleNotifier] 修改全局 locale。
class LanguagePanel extends ConsumerWidget {
const LanguagePanel({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final locale = ref.watch(localeProvider);
final currentLang = locale.languageCode;
return ListView(
padding: EdgeInsets.zero,
children: [
_SectionCard(
title: '语言设置',
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_langTile(
context: context,
ref: ref,
value: 'zh',
groupValue: currentLang,
label: '简体中文',
),
const Divider(height: 1),
_langTile(
context: context,
ref: ref,
value: 'en',
groupValue: currentLang,
label: 'English',
),
],
),
),
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Text(
'切换语言后立即生效',
style: TextStyle(color: AppTheme.textSecondary, fontSize: 12),
),
),
],
);
}
Widget _langTile({
required BuildContext context,
required WidgetRef ref,
required String value,
required String groupValue,
required String label,
}) {
final selected = value == groupValue;
return InkWell(
onTap: () {
if (value == 'zh') {
ref.read(localeProvider.notifier).setChinese();
} else {
ref.read(localeProvider.notifier).setEnglish();
}
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
child: Row(
children: [
Icon(
selected ? Icons.radio_button_checked : Icons.radio_button_off,
color: selected ? AppTheme.primaryColor : AppTheme.idleColor,
size: 20,
),
const SizedBox(width: 12),
Expanded(
child: Text(
label,
style: TextStyle(
color: AppTheme.textPrimary,
fontWeight: selected ? FontWeight.w600 : FontWeight.normal,
),
),
),
if (selected)
Icon(Icons.check_circle, color: AppTheme.successColor, size: 18),
],
),
),
);
}
}
class _SectionCard extends StatelessWidget {
final String title;
final Widget child;
const _SectionCard({required this.title, required this.child});
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
border: Border.all(color: AppTheme.borderSubtle),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
title,
style: TextStyle(
color: AppTheme.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
const Divider(),
child,
],
),
);
}
}

195
lib/features/settings/widgets/password_panel.dart Normal file
View File

@@ -0,0 +1,195 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/theme/app_theme.dart';
import '../../../shared/services/toast_service.dart';
import '../services/settings_service.dart';
/// 密码修改面板
///
/// 在设置页右侧主区域渲染密码修改表单，行为与原弹窗一致：
/// 校验空值、长度（≥6）、两次一致性、原密码正确性。
class PasswordPanel extends ConsumerStatefulWidget {
const PasswordPanel({super.key});
@override
ConsumerState<PasswordPanel> createState() => _PasswordPanelState();
}
class _PasswordPanelState extends ConsumerState<PasswordPanel> {
final _oldCtrl = TextEditingController();
final _newCtrl = TextEditingController();
final _confirmCtrl = TextEditingController();
bool _submitting = false;
String? _error;
@override
void dispose() {
_oldCtrl.dispose();
_newCtrl.dispose();
_confirmCtrl.dispose();
super.dispose();
}
Future<void> _submit() async {
if (_submitting) return;
final oldPwd = _oldCtrl.text.trim();
final newPwd = _newCtrl.text.trim();
final confirmPwd = _confirmCtrl.text.trim();
if (oldPwd.isEmpty || newPwd.isEmpty || confirmPwd.isEmpty) {
setState(() => _error = '请填写所有字段');
return;
}
if (newPwd.length < 6) {
setState(() => _error = '新密码至少6位字符');
return;
}
if (newPwd != confirmPwd) {
setState(() => _error = '两次输入的新密码不一致');
return;
}
setState(() {
_submitting = true;
_error = null;
});
final isValid = await SettingsService.instance.verifyPassword(oldPwd);
if (!isValid) {
if (!mounted) return;
setState(() {
_submitting = false;
_error = '原密码错误';
});
return;
}
final ok = await SettingsService.instance.setPassword(newPwd);
if (!mounted) return;
setState(() => _submitting = false);
if (ok) {
_oldCtrl.clear();
_newCtrl.clear();
_confirmCtrl.clear();
ToastService.showSuccess(context, '密码已修改');
} else {
ToastService.showError(context, '密码修改失败');
}
}
@override
Widget build(BuildContext context) {
return ListView(
padding: EdgeInsets.zero,
children: [
Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
border: Border.all(color: AppTheme.borderSubtle),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'密码修改',
style: TextStyle(
color: AppTheme.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
const Divider(),
_field(
controller: _oldCtrl,
label: '原密码',
hint: '请输入当前密码',
),
const SizedBox(height: 16),
_field(
controller: _newCtrl,
label: '新密码',
hint: '至少6位字符',
),
const SizedBox(height: 16),
_field(
controller: _confirmCtrl,
label: '确认新密码',
hint: '再次输入新密码',
),
if (_error != null) ...[
const SizedBox(height: 12),
Text(
_error!,
style: TextStyle(color: AppTheme.errorColor, fontSize: 12),
),
],
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
OutlinedButton(
onPressed: _submitting
? null
: () {
_oldCtrl.clear();
_newCtrl.clear();
_confirmCtrl.clear();
setState(() => _error = null);
},
child: const Text('重置'),
),
const SizedBox(width: 12),
ElevatedButton.icon(
onPressed: _submitting ? null : _submit,
icon: _submitting
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
)
: const Icon(Icons.check, size: 18),
label: const Text('确认'),
),
],
),
],
),
),
const SizedBox(height: 16),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
child: Text(
'默认密码为 123456',
style: TextStyle(color: AppTheme.textSecondary, fontSize: 12),
),
),
],
);
}
Widget _field({
required TextEditingController controller,
required String label,
required String hint,
}) {
return TextField(
controller: controller,
obscureText: true,
decoration: InputDecoration(
labelText: label,
hintText: hint,
border: const OutlineInputBorder(),
isDense: true,
contentPadding:
const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
),
);
}
}

189
lib/features/settings/widgets/usb_import_panel.dart Normal file
View File

@@ -0,0 +1,189 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/theme/app_theme.dart';
import '../../../shared/services/toast_service.dart';
import '../services/usb_detection_service.dart';
/// U盘导入面板
///
/// 在设置页右侧主区域渲染 U盘检测与导入操作。
class UsbImportPanel extends ConsumerStatefulWidget {
const UsbImportPanel({super.key});
@override
ConsumerState<UsbImportPanel> createState() => _UsbImportPanelState();
}
class _UsbImportPanelState extends ConsumerState<UsbImportPanel> {
bool _detecting = false;
Future<void> _detect() async {
if (_detecting) return;
setState(() => _detecting = true);
final connected = await UsbDetectionService.instance.detectUsb();
if (!mounted) return;
setState(() => _detecting = false);
if (connected) {
ToastService.showInfo(context, '正在检测U盘...');
} else {
ToastService.showWarning(context, '未检测到U盘');
}
}
@override
Widget build(BuildContext context) {
final state = ref.watch(_usbStateProvider);
final connected = state.maybeWhen(
data: (s) => s.isConnected,
orElse: () => UsbDetectionService.instance.isConnected,
);
final path = state.maybeWhen(
data: (s) => s.path,
orElse: () => UsbDetectionService.instance.usbPath,
);
return ListView(
padding: EdgeInsets.zero,
children: [
Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
border: Border.all(color: AppTheme.borderSubtle),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
Icon(
connected ? Icons.usb : Icons.usb_off,
color:
connected ? AppTheme.primaryColor : AppTheme.warningColor,
size: 28,
),
const SizedBox(width: 12),
Expanded(
child: Text(
connected ? 'U盘已连接' : '未检测到U盘',
style: TextStyle(
color: AppTheme.textPrimary,
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
),
],
),
const SizedBox(height: 12),
Text(
connected
? '挂载路径: ${path ?? "未知"}'
: '请插入U盘后点击"重新检测"',
style: TextStyle(
color: AppTheme.textSecondary, fontSize: 13),
),
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
OutlinedButton.icon(
onPressed: _detecting ? null : _detect,
icon: _detecting
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.refresh, size: 18),
label: const Text('重新检测'),
),
const SizedBox(width: 12),
ElevatedButton.icon(
onPressed: connected ? () => _import(path) : null,
icon: const Icon(Icons.download, size: 18),
label: const Text('导入程序'),
),
],
),
],
),
),
const SizedBox(height: 16),
Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
border: Border.all(color: AppTheme.borderSubtle),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'使用说明',
style: TextStyle(
color: AppTheme.textPrimary,
fontSize: 14,
fontWeight: FontWeight.w600,
),
),
const SizedBox(height: 8),
_bullet('将程序文件 (.json) 放入 U盘根目录的 programs 文件夹'),
_bullet('插入 U盘后点击"重新检测"'),
_bullet('检测成功后点击"导入程序"加载程序列表'),
],
),
),
],
);
}
void _import(String? path) {
if (path == null) {
ToastService.showWarning(context, 'U盘路径无效');
return;
}
ToastService.showInfo(context, '正在导入程序...');
// TODO: 接入 program_import_service 实现真正的导入流程
}
Widget _bullet(String text) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 6, right: 8),
child: Container(
width: 4,
height: 4,
decoration: BoxDecoration(
color: AppTheme.primaryColor,
shape: BoxShape.circle,
),
),
),
Expanded(
child: Text(
text,
style: TextStyle(
color: AppTheme.textSecondary,
fontSize: 13,
height: 1.5,
),
),
),
],
),
);
}
}
/// 监听 USB 状态变化的 Riverpod StreamProvider
final _usbStateProvider = StreamProvider<UsbState>((ref) {
return UsbDetectionService.instance.stateStream;
});