修复版本管理整包更新无法弹出的问题

完成集成新的登录接口的更换使用
完成集成用户的场站列表接口
完成开发设计选择场站项为全局属性
完成我的页面的个人信息的集成和详情页面的开发
完成设备页面的中无人机机场的列表接口对接入和个项页面的布局的优化
完成设备页面的中无人机机场的详情接口的对接和使用和页面的更新布局
This commit is contained in:
2026-05-29 14:13:34 +08:00
parent 938aac2db9
commit 335c468aac
23 changed files with 1294 additions and 705 deletions

View File

@@ -1,12 +1,19 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:maibu_satabot_v2/core/app/app_user_cubit.dart';
import 'package:maibu_satabot_v2/features/v2/site/presentation/cubit/site_cubit.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/entities/site_entity.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/usecases/get_home_data_usecase.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/usecases/get_site_list_usecase.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';
class HomeV2Bloc extends Bloc<HomeV2Event, HomeV2State> {
final GetHomeDataUseCase getHomeDataUseCase;
final GetSiteListUseCase getSiteListUseCase;
final AppUserCubit appUserCubit;
final SiteCubit siteCubit;
HomeV2Bloc(this.getHomeDataUseCase) : super(const HomeV2Initial()) {
HomeV2Bloc(this.getHomeDataUseCase, this.getSiteListUseCase, this.appUserCubit, this.siteCubit) : super(const HomeV2Initial()) {
on<HomeV2LoadData>(_onLoadData);
on<HomeV2Refresh>(_onRefresh);
on<HomeV2ToggleTrendType>(_onToggleTrendType);
@@ -18,11 +25,55 @@ class HomeV2Bloc extends Bloc<HomeV2Event, HomeV2State> {
) async {
emit(const HomeV2Loading());
final result = await getHomeDataUseCase(const NoParams());
final user = appUserCubit.state.user;
if (user == null) {
emit(const HomeV2Error('用户未登录'));
return;
}
result.fold(
// 并行加载首页数据和场站列表
final homeResult = await getHomeDataUseCase(const NoParams());
final siteResult = await getSiteListUseCase(user.orgId); // 使用用户的 orgId
homeResult.fold(
(failure) => emit(HomeV2Error(failure.message)),
(data) => emit(HomeV2Loaded(homeData: data)),
(homeData) {
List<SiteEntity> sites = [];
SiteEntity? selectedSite;
siteResult.fold(
(failure) {
print('加载场站列表失败: ${failure.message}');
},
(siteList) {
sites = siteList;
// 从全局 SiteCubit 获取之前选中的场站
final savedSelectedSite = siteCubit.state.selectedSite;
// 尝试找到之前选中的场站
if (savedSelectedSite != null && siteList.isNotEmpty) {
selectedSite = siteList.firstWhere(
(site) => site.id == savedSelectedSite.id,
orElse: () => siteList.first,
);
} else {
// 没有选中过,默认选中第一个
selectedSite = siteList.isNotEmpty ? siteList.first : null;
}
// 更新全局 SiteCubit 的选中状态
if (selectedSite != null) {
siteCubit.selectSite(selectedSite!);
}
},
);
emit(HomeV2Loaded(
homeData: homeData,
sites: sites,
selectedSite: selectedSite,
));
},
);
}
@@ -31,14 +82,20 @@ class HomeV2Bloc extends Bloc<HomeV2Event, HomeV2State> {
Emitter<HomeV2State> emit,
) async {
if (state is HomeV2Loaded) {
final result = await getHomeDataUseCase(const NoParams());
final currentState = state as HomeV2Loaded;
final homeResult = await getHomeDataUseCase(const NoParams());
result.fold(
homeResult.fold(
(failure) => emit(HomeV2Error(failure.message)),
(data) => emit(HomeV2Loaded(
homeData: data,
trendType: (state as HomeV2Loaded).trendType,
)),
(homeData) {
emit(HomeV2Loaded(
homeData: homeData,
trendType: currentState.trendType,
sites: currentState.sites,
selectedSite: currentState.selectedSite,
));
},
);
}
}

View File

@@ -1,4 +1,5 @@
import 'package:equatable/equatable.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/entities/site_entity.dart';
abstract class HomeV2Event extends Equatable {
const HomeV2Event();
@@ -23,3 +24,12 @@ class HomeV2ToggleTrendType extends HomeV2Event {
@override
List<Object?> get props => [type];
}
class HomeV2SelectSite extends HomeV2Event {
final SiteEntity site;
const HomeV2SelectSite(this.site);
@override
List<Object?> get props => [site];
}

View File

@@ -1,5 +1,6 @@
import 'package:equatable/equatable.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/entities/home_entity.dart';
import 'package:maibu_satabot_v2/features/v2/home/domain/entities/site_entity.dart';
abstract class HomeV2State extends Equatable {
const HomeV2State();
@@ -19,24 +20,32 @@ class HomeV2Loading extends HomeV2State {
class HomeV2Loaded extends HomeV2State {
final HomeEntity homeData;
final String trendType;
final List<SiteEntity> sites;
final SiteEntity? selectedSite;
const HomeV2Loaded({
required this.homeData,
this.trendType = 'kW',
this.sites = const [],
this.selectedSite,
});
HomeV2Loaded copyWith({
HomeEntity? homeData,
String? trendType,
List<SiteEntity>? sites,
SiteEntity? selectedSite,
}) {
return HomeV2Loaded(
homeData: homeData ?? this.homeData,
trendType: trendType ?? this.trendType,
sites: sites ?? this.sites,
selectedSite: selectedSite ?? this.selectedSite,
);
}
@override
List<Object?> get props => [homeData, trendType];
List<Object?> get props => [homeData, trendType, sites, selectedSite];
}
class HomeV2Error extends HomeV2State {

View File

@@ -1,8 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:maibu_satabot_v2/core/di/injection.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';
import 'package:maibu_satabot_v2/features/v2/site/presentation/cubit/site_cubit.dart';
import 'package:maibu_satabot_v2/features/v2/home/presentation/widgets/power_card.dart';
import 'package:maibu_satabot_v2/features/v2/home/presentation/widgets/stats_grid.dart';
import 'package:maibu_satabot_v2/features/v2/home/presentation/widgets/work_order_card.dart';
@@ -19,13 +21,6 @@ class HomeV2Page extends StatefulWidget {
class _HomeV2PageState extends State<HomeV2Page> {
late HomeV2Bloc _bloc;
String _selectedPlant = '示例光伏电站';
final List<String> _plantList = [
'示例光伏电站',
'一号光伏电站',
'二号光伏电站',
'三号光伏电站',
];
@override
void initState() {
@@ -82,15 +77,21 @@ class _HomeV2PageState extends State<HomeV2Page> {
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: Text(
_selectedPlant,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
),
child: StreamBuilder<SiteState>(
stream: sl<SiteCubit>().stream,
builder: (context, snapshot) {
final siteState = snapshot.data ?? sl<SiteCubit>().state;
return Text(
siteState.selectedSite?.siteName ?? '选择电站',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
),
);
},
),
),
const SizedBox(width: 4),
@@ -210,6 +211,18 @@ class _HomeV2PageState extends State<HomeV2Page> {
}
void _showPlantSelector() {
if (_bloc.state is! HomeV2Loaded) return;
final currentState = _bloc.state as HomeV2Loaded;
final sites = currentState.sites;
if (sites.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('暂无可用电站')),
);
return;
}
showModalBottomSheet(
context: context,
backgroundColor: Colors.white,
@@ -217,34 +230,60 @@ class _HomeV2PageState extends State<HomeV2Page> {
borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
),
builder: (context) {
return Container(
padding: const EdgeInsets.all(14),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text(
'选择电站',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
),
return BlocBuilder<HomeV2Bloc, HomeV2State>(
bloc: _bloc,
builder: (context, state) {
if (state is! HomeV2Loaded) return Container();
return Container(
padding: const EdgeInsets.all(14),
constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height * 0.6,
),
const SizedBox(height: 14),
..._plantList.map((plant) => ListTile(
title: Text(plant),
trailing: _selectedPlant == plant
? const Icon(Icons.check, color: Color(0xFF165DFF))
: null,
onTap: () {
setState(() {
_selectedPlant = plant;
});
Navigator.pop(context);
},
)),
],
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text(
'选择电站',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1D2129),
),
),
const SizedBox(height: 14),
Expanded(
child: ListView.builder(
shrinkWrap: true,
itemCount: state.sites.length,
itemBuilder: (context, index) {
final site = state.sites[index];
final isSelected = state.selectedSite?.id == site.id;
return ListTile(
title: Text(site.siteName),
subtitle: site.siteCode != null && site.siteCode!.isNotEmpty
? Text('编号: ${site.siteCode}')
: null,
trailing: isSelected
? const Icon(Icons.check, color: Color(0xFF165DFF))
: null,
onTap: () {
// 更新全局选中的场站
sl<SiteCubit>().selectSite(site);
Navigator.pop(context);
// 切换场站后,重新加载首页数据
_bloc.add(const HomeV2LoadData());
},
);
},
),
),
],
),
);
},
);
},
);