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

@@ -91,7 +91,18 @@ class HomeV2Bloc extends Bloc<HomeV2Event, HomeV2State> {
if (state is HomeV2Loaded) {
final currentState = state as HomeV2Loaded;
final user = appUserCubit.state.user;
if (user == null) {
emit(const HomeV2Error(
message: '用户未登录',
shouldShowError: true,
));
return;
}
// 并行刷新首页数据和电站列表
final homeResult = await getHomeDataUseCase(const NoParams());
final siteResult = await getSiteListUseCase(user.orgId);
homeResult.fold(
(failure) => emit(HomeV2Error(
@@ -99,11 +110,38 @@ class HomeV2Bloc extends Bloc<HomeV2Event, HomeV2State> {
shouldShowError: true, // 🔥 标记需要显示弹窗
)),
(homeData) {
List<SiteEntity> sites = currentState.sites;
SiteEntity? selectedSite = currentState.selectedSite;
siteResult.fold(
(failure) {
print('刷新场站列表失败: ${failure.message}');
},
(siteList) {
sites = siteList;
// 保持当前选中的场站
final savedSelectedSite = siteCubit.state.selectedSite;
if (savedSelectedSite != null && siteList.isNotEmpty) {
selectedSite = siteList.firstWhere(
(site) => site.id == savedSelectedSite.id,
orElse: () => siteList.first,
);
} else if (siteList.isNotEmpty) {
selectedSite = siteList.first;
}
// 更新全局 SiteCubit 的选中状态
if (selectedSite != null) {
siteCubit.selectSite(selectedSite!);
}
},
);
emit(HomeV2Loaded(
homeData: homeData,
trendType: currentState.trendType,
sites: currentState.sites,
selectedSite: currentState.selectedSite,
sites: sites,
selectedSite: selectedSite,
));
},
);

View File

@@ -25,7 +25,7 @@ class HomeV2Loaded extends HomeV2State {
const HomeV2Loaded({
required this.homeData,
this.trendType = 'kW',
this.trendType = 'day',
this.sites = const [],
this.selectedSite,
});

View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:get_it/get_it.dart';
import 'package:maibu_satabot_v2/core/di/injection.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/v2/home/presentation/bloc/home_v2_bloc.dart';
import 'package:maibu_satabot_v2/features/v2/home/presentation/bloc/home_v2_event.dart';
import 'package:maibu_satabot_v2/features/v2/home/presentation/bloc/home_v2_state.dart';
@@ -53,10 +54,23 @@ class _HomeV2PageState extends State<HomeV2Page> {
}
},
builder: (context, state) {
// 🔥 错误状态不再显示全屏错误页面,而是通过 listener 显示 SnackBar
// 🔥 错误状态显示重试按钮
if (state is HomeV2Error) {
// 返回空容器保持页面
return const SizedBox.shrink();
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.error_outline, size: 48, color: Colors.orange),
const SizedBox(height: 12),
Text(state.message, style: const TextStyle(fontSize: 14, color: Colors.grey)),
const SizedBox(height: 16),
ElevatedButton(
onPressed: () => _bloc.add(const HomeV2LoadData()),
child: const Text('重试'),
),
],
),
);
}
if (state is HomeV2Loaded) {
@@ -92,7 +106,11 @@ class _HomeV2PageState extends State<HomeV2Page> {
sl<SiteCubit>().state;
return Text(
siteState.selectedSite?.siteName ??
'选择电站',
AppLocalizations.of(
context,
).translate(
'home_v2.select_site',
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
@@ -149,9 +167,11 @@ class _HomeV2PageState extends State<HomeV2Page> {
color: Color(0xFF165DFF),
),
const SizedBox(width: 6),
const Text(
'多云 28°C',
style: TextStyle(
Text(
AppLocalizations.of(
context,
).translate('home_v2.weather'),
style: const TextStyle(
fontSize: 13,
color: Color(0xFF4E5969),
),
@@ -180,10 +200,12 @@ class _HomeV2PageState extends State<HomeV2Page> {
color: Color(0xFFF53F3F),
),
const SizedBox(width: 6),
const Expanded(
Expanded(
child: Text(
'紧急告警',
style: TextStyle(
AppLocalizations.of(
context,
).translate('home_v2.emergency_alarm'),
style: const TextStyle(
fontSize: 13,
color: Color(0xFFF53F3F),
),
@@ -229,7 +251,8 @@ class _HomeV2PageState extends State<HomeV2Page> {
);
}
return const SizedBox();
// 🔥 Initial/Loading 状态显示加载指示器
return const Center(child: CircularProgressIndicator(color: Color(0xFF165DFF)));
},
),
);
@@ -256,9 +279,13 @@ class _HomeV2PageState extends State<HomeV2Page> {
final sites = currentState.sites;
if (sites.isEmpty) {
ScaffoldMessenger.of(
context,
).showSnackBar(const SnackBar(content: Text('暂无可用电站')));
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
AppLocalizations.of(context).translate('home_v2.no_sites'),
),
),
);
return;
}
@@ -282,9 +309,11 @@ class _HomeV2PageState extends State<HomeV2Page> {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text(
'选择电站',
style: TextStyle(
Text(
AppLocalizations.of(
context,
).translate('home_v2.select_site'),
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
@@ -303,7 +332,11 @@ class _HomeV2PageState extends State<HomeV2Page> {
title: Text(site.siteName),
subtitle:
site.siteCode != null && site.siteCode!.isNotEmpty
? Text('编号: ${site.siteCode}')
? Text(
AppLocalizations.of(context)
.translate('home_v2.site_code')
.replaceAll('%s', site.siteCode!),
)
: null,
trailing: isSelected
? const Icon(
@@ -347,11 +380,9 @@ class _HomeV2PageState extends State<HomeV2Page> {
builder: (BuildContext context) {
return MultiBlocProvider(
providers: [
BlocProvider.value(value: context.read<DeviceStatusBloc>()),
BlocProvider.value(
value: context.read<DeviceStatusBloc>(),
),
BlocProvider.value(
value: GetIt.I<RemoteControlCubit>(), // 🔥 注入 RemoteControlCubit
value: GetIt.I<RemoteControlCubit>(), // 🔥 注入 RemoteControlCubit
),
],
child: const DeviceStatusModal(),

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/home/domain/entities/home_entity.dart';
class PlantOverviewCard extends StatelessWidget {
@@ -11,9 +12,9 @@ class PlantOverviewCard extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'电站概况',
style: TextStyle(
Text(
AppLocalizations.of(context).translate('home_v2.plant_overview'),
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
@@ -42,10 +43,7 @@ class PlantOverviewCard extends StatelessWidget {
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Colors.transparent,
Colors.black.withOpacity(0.6),
],
colors: [Colors.transparent, Colors.black.withOpacity(0.6)],
),
),
child: Padding(
@@ -57,47 +55,66 @@ class PlantOverviewCard extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'装机容量',
style: TextStyle(
color: Colors.white70,
fontSize: 12,
Flexible(
flex: 1,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
AppLocalizations.of(
context,
).translate('home_v2.installed_capacity'),
style: const TextStyle(
color: Colors.white70,
fontSize: 12,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(height: 4),
Text(
'${overview.installedCapacity} MWp',
style: const TextStyle(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.bold,
const SizedBox(height: 4),
Text(
'${overview.installedCapacity} MWp',
style: const TextStyle(
color: Colors.white,
fontSize: 20,
fontWeight: FontWeight.bold,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
],
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
const Text(
'投运日期',
style: TextStyle(
color: Colors.white70,
fontSize: 12,
const SizedBox(width: 16),
Flexible(
flex: 1,
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
AppLocalizations.of(
context,
).translate('home_v2.commission_date'),
style: const TextStyle(
color: Colors.white70,
fontSize: 12,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(height: 4),
Text(
overview.commissionDate,
style: const TextStyle(
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w500,
const SizedBox(height: 4),
Text(
overview.commissionDate,
style: const TextStyle(
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w500,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
],
],
),
),
],
),

View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:fl_chart/fl_chart.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/entities/home_entity.dart';
class PowerCard extends StatelessWidget {
@@ -40,12 +41,11 @@ class PowerCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Text(
'实时发电功率',
style: TextStyle(
color: Colors.white,
fontSize: 14,
),
Text(
AppLocalizations.of(
context,
).translate('home_v2.real_time_power'),
style: const TextStyle(color: Colors.white, fontSize: 14),
),
const SizedBox(height: 4),
Row(
@@ -68,10 +68,7 @@ class PowerCard extends StatelessWidget {
padding: EdgeInsets.only(bottom: 4),
child: Text(
'kW',
style: TextStyle(
color: Colors.white,
fontSize: 14,
),
style: TextStyle(color: Colors.white, fontSize: 14),
),
),
],
@@ -86,7 +83,11 @@ class PowerCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
icon: const Icon(Icons.more_horiz, size: 20, color: Colors.white),
icon: const Icon(
Icons.more_horiz,
size: 20,
color: Colors.white,
),
onPressed: () => print('点击更多'),
padding: EdgeInsets.zero,
constraints: const BoxConstraints(),

View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:fl_chart/fl_chart.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/entities/home_entity.dart';
class PowerTrendChart extends StatelessWidget {
@@ -22,9 +23,9 @@ class PowerTrendChart extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
'发电趋势(今日)',
style: TextStyle(
Text(
AppLocalizations.of(context).translate('home_v2.power_trend'),
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
@@ -38,8 +39,14 @@ class PowerTrendChart extends StatelessWidget {
),
child: Row(
children: [
_buildTypeButton('kW'),
_buildTypeButton('周'),
_buildTypeButton(
'day',
AppLocalizations.of(context).translate('home_v2.day'),
),
_buildTypeButton(
'month',
AppLocalizations.of(context).translate('home_v2.month'),
),
],
),
),
@@ -88,7 +95,11 @@ class PowerTrendChart extends StatelessWidget {
interval: 6,
getTitlesWidget: (value, meta) {
final index = value.toInt();
if (index == 0 || index == 6 || index == 12 || index == 18 || index == 23) {
if (index == 0 ||
index == 6 ||
index == 12 ||
index == 18 ||
index == 23) {
String time;
if (index == 23) {
time = '23:00';
@@ -174,7 +185,7 @@ class PowerTrendChart extends StatelessWidget {
);
}
Widget _buildTypeButton(String type) {
Widget _buildTypeButton(String type, String label) {
final isSelected = trendType == type;
return GestureDetector(
onTap: () => onToggleType(type),
@@ -187,7 +198,7 @@ class PowerTrendChart extends StatelessWidget {
),
alignment: Alignment.center,
child: Text(
type,
label,
style: TextStyle(
color: isSelected ? Colors.white : const Color(0xFF86909C),
fontSize: 14,

View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:maibu_satabot_v2/core/localization/app_localizations.dart';
class QuickEntryCard extends StatelessWidget {
const QuickEntryCard({super.key});
@@ -11,9 +12,9 @@ class QuickEntryCard extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
'快捷入口',
style: TextStyle(
Text(
AppLocalizations.of(context).translate('home_v2.quick_entry'),
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
@@ -36,32 +37,44 @@ class QuickEntryCard extends StatelessWidget {
children: [
_buildQuickEntryCard(
icon: Icons.upload_file,
label: '设备上报',
label: AppLocalizations.of(
context,
).translate('home_v2.device_report'),
),
const SizedBox(width: 8),
_buildQuickEntryCard(
icon: Icons.qr_code_scanner,
label: '扫一扫',
label: AppLocalizations.of(
context,
).translate('home_v2.scan_qr'),
),
const SizedBox(width: 8),
_buildQuickEntryCard(
icon: Icons.assignment,
label: '工单任务',
label: AppLocalizations.of(
context,
).translate('home_v2.work_order'),
),
const SizedBox(width: 8),
_buildQuickEntryCard(
icon: Icons.notifications_active,
label: '告警中心',
label: AppLocalizations.of(
context,
).translate('home_v2.alarm_center'),
),
const SizedBox(width: 8),
_buildQuickEntryCard(
icon: Icons.map,
label: '电厂地图',
label: AppLocalizations.of(
context,
).translate('home_v2.power_plant_map'),
),
const SizedBox(width: 8),
_buildQuickEntryCard(
icon: Icons.devices,
label: '设备列表',
label: AppLocalizations.of(
context,
).translate('home_v2.device_list'),
),
const SizedBox(width: 8),
],
@@ -71,10 +84,7 @@ class QuickEntryCard extends StatelessWidget {
);
}
Widget _buildQuickEntryCard({
required IconData icon,
required String label,
}) {
Widget _buildQuickEntryCard({required IconData icon, required String label}) {
return InkWell(
onTap: () => print('点击:$label'),
borderRadius: BorderRadius.circular(12),
@@ -97,11 +107,7 @@ class QuickEntryCard extends StatelessWidget {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
icon,
color: const Color(0xFF165DFF),
size: 26,
),
Icon(icon, color: const Color(0xFF165DFF), size: 26),
const SizedBox(height: 6),
Text(
label,

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/home/domain/entities/home_entity.dart';
class StatsGrid extends StatelessWidget {
@@ -18,21 +19,25 @@ class StatsGrid extends StatelessWidget {
padding: EdgeInsets.zero,
children: [
_buildStatCard(
title: '今日发电量',
title: AppLocalizations.of(
context,
).translate('home_v2.today_generation'),
value: _formatNumber(data.todayGeneration),
unit: 'kWh',
valueColor: const Color(0xFF00B42A),
showArrow: false,
),
_buildStatCard(
title: '等效小时数',
title: AppLocalizations.of(
context,
).translate('home_v2.equivalent_hours'),
value: data.equivalentHours.toStringAsFixed(1),
unit: 'h',
valueColor: const Color(0xFF165DFF),
showArrow: false,
),
_buildAlarmCard(data.alarmCount),
_buildWorkOrderCard(data.pendingWorkOrders),
_buildAlarmCard(context, data.alarmCount),
_buildWorkOrderCard(context, data.pendingWorkOrders),
],
);
}
@@ -81,10 +86,7 @@ class StatsGrid extends StatelessWidget {
else
Text(
title,
style: const TextStyle(
color: Color(0xFF4E5969),
fontSize: 14,
),
style: const TextStyle(color: Color(0xFF4E5969), fontSize: 14),
),
const Spacer(),
Row(
@@ -101,10 +103,7 @@ class StatsGrid extends StatelessWidget {
const SizedBox(width: 4),
Text(
unit,
style: const TextStyle(
color: Color(0xFF4E5969),
fontSize: 14,
),
style: const TextStyle(color: Color(0xFF4E5969), fontSize: 14),
),
],
),
@@ -113,7 +112,7 @@ class StatsGrid extends StatelessWidget {
);
}
Widget _buildAlarmCard(int count) {
Widget _buildAlarmCard(BuildContext context, int count) {
return Container(
padding: const EdgeInsets.fromLTRB(12, 0, 12, 12),
decoration: BoxDecoration(
@@ -134,12 +133,14 @@ class StatsGrid extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Text(
'告警数',
style: TextStyle(
Text(
AppLocalizations.of(context).translate('home_v2.alarm_count'),
style: const TextStyle(
color: Color(0xFFF53F3F),
fontSize: 13,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 4),
Text(
@@ -171,7 +172,7 @@ class StatsGrid extends StatelessWidget {
);
}
Widget _buildWorkOrderCard(int count) {
Widget _buildWorkOrderCard(BuildContext context, int count) {
return Container(
padding: const EdgeInsets.fromLTRB(12, 0, 12, 12),
decoration: BoxDecoration(
@@ -192,12 +193,16 @@ class StatsGrid extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Text(
'待办工单',
style: TextStyle(
Text(
AppLocalizations.of(
context,
).translate('home_v2.pending_work_order'),
style: const TextStyle(
color: Color(0xFF4E5969),
fontSize: 13,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 4),
Text(

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/home/domain/entities/home_entity.dart';
class WorkOrderCard extends StatelessWidget {
@@ -14,9 +15,11 @@ class WorkOrderCard extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
'待办工单',
style: TextStyle(
Text(
AppLocalizations.of(
context,
).translate('home_v2.pending_work_order'),
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
@@ -34,7 +37,9 @@ class WorkOrderCard extends StatelessWidget {
children: [
Expanded(
child: _buildWorkOrderCard(
title: '待处理',
title: AppLocalizations.of(
context,
).translate('home_v2.work_order_pending'),
count: stats.pending,
color: const Color(0xFFF53F3F),
bgColor: Colors.white,
@@ -43,7 +48,9 @@ class WorkOrderCard extends StatelessWidget {
const SizedBox(width: 8),
Expanded(
child: _buildWorkOrderCard(
title: '处理中',
title: AppLocalizations.of(
context,
).translate('home_v2.work_order_processing'),
count: stats.processing,
color: const Color(0xFFFF7D00),
bgColor: const Color(0xFFFFF7E6),
@@ -52,7 +59,9 @@ class WorkOrderCard extends StatelessWidget {
const SizedBox(width: 8),
Expanded(
child: _buildWorkOrderCard(
title: '待验收',
title: AppLocalizations.of(
context,
).translate('home_v2.work_order_pending_acceptance'),
count: stats.pendingAcceptance,
color: const Color(0xFF1D2129),
bgColor: Colors.white,
@@ -70,36 +79,31 @@ class WorkOrderCard extends StatelessWidget {
required Color color,
required Color bgColor,
}) {
return InkWell(
onTap: () {
// TODO: 点击跳转逻辑
},
borderRadius: BorderRadius.circular(12),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 16),
decoration: BoxDecoration(
color: bgColor,
borderRadius: BorderRadius.circular(12),
boxShadow: const [
BoxShadow(
color: Color(0x0D000000),
blurRadius: 4,
offset: Offset(0, 2),
),
],
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
return Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 16),
decoration: BoxDecoration(
color: bgColor,
borderRadius: BorderRadius.circular(12),
boxShadow: const [
BoxShadow(
color: Color(0x0D000000),
blurRadius: 4,
offset: Offset(0, 2),
),
],
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
title,
style: TextStyle(
color: color,
fontSize: 13,
),
style: TextStyle(color: color, fontSize: 13),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 8),
Text(
@@ -112,13 +116,13 @@ class WorkOrderCard extends StatelessWidget {
),
],
),
Icon(
Icons.arrow_forward_ios,
size: 14,
color: color.withOpacity(0.5),
),
],
),
),
Icon(
Icons.arrow_forward_ios,
size: 14,
color: color.withOpacity(0.5),
),
],
),
);
}