1.优化补足了首页下拉刷新中对获取场站接口的加入,确保能够实时获取数据并渲染。

2.优化修改了tcp重连机制,具体操作:断开重连时候不再建立新链接 而是将旧链接重置,并重新发送数据。
3.大面积的给项目中的各个页面 手动接入了多语言的支持。同时也调整了相应带来的问题英文长度较大影响原有的样式的问题,已解决了对应的样式不和谐问题。保证了外观的统一性。
4.给项目中的主要操作加了几个核心的操作比如远程遥控和路径规划添加了双层的保护,设置里安全模式,即在此期间对服务器推送的重复登录操作后的自动退出登录做一个拦截 保证操作的安全性。
This commit is contained in:
2026-07-02 16:04:30 +08:00
parent d5a83c1221
commit 0db64a96e7
69 changed files with 5018 additions and 1532 deletions

View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter/services.dart';
import 'package:maibu_satabot_v2/core/app/app_user_cubit.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/v2/my/presentation/cubit/my_cubit.dart';
import 'package:maibu_satabot_v2/features/v2/my/presentation/states/my_state.dart';
import 'package:maibu_satabot_v2/features/v2/my/di/my_di.dart';
@@ -41,9 +42,9 @@ class _MyPageContent extends StatelessWidget {
body: BlocConsumer<MyCubit, MyState>(
listener: (context, state) {
if (state is MyError) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(state.message)),
);
ScaffoldMessenger.of(
context,
).showSnackBar(SnackBar(content: Text(state.message)));
}
},
builder: (context, state) {
@@ -57,11 +58,11 @@ class _MyPageContent extends StatelessWidget {
final cubit = context.read<MyCubit>();
final appUserState = context.watch<AppUserCubit>().state;
final user = appUserState.user;
// 获取用户信息(优先使用昵称,其次用户名)
final userName = user?.nickname ?? user?.username ?? '未知用户';
final userRole = user?.email ?? user?.phone ?? '未设置';
return Column(
children: [
// 用户信息卡片(延伸到状态栏)
@@ -96,7 +97,12 @@ class _MyPageContent extends StatelessWidget {
),
// 菜单列表(白色卡片)
Container(
margin: const EdgeInsets.only(top: 15, left: 16, right: 16, bottom: 16),
margin: const EdgeInsets.only(
top: 15,
left: 16,
right: 16,
bottom: 16,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12),
@@ -147,9 +153,7 @@ class _MyPageContent extends StatelessWidget {
// 跳转到个人信息详情页
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const ProfileDetailPage(),
),
MaterialPageRoute(builder: (context) => const ProfileDetailPage()),
);
debugPrint('✅ 已调用 Navigator.push');
break;
@@ -163,14 +167,12 @@ class _MyPageContent extends StatelessWidget {
// 跳转到系统设置页面
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const SystemSettingsPage(),
),
MaterialPageRoute(builder: (context) => const SystemSettingsPage()),
);
break;
default:
debugPrint('点击菜单: ${item.title}');
// TODO: 根据 ID 跳转到对应页面
// TODO: 根据 ID 跳转到对应页面
}
}
@@ -179,19 +181,25 @@ class _MyPageContent extends StatelessWidget {
showDialog(
context: context,
builder: (context) => AlertDialog(
title: const Text('清除缓存'),
content: const Text('确定要清除所有缓存数据吗?'),
title: Text(
AppLocalizations.of(context).translate('my_v2.clear_cache'),
),
content: Text(
AppLocalizations.of(context).translate('my_v2.confirm_clear_cache'),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('取消'),
child: Text(AppLocalizations.of(context).translate('my_v2.cancel')),
),
TextButton(
onPressed: () {
Navigator.pop(context);
cubit.clearCache();
},
child: const Text('确定'),
child: Text(
AppLocalizations.of(context).translate('my_v2.confirm'),
),
),
],
),

View File

@@ -8,6 +8,7 @@ import 'package:maibu_satabot_v2/core/router/route_paths.dart';
import 'package:maibu_satabot_v2/core/storage/user_storage.dart';
import 'package:maibu_satabot_v2/features/auth/presentation/bloc/auth_cubit.dart';
import 'package:maibu_satabot_v2/features/main_container/presentation/cubit/tab_config_cubit.dart';
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/cubit/float_bar_setting_cubit.dart';
/// 系统设置综合页面
class SystemSettingsPage extends StatefulWidget {
@@ -45,6 +46,9 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
// Tab 设置
_buildTabSettingsSection(),
const SizedBox(height: 12),
// 悬浮条设置
_buildFloatBarSection(),
const SizedBox(height: 12),
// 语言设置
_buildLanguageSection(),
const SizedBox(height: 12),
@@ -56,6 +60,65 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
);
}
/// 悬浮条设置
Widget _buildFloatBarSection() {
return Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12),
boxShadow: const [
BoxShadow(
color: Color(0x0D000000),
blurRadius: 8,
offset: Offset(0, 2),
),
],
),
child: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
AppLocalizations.of(context).translate('my_v2.suspend_bar'),
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
),
),
const SizedBox(height: 4),
Text(
AppLocalizations.of(
context,
).translate('my_v2.suspend_bar_desc'),
style: const TextStyle(
fontSize: 13,
color: Color(0xFF86909C),
),
),
],
),
),
ValueListenableBuilder<bool>(
valueListenable: FloatBarSettingService.settingNotifier,
builder: (context, isEnabled, child) {
return Switch(
value: isEnabled,
onChanged: (value) {
FloatBarSettingService.setEnabled(value);
},
activeColor: const Color(0xFF165DFF),
);
},
),
],
),
);
}
/// Tab 设置
Widget _buildTabSettingsSection() {
return Container(
@@ -74,9 +137,9 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'Tab 设置',
style: TextStyle(
Text(
AppLocalizations.of(context).translate('my_v2.tab_settings'),
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
@@ -88,9 +151,9 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
if (state.runtimeType.toString() != 'TabConfigLoaded') {
return const Center(child: CircularProgressIndicator());
}
final tabs = state.config.items;
return ListView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
@@ -164,14 +227,18 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
AppLocalizations.of(context).translate('my.chinese'),
'zh',
locale.languageCode == 'zh',
() => context.read<LocaleCubit>().setLocale(const Locale('zh', 'CN')),
() => context.read<LocaleCubit>().setLocale(
const Locale('zh', 'CN'),
),
),
const SizedBox(height: 12),
_buildLanguageOption(
AppLocalizations.of(context).translate('my.english'),
'en',
locale.languageCode == 'en',
() => context.read<LocaleCubit>().setLocale(const Locale('en', 'US')),
() => context.read<LocaleCubit>().setLocale(
const Locale('en', 'US'),
),
),
],
);
@@ -182,16 +249,25 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
);
}
Widget _buildLanguageOption(String label, String code, bool isSelected, VoidCallback onTap) {
Widget _buildLanguageOption(
String label,
String code,
bool isSelected,
VoidCallback onTap,
) {
return GestureDetector(
onTap: onTap,
child: Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: isSelected ? const Color(0xFF165DFF).withOpacity(0.1) : Colors.transparent,
color: isSelected
? const Color(0xFF165DFF).withOpacity(0.1)
: Colors.transparent,
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: isSelected ? const Color(0xFF165DFF) : const Color(0xFFE5E6EB),
color: isSelected
? const Color(0xFF165DFF)
: const Color(0xFFE5E6EB),
width: 1,
),
),
@@ -202,7 +278,9 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
label,
style: TextStyle(
fontSize: 14,
color: isSelected ? const Color(0xFF165DFF) : const Color(0xFF1D2129),
color: isSelected
? const Color(0xFF165DFF)
: const Color(0xFF1D2129),
fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
),
),
@@ -258,11 +336,13 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
context: context,
builder: (context) => AlertDialog(
title: Text(AppLocalizations.of(context).translate('login.logout')),
content: const Text('确定要退出登录吗?'),
content: Text(
AppLocalizations.of(context).translate('login.confirm_logout'),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('取消'),
child: Text(AppLocalizations.of(context).translate('my_v2.cancel')),
),
TextButton(
onPressed: () async {
@@ -275,7 +355,9 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
style: TextButton.styleFrom(
foregroundColor: const Color(0xFFF53F3F),
),
child: const Text('确定'),
child: Text(
AppLocalizations.of(context).translate('my_v2.confirm'),
),
),
],
),

View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/v2/my/domain/entities/my_entities.dart';
/// 菜单项卡片组件(100% 还原设计稿)
@@ -24,9 +25,7 @@ class MenuItemCard extends StatelessWidget {
onTap: onTap,
behavior: HitTestBehavior.opaque,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16,
),
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
// 图标
@@ -39,21 +38,27 @@ class MenuItemCard extends StatelessWidget {
// 标题
Expanded(
child: Text(
item.title,
_getLocalizedTitle(context, item),
style: const TextStyle(
fontSize: 15,
fontWeight: FontWeight.w500,
color: Color(0xFF1D2129),
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
// 副标题或开关
if (item.subTitle != null) ...[
Text(
item.subTitle!,
style: const TextStyle(
fontSize: 13,
color: Color(0xFF86909C),
Flexible(
child: Text(
item.subTitle!,
style: const TextStyle(
fontSize: 13,
color: Color(0xFF86909C),
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(width: 6),
@@ -65,7 +70,9 @@ class MenuItemCard extends StatelessWidget {
value: item.switchValue,
onChanged: onSwitchChanged,
activeColor: const Color(0xFF165DFF),
activeTrackColor: const Color(0xFF165DFF).withOpacity(0.3),
activeTrackColor: const Color(
0xFF165DFF,
).withOpacity(0.3),
inactiveThumbColor: const Color(0xFFC9CDD4),
inactiveTrackColor: const Color(0xFFE5E6EB),
),
@@ -115,4 +122,25 @@ class MenuItemCard extends StatelessWidget {
return Icons.label_outline;
}
}
String _getLocalizedTitle(BuildContext context, MenuItemEntity item) {
switch (item.id) {
case 'personal_info':
return AppLocalizations.of(context).translate('my_v2.personal_info');
case 'message_settings':
return AppLocalizations.of(context).translate('my_v2.message_settings');
case 'offline_cache':
return AppLocalizations.of(context).translate('my_v2.offline_cache');
case 'night_mode':
return AppLocalizations.of(context).translate('my_v2.night_mode');
case 'system_settings':
return AppLocalizations.of(context).translate('my_v2.system_settings');
case 'help_feedback':
return AppLocalizations.of(context).translate('my_v2.help_feedback');
case 'about_us':
return AppLocalizations.of(context).translate('my_v2.about_us');
default:
return item.title;
}
}
}

View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/v2/my/presentation/constants/my_constants.dart';
/// 快捷入口卡片组件(我的消息、我的收藏、我的工单)
@@ -36,32 +37,24 @@ class QuickActionCard extends StatelessWidget {
// 我的消息
_buildQuickActionItem(
icon: Icons.notifications_outlined,
label: '我的消息',
label: AppLocalizations.of(context).translate('my_v2.message'),
onTap: onMessageTap,
showBadge: true,
),
// 分割线
Container(
width: 1,
height: 40,
color: const Color(0xFFF0F0F0),
),
Container(width: 1, height: 40, color: const Color(0xFFF0F0F0)),
// 我的收藏
_buildQuickActionItem(
icon: Icons.favorite_border,
label: '我的收藏',
label: AppLocalizations.of(context).translate('my_v2.favorite'),
onTap: onFavoriteTap,
),
// 分割线
Container(
width: 1,
height: 40,
color: const Color(0xFFF0F0F0),
),
Container(width: 1, height: 40, color: const Color(0xFFF0F0F0)),
// 我的工单
_buildQuickActionItem(
icon: Icons.assignment_outlined,
label: '我的工单',
label: AppLocalizations.of(context).translate('my_v2.work_order'),
onTap: onWorkOrderTap,
),
],
@@ -79,18 +72,14 @@ class QuickActionCard extends StatelessWidget {
onTap: onTap,
behavior: HitTestBehavior.opaque,
child: SizedBox(
width: 80,
width: 90,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Stack(
clipBehavior: Clip.none,
children: [
Icon(
icon,
size: 24,
color: MyColors.primary,
),
Icon(icon, size: 24, color: MyColors.primary),
if (showBadge)
Positioned(
right: -4,
@@ -113,6 +102,9 @@ class QuickActionCard extends StatelessWidget {
fontSize: 13,
color: MyColors.textSecondary,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
],
),