mirror of
https://github.com/SyncrowIOT/web.git
synced 2025-07-10 07:07:19 +00:00
Add update events for device and subspace names
implement copyWith methods in models
This commit is contained in:
@ -21,6 +21,7 @@ class DeviceManagementBloc
|
|||||||
String currentProductName = '';
|
String currentProductName = '';
|
||||||
String? currentCommunity;
|
String? currentCommunity;
|
||||||
String? currentUnitName;
|
String? currentUnitName;
|
||||||
|
String subSpaceName = '';
|
||||||
|
|
||||||
DeviceManagementBloc() : super(DeviceManagementInitial()) {
|
DeviceManagementBloc() : super(DeviceManagementInitial()) {
|
||||||
on<FetchDevices>(_onFetchDevices);
|
on<FetchDevices>(_onFetchDevices);
|
||||||
@ -31,6 +32,8 @@ class DeviceManagementBloc
|
|||||||
on<ResetFilters>(_onResetFilters);
|
on<ResetFilters>(_onResetFilters);
|
||||||
on<ResetSelectedDevices>(_onResetSelectedDevices);
|
on<ResetSelectedDevices>(_onResetSelectedDevices);
|
||||||
on<UpdateSelection>(_onUpdateSelection);
|
on<UpdateSelection>(_onUpdateSelection);
|
||||||
|
on<UpdateDeviceName>(_onUpdateDeviceName);
|
||||||
|
on<UpdateSubSpaceName>(_onUpdateSubSpaceName);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _onFetchDevices(
|
Future<void> _onFetchDevices(
|
||||||
@ -343,5 +346,100 @@ class DeviceManagementBloc
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onUpdateDeviceName(
|
||||||
|
UpdateDeviceName event, Emitter<DeviceManagementState> emit) {
|
||||||
|
_devices = _devices.map((device) {
|
||||||
|
if (device.uuid == event.deviceId) {
|
||||||
|
return device.copyWith(name: event.newName);
|
||||||
|
}
|
||||||
|
return device;
|
||||||
|
}).toList();
|
||||||
|
|
||||||
|
if (state is DeviceManagementLoaded) {
|
||||||
|
final loaded = state as DeviceManagementLoaded;
|
||||||
|
emit(DeviceManagementLoaded(
|
||||||
|
devices: _devices,
|
||||||
|
selectedIndex: loaded.selectedIndex,
|
||||||
|
onlineCount: loaded.onlineCount,
|
||||||
|
offlineCount: loaded.offlineCount,
|
||||||
|
lowBatteryCount: loaded.lowBatteryCount,
|
||||||
|
selectedDevice: loaded.selectedDevice,
|
||||||
|
isControlButtonEnabled: loaded.isControlButtonEnabled,
|
||||||
|
));
|
||||||
|
} else if (state is DeviceManagementFiltered) {
|
||||||
|
final filtered = state as DeviceManagementFiltered;
|
||||||
|
emit(DeviceManagementFiltered(
|
||||||
|
filteredDevices: _filteredDevices,
|
||||||
|
selectedIndex: filtered.selectedIndex,
|
||||||
|
onlineCount: filtered.onlineCount,
|
||||||
|
offlineCount: filtered.offlineCount,
|
||||||
|
lowBatteryCount: filtered.lowBatteryCount,
|
||||||
|
selectedDevice: filtered.selectedDevice,
|
||||||
|
isControlButtonEnabled: filtered.isControlButtonEnabled,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onUpdateSubSpaceName(
|
||||||
|
UpdateSubSpaceName event, Emitter<DeviceManagementState> emit) {
|
||||||
|
_devices = _devices.map((device) {
|
||||||
|
print('before update: ${device.subspace?.subspaceName}');
|
||||||
|
if (device.uuid == event.deviceId) {
|
||||||
|
print('Updating subspace name for device: ${device.uuid}');
|
||||||
|
print('New subspace name: ${event.newSubSpaceName}');
|
||||||
|
final updatedSubspace = device.subspace?.copyWith(
|
||||||
|
subspaceName: event.newSubSpaceName,
|
||||||
|
);
|
||||||
|
final s = device.copyWith(subspace: updatedSubspace);
|
||||||
|
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
subSpaceName = device.subspace!.subspaceName;
|
||||||
|
|
||||||
|
return device;
|
||||||
|
}).toList();
|
||||||
|
print('After update:');
|
||||||
|
for (final device in _devices) {
|
||||||
|
if (device.uuid == event.deviceId) {
|
||||||
|
print(
|
||||||
|
'Device: ${device.uuid}, subspace: ${device.subspace?.uuid}, subspaceName: ${device.subspace?.subspaceName}',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print('Subspace name updated to: $subSpaceName');
|
||||||
|
if (state is DeviceManagementLoaded) {
|
||||||
|
final loaded = state as DeviceManagementLoaded;
|
||||||
|
emit(DeviceManagementLoaded(
|
||||||
|
devices: _devices,
|
||||||
|
selectedIndex: loaded.selectedIndex,
|
||||||
|
onlineCount: loaded.onlineCount,
|
||||||
|
offlineCount: loaded.offlineCount,
|
||||||
|
lowBatteryCount: loaded.lowBatteryCount,
|
||||||
|
selectedDevice: loaded.selectedDevice,
|
||||||
|
isControlButtonEnabled: loaded.isControlButtonEnabled,
|
||||||
|
));
|
||||||
|
} else if (state is DeviceManagementFiltered) {
|
||||||
|
// final filtered = state as DeviceManagementFiltered;
|
||||||
|
// emit(DeviceManagementFiltered(
|
||||||
|
// filteredDevices: _filteredDevices,
|
||||||
|
// selectedIndex: filtered.selectedIndex,
|
||||||
|
// onlineCount: filtered.onlineCount,
|
||||||
|
// offlineCount: filtered.offlineCount,
|
||||||
|
// lowBatteryCount: filtered.lowBatteryCount,
|
||||||
|
// selectedDevice: filtered.selectedDevice,
|
||||||
|
// isControlButtonEnabled: filtered.isControlButtonEnabled,
|
||||||
|
// ));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void changeSubspaceName(
|
||||||
|
String deviceId, String newSubSpaceName, String subspaceId) {
|
||||||
|
add(UpdateSubSpaceName(
|
||||||
|
deviceId: deviceId,
|
||||||
|
newSubSpaceName: newSubSpaceName,
|
||||||
|
subspaceId: subspaceId,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
List<AllDevicesModel> get selectedDevices => _selectedDevices;
|
List<AllDevicesModel> get selectedDevices => _selectedDevices;
|
||||||
}
|
}
|
||||||
|
@ -70,3 +70,21 @@ class UpdateSelection extends DeviceManagementEvent {
|
|||||||
|
|
||||||
const UpdateSelection(this.selectedRows);
|
const UpdateSelection(this.selectedRows);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class UpdateDeviceName extends DeviceManagementEvent {
|
||||||
|
final String deviceId;
|
||||||
|
final String newName;
|
||||||
|
|
||||||
|
const UpdateDeviceName({required this.deviceId, required this.newName});
|
||||||
|
}
|
||||||
|
|
||||||
|
class UpdateSubSpaceName extends DeviceManagementEvent {
|
||||||
|
final String deviceId;
|
||||||
|
final String newSubSpaceName;
|
||||||
|
final String subspaceId;
|
||||||
|
|
||||||
|
const UpdateSubSpaceName(
|
||||||
|
{required this.deviceId,
|
||||||
|
required this.newSubSpaceName,
|
||||||
|
required this.subspaceId});
|
||||||
|
}
|
||||||
|
@ -44,4 +44,20 @@ class DeviceSubspace {
|
|||||||
static List<Map<String, dynamic>> listToJson(List<DeviceSubspace> subspaces) {
|
static List<Map<String, dynamic>> listToJson(List<DeviceSubspace> subspaces) {
|
||||||
return subspaces.map((subspace) => subspace.toJson()).toList();
|
return subspaces.map((subspace) => subspace.toJson()).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DeviceSubspace copyWith({
|
||||||
|
String? uuid,
|
||||||
|
DateTime? createdAt,
|
||||||
|
DateTime? updatedAt,
|
||||||
|
String? subspaceName,
|
||||||
|
bool? disabled,
|
||||||
|
}) {
|
||||||
|
return DeviceSubspace(
|
||||||
|
uuid: uuid ?? this.uuid,
|
||||||
|
createdAt: createdAt ?? this.createdAt,
|
||||||
|
updatedAt: updatedAt ?? this.updatedAt,
|
||||||
|
subspaceName: subspaceName ?? this.subspaceName,
|
||||||
|
disabled: disabled ?? this.disabled,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -588,4 +588,72 @@ SOS
|
|||||||
"NCPS": DeviceType.NCPS,
|
"NCPS": DeviceType.NCPS,
|
||||||
"PC": DeviceType.PC,
|
"PC": DeviceType.PC,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
AllDevicesModel copyWith({
|
||||||
|
DevicesModelRoom? room,
|
||||||
|
DeviceSubspace? subspace,
|
||||||
|
DevicesModelUnit? unit,
|
||||||
|
DeviceCommunityModel? community,
|
||||||
|
String? productUuid,
|
||||||
|
String? productType,
|
||||||
|
String? permissionType,
|
||||||
|
int? activeTime,
|
||||||
|
String? category,
|
||||||
|
String? categoryName,
|
||||||
|
int? createTime,
|
||||||
|
String? gatewayId,
|
||||||
|
String? icon,
|
||||||
|
String? ip,
|
||||||
|
String? lat,
|
||||||
|
String? localKey,
|
||||||
|
String? lon,
|
||||||
|
String? model,
|
||||||
|
String? name,
|
||||||
|
String? nodeId,
|
||||||
|
bool? online,
|
||||||
|
String? ownerId,
|
||||||
|
bool? sub,
|
||||||
|
String? timeZone,
|
||||||
|
int? updateTime,
|
||||||
|
String? uuid,
|
||||||
|
int? batteryLevel,
|
||||||
|
String? productName,
|
||||||
|
List<DeviceSpaceModel>? spaces,
|
||||||
|
List<DeviceTagModel>? deviceTags,
|
||||||
|
DeviceSubSpace? deviceSubSpace,
|
||||||
|
}) {
|
||||||
|
return AllDevicesModel(
|
||||||
|
room: room ?? this.room,
|
||||||
|
subspace: subspace ?? this.subspace,
|
||||||
|
unit: unit ?? this.unit,
|
||||||
|
community: community ?? this.community,
|
||||||
|
productUuid: productUuid ?? this.productUuid,
|
||||||
|
productType: productType ?? this.productType,
|
||||||
|
permissionType: permissionType ?? this.permissionType,
|
||||||
|
activeTime: activeTime ?? this.activeTime,
|
||||||
|
category: category ?? this.category,
|
||||||
|
categoryName: categoryName ?? this.categoryName,
|
||||||
|
createTime: createTime ?? this.createTime,
|
||||||
|
gatewayId: gatewayId ?? this.gatewayId,
|
||||||
|
icon: icon ?? this.icon,
|
||||||
|
ip: ip ?? this.ip,
|
||||||
|
lat: lat ?? this.lat,
|
||||||
|
localKey: localKey ?? this.localKey,
|
||||||
|
lon: lon ?? this.lon,
|
||||||
|
model: model ?? this.model,
|
||||||
|
name: name ?? this.name,
|
||||||
|
nodeId: nodeId ?? this.nodeId,
|
||||||
|
online: online ?? this.online,
|
||||||
|
ownerId: ownerId ?? this.ownerId,
|
||||||
|
sub: sub ?? this.sub,
|
||||||
|
timeZone: timeZone ?? this.timeZone,
|
||||||
|
updateTime: updateTime ?? this.updateTime,
|
||||||
|
uuid: uuid ?? this.uuid,
|
||||||
|
batteryLevel: batteryLevel ?? this.batteryLevel,
|
||||||
|
productName: productName ?? this.productName,
|
||||||
|
spaces: spaces ?? this.spaces,
|
||||||
|
deviceTags: deviceTags ?? this.deviceTags,
|
||||||
|
deviceSubSpace: deviceSubSpace ?? this.deviceSubSpace,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,6 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
|
|||||||
int lowBatteryCount = 0;
|
int lowBatteryCount = 0;
|
||||||
bool isControlButtonEnabled = false;
|
bool isControlButtonEnabled = false;
|
||||||
List<AllDevicesModel> selectedDevices = [];
|
List<AllDevicesModel> selectedDevices = [];
|
||||||
|
|
||||||
if (state is DeviceManagementLoaded) {
|
if (state is DeviceManagementLoaded) {
|
||||||
devicesToShow = state.devices;
|
devicesToShow = state.devices;
|
||||||
selectedIndex = state.selectedIndex;
|
selectedIndex = state.selectedIndex;
|
||||||
@ -223,7 +222,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
|
|||||||
.map((device) => device.uuid!)
|
.map((device) => device.uuid!)
|
||||||
.toList(),
|
.toList(),
|
||||||
isEmpty: devicesToShow.isEmpty,
|
isEmpty: devicesToShow.isEmpty,
|
||||||
onSettingsPressed: (rowIndex) {
|
onSettingsPressed: (rowIndex) async {
|
||||||
final device = devicesToShow[rowIndex];
|
final device = devicesToShow[rowIndex];
|
||||||
showDeviceSettingsSidebar(context, device);
|
showDeviceSettingsSidebar(context, device);
|
||||||
},
|
},
|
||||||
|
@ -87,6 +87,11 @@ class DeviceManagementContent extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
context.read<DeviceManagementBloc>().add(UpdateSubSpaceName(
|
||||||
|
subspaceId: selectedSubSpace.id!,
|
||||||
|
deviceId: device.uuid!,
|
||||||
|
newSubSpaceName: selectedSubSpace.name ?? ''));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
child: infoRow(
|
child: infoRow(
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
|
||||||
import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
|
import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
|
||||||
import 'package:syncrow_web/pages/device_managment/device_setting/device_icon_type_helper.dart';
|
import 'package:syncrow_web/pages/device_managment/device_setting/device_icon_type_helper.dart';
|
||||||
import 'package:syncrow_web/pages/device_managment/device_setting/device_management_content.dart';
|
import 'package:syncrow_web/pages/device_managment/device_setting/device_management_content.dart';
|
||||||
@ -134,8 +135,16 @@ class DeviceSettingsPanel extends StatelessWidget {
|
|||||||
onFieldSubmitted: (value) {
|
onFieldSubmitted: (value) {
|
||||||
_bloc.add(const ChangeNameEvent(
|
_bloc.add(const ChangeNameEvent(
|
||||||
value: false));
|
value: false));
|
||||||
|
context
|
||||||
|
.read<
|
||||||
|
DeviceManagementBloc>()
|
||||||
|
.add(UpdateDeviceName(
|
||||||
|
deviceId: device.uuid!,
|
||||||
|
newName: _bloc
|
||||||
|
.nameController
|
||||||
|
.text));
|
||||||
},
|
},
|
||||||
decoration: InputDecoration(
|
decoration:const InputDecoration(
|
||||||
isDense: true,
|
isDense: true,
|
||||||
contentPadding: EdgeInsets.zero,
|
contentPadding: EdgeInsets.zero,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
|
Reference in New Issue
Block a user