一次大的提交
This commit is contained in:
@@ -43,27 +43,37 @@ class DeviceStatusBloc extends Bloc<DeviceStatusEvent, DeviceStatusState> {
|
||||
DeviceStatusRefresh event,
|
||||
Emitter<DeviceStatusState> emit,
|
||||
) async {
|
||||
if (state is DeviceStatusLoaded) {
|
||||
final currentState = state as DeviceStatusLoaded;
|
||||
// 🔥 切换电站时,即便当前是 Loading/Initial 也需要重新拉取
|
||||
final currentSiteId = (state is DeviceStatusLoaded)
|
||||
? (state as DeviceStatusLoaded).siteId
|
||||
: null;
|
||||
final targetSiteId = event.siteId ?? currentSiteId;
|
||||
final currentSelectedType = (state is DeviceStatusLoaded)
|
||||
? (state as DeviceStatusLoaded).selectedType
|
||||
: 'all';
|
||||
|
||||
try {
|
||||
final response = await getDeviceStatusDataUseCase.execute(
|
||||
siteId: currentState.siteId,
|
||||
typeFilter: currentState.selectedType == 'all'
|
||||
? null
|
||||
: currentState.selectedType,
|
||||
);
|
||||
// 切换电站时显示 Loading,让用户感知到正在刷新
|
||||
if (event.siteId != null) {
|
||||
emit(const DeviceStatusLoading());
|
||||
}
|
||||
|
||||
emit(currentState.copyWith(
|
||||
deviceStatus: response.status,
|
||||
devices: response.devices,
|
||||
));
|
||||
} catch (e) {
|
||||
emit(DeviceStatusError(
|
||||
message: ErrorHandler.getErrorMessage(e),
|
||||
shouldShowError: true, // 🔥 标记需要显示弹窗
|
||||
));
|
||||
}
|
||||
try {
|
||||
final response = await getDeviceStatusDataUseCase.execute(
|
||||
siteId: targetSiteId,
|
||||
typeFilter: currentSelectedType == 'all' ? null : currentSelectedType,
|
||||
);
|
||||
|
||||
emit(DeviceStatusLoaded(
|
||||
deviceStatus: response.status,
|
||||
devices: response.devices,
|
||||
siteId: targetSiteId,
|
||||
selectedType: currentSelectedType,
|
||||
));
|
||||
} catch (e) {
|
||||
emit(DeviceStatusError(
|
||||
message: ErrorHandler.getErrorMessage(e),
|
||||
shouldShowError: true, // 🔥 标记需要显示弹窗
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,13 @@ class DeviceStatusLoadData extends DeviceStatusEvent {
|
||||
}
|
||||
|
||||
class DeviceStatusRefresh extends DeviceStatusEvent {
|
||||
const DeviceStatusRefresh();
|
||||
/// 可选:切换电站时传入新 siteId 重新请求;不传则用当前 state 中的 siteId
|
||||
final int? siteId;
|
||||
|
||||
const DeviceStatusRefresh({this.siteId});
|
||||
|
||||
@override
|
||||
List<Object?> get props => [siteId];
|
||||
}
|
||||
|
||||
class DeviceStatusChangeType extends DeviceStatusEvent {
|
||||
|
||||
Reference in New Issue
Block a user