退出登陆的重新设计到我的页面;优化高清地图的加载和显示(冷启动稍慢,再次秒开);声网通用组件遗漏文件;

This commit is contained in:
2026-09-10 09:02:23 +08:00
parent b4bedd9737
commit 85e9632326
6 changed files with 276 additions and 90 deletions

View File

@@ -17,6 +17,7 @@ import 'package:maibu_satabot_v2/features/v2/home/presentation/widgets/power_tre
import 'package:maibu_satabot_v2/features/v2/home/presentation/widgets/plant_overview_card.dart';
import 'package:maibu_satabot_v2/features/v2/home/presentation/widgets/tcp_status_indicator.dart';
import 'package:maibu_satabot_v2/components/device_status_modal.dart';
import 'package:maibu_satabot_v2/components/agora_video_player.dart';
import 'package:maibu_satabot_v2/features/devices/presentation/bloc/device_status_bloc.dart';
import '../../../../remote_control/presentation/bloc/remote_control_cubit.dart';
@@ -31,6 +32,14 @@ class HomeV2Page extends StatefulWidget {
class _HomeV2PageState extends State<HomeV2Page> {
late HomeV2Bloc _bloc;
// ===== 电站实时视频(声网)默认测试配置 =====
// 弹窗打开就用这组值自动开播,输入框仍保留,可随时改完点「重新加载」
// TODO: 接口对接后改为后端下发的真实值
static const String _agoraAppId = '875f6494d87548e783fefbf33f598c97';
static const String _agoraChannel = '36test-01';
static const String _agoraToken =
'007eJxTYLhsYtaz3e2gTMKZ27JzrOs/KB3OTFaYKfGX2+/Y6zem5TMUGCzMTdPMTCxNUoAME4tUcwvjtNS0pDRj4zRTS4tkS3P55PlZDYGMDGsfyTEyMkAgiM/JYGxWklpcomtgyMAAAN9rIEI=';
@override
void initState() {
super.initState();
@@ -203,6 +212,7 @@ class _HomeV2PageState extends State<HomeV2Page> {
const SizedBox(height: 10),
PlantOverviewCard(
overview: state.homeData.plantOverview,
onTap: _showPlantVideo,
),
const SizedBox(height: 10),
WorkOrderCard(stats: state.homeData.workOrderStats),
@@ -247,6 +257,19 @@ class _HomeV2PageState extends State<HomeV2Page> {
}
}
/// 点击「电站概览」卡片 → 弹出声网视频组件
///
/// 默认带上测试配置自动开播,同时保留三个输入框可手动修改
void _showPlantVideo() {
AgoraVideoPlayer.showManualInput(
context,
title: '电站实时视频',
initialAppId: _agoraAppId,
initialChannelId: _agoraChannel,
initialToken: _agoraToken,
);
}
void _showPlantSelector() {
if (_bloc.state is! HomeV2Loaded) return;

View File

@@ -6,10 +6,21 @@ import 'package:maibu_satabot_v2/features/v2/home/domain/entities/home_entity.da
class PlantOverviewCard extends StatelessWidget {
final PlantOverview overview;
const PlantOverviewCard({super.key, required this.overview});
/// 点击整张卡片的回调(如弹出电站实时视频)
final VoidCallback? onTap;
const PlantOverviewCard({super.key, required this.overview, this.onTap});
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
behavior: HitTestBehavior.opaque,
child: _buildContent(context),
);
}
Widget _buildContent(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [

View File

@@ -53,12 +53,13 @@ class MyRemoteDataSourceImpl implements MyRemoteDataSource {
title: '帮助与反馈',
icon: 'help',
),
MenuItemModel(
id: 'about_us',
title: '关于我们',
icon: 'info',
subTitle: 'V1.0.1',
),
// 关于我们(已注释掉,其位置由“退出登录”占用)
// MenuItemModel(
// id: 'about_us',
// title: '关于我们',
// icon: 'info',
// subTitle: 'V1.0.1',
// ),
];
}

View File

@@ -1,10 +1,15 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter/services.dart';
import 'package:get_it/get_it.dart';
import 'package:go_router/go_router.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/core/router/route_paths.dart';
import 'package:maibu_satabot_v2/core/storage/user_storage.dart';
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
import 'package:maibu_satabot_v2/core/theme/theme_cubit.dart';
import 'package:maibu_satabot_v2/features/auth/presentation/bloc/auth_cubit.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';
@@ -125,8 +130,13 @@ class _MyPageContent extends StatelessWidget {
child: ListView.builder(
shrinkWrap: true,
padding: EdgeInsets.zero,
itemCount: state.menuItems.length,
// 末尾追加退出登录,占据“关于我们”原来的位置
itemCount: state.menuItems.length + 1,
itemBuilder: (context, index) {
// 退出登录(列表最后一项,在可滚动区域内避免底部溢出)
if (index == state.menuItems.length) {
return _buildLogoutButton(context);
}
final item = state.menuItems[index];
// 🔥 夜间模式开关值以全局 ThemeCubit 状态为准
final displayItem = item.id == 'night_mode'
@@ -221,4 +231,61 @@ class _MyPageContent extends StatelessWidget {
),
);
}
/// 退出登录(作为菜单列表最后一项,占据“关于我们”原来的位置)
Widget _buildLogoutButton(BuildContext context) {
return GestureDetector(
onTap: () {
_showLogoutDialog(context);
},
behavior: HitTestBehavior.opaque,
child: SizedBox(
height: 56,
child: Center(
child: Text(
AppLocalizations.of(context).translate('login.logout'),
style: const TextStyle(
fontSize: 15,
fontWeight: FontWeight.w500,
color: Color(0xFFF53F3F),
),
),
),
),
);
}
/// 显示退出登录确认对话框
void _showLogoutDialog(BuildContext context) {
showDialog(
context: context,
builder: (context) => AlertDialog(
title: Text(AppLocalizations.of(context).translate('login.logout')),
content: Text(
AppLocalizations.of(context).translate('login.confirm_logout'),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context).translate('my_v2.cancel')),
),
TextButton(
onPressed: () async {
Navigator.pop(context);
// 执行退出登录逻辑
await GetIt.I<UserStorage>().deleteUser();
GetIt.I<AuthCubit>().logout();
context.go(RoutePaths.login);
},
style: TextButton.styleFrom(
foregroundColor: const Color(0xFFF53F3F),
),
child: Text(
AppLocalizations.of(context).translate('my_v2.confirm'),
),
),
],
),
);
}
}

View File

@@ -77,9 +77,9 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
// 版本更新
_buildUpdateSection(),
const SizedBox(height: 12),
// 退出登录
_buildLogoutButton(context),
const SizedBox(height: 20),
// 退出登录(已挪至“我的”页面最下边,此处注释掉)
// _buildLogoutButton(context),
// const SizedBox(height: 20),
],
),
);
@@ -421,70 +421,70 @@ class _SystemSettingsPageState extends State<SystemSettingsPage> {
);
}
/// 退出登录按钮
Widget _buildLogoutButton(BuildContext context) {
return GestureDetector(
onTap: () {
_showLogoutDialog(context);
},
child: Container(
padding: const EdgeInsets.symmetric(vertical: 16),
decoration: BoxDecoration(
color: context.appColors.cardBackground,
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: context.appColors.cardShadow,
blurRadius: 8,
offset: Offset(0, 2),
),
],
),
child: Center(
child: Text(
AppLocalizations.of(context).translate('login.logout'),
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Color(0xFFF53F3F),
),
),
),
),
);
}
/// 退出登录按钮(已挪至“我的”页面最下边,此处注释掉)
// Widget _buildLogoutButton(BuildContext context) {
// return GestureDetector(
// onTap: () {
// _showLogoutDialog(context);
// },
// child: Container(
// padding: const EdgeInsets.symmetric(vertical: 16),
// decoration: BoxDecoration(
// color: context.appColors.cardBackground,
// borderRadius: BorderRadius.circular(12),
// boxShadow: [
// BoxShadow(
// color: context.appColors.cardShadow,
// blurRadius: 8,
// offset: Offset(0, 2),
// ),
// ],
// ),
// child: Center(
// child: Text(
// AppLocalizations.of(context).translate('login.logout'),
// style: const TextStyle(
// fontSize: 16,
// fontWeight: FontWeight.w500,
// color: Color(0xFFF53F3F),
// ),
// ),
// ),
// ),
// );
// }
/// 显示退出登录确认对话框
void _showLogoutDialog(BuildContext context) {
showDialog(
context: context,
builder: (context) => AlertDialog(
title: Text(AppLocalizations.of(context).translate('login.logout')),
content: Text(
AppLocalizations.of(context).translate('login.confirm_logout'),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: Text(AppLocalizations.of(context).translate('my_v2.cancel')),
),
TextButton(
onPressed: () async {
Navigator.pop(context);
// 执行退出登录逻辑
await GetIt.I<UserStorage>().deleteUser();
GetIt.I<AuthCubit>().logout();
context.go(RoutePaths.login);
},
style: TextButton.styleFrom(
foregroundColor: const Color(0xFFF53F3F),
),
child: Text(
AppLocalizations.of(context).translate('my_v2.confirm'),
),
),
],
),
);
}
/// 显示退出登录确认对话框(已挪至“我的”页面最下边,此处注释掉)
// void _showLogoutDialog(BuildContext context) {
// showDialog(
// context: context,
// builder: (context) => AlertDialog(
// title: Text(AppLocalizations.of(context).translate('login.logout')),
// content: Text(
// AppLocalizations.of(context).translate('login.confirm_logout'),
// ),
// actions: [
// TextButton(
// onPressed: () => Navigator.pop(context),
// child: Text(AppLocalizations.of(context).translate('my_v2.cancel')),
// ),
// TextButton(
// onPressed: () async {
// Navigator.pop(context);
// // 执行退出登录逻辑
// await GetIt.I<UserStorage>().deleteUser();
// GetIt.I<AuthCubit>().logout();
// context.go(RoutePaths.login);
// },
// style: TextButton.styleFrom(
// foregroundColor: const Color(0xFFF53F3F),
// ),
// child: Text(
// AppLocalizations.of(context).translate('my_v2.confirm'),
// ),
// ),
// ],
// ),
// );
// }
}