Merge branch 'dev' of https://github.com/SyncrowIOT/web into feature/space-management

lib/pages/device_managment/all_devices/models/device_community.model.dart

@@ -0,0 +1,18 @@
+class DeviceCommunityModel {
+  String? uuid;
+  String? name;
+
+  DeviceCommunityModel({this.uuid, this.name});
+
+  DeviceCommunityModel.fromJson(Map<String, dynamic> json) {
+    uuid = json['uuid']?.toString();
+    name = json['name']?.toString();
+  }
+
+  Map<String, dynamic> toJson() {
+    final data = <String, dynamic>{};
+    data['uuid'] = uuid;
+    data['name'] = name;
+    return data;
+  }
+}

lib/pages/device_managment/all_devices/models/device_reports.dart

@@ -13,11 +13,15 @@ class DeviceReport {
 
   DeviceReport.fromJson(Map<String, dynamic> json)
       : deviceUuid = json['deviceUuid'] as String?,
-        startTime = json['startTime'] as int?,
-        endTime = json['endTime'] as int?,
-        data = (json['data'] as List<dynamic>?)
-            ?.map((e) => DeviceEvent.fromJson(e as Map<String, dynamic>))
-            .toList();
+        startTime = int.tryParse(json['startTime'].toString()) ??
+            json['startTime'] as int?,
+        endTime =
+            int.tryParse(json['endTime'].toString()) ?? json['endTime'] as int?,
+        data = json['data'] != null
+            ? (json['data'] as List<dynamic>?)
+                ?.map((e) => DeviceEvent.fromJson(e as Map<String, dynamic>))
+                .toList()
+            : [];
 
   Map<String, dynamic> toJson() => {
         'deviceUuid': deviceUuid,

lib/pages/device_managment/all_devices/models/device_space_model.dart

@@ -0,0 +1,18 @@
+class DeviceSpaceModel {
+  String? uuid;
+  String? spaceName;
+
+  DeviceSpaceModel({this.uuid, this.spaceName});
+
+  DeviceSpaceModel.fromJson(Map<String, dynamic> json) {
+    uuid = json['uuid']?.toString();
+    spaceName = json['spaceName']?.toString();
+  }
+
+  Map<String, dynamic> toJson() {
+    final data = <String, dynamic>{};
+    data['uuid'] = uuid;
+    data['spaceName'] = spaceName;
+    return data;
+  }
+}

lib/pages/device_managment/all_devices/models/devices_model.dart

@@ -1,5 +1,8 @@
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_community.model.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_space_model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 
 class AllDevicesModel {
 /*
@@ -39,6 +42,7 @@ class AllDevicesModel {
 
   DevicesModelRoom? room;
   DevicesModelUnit? unit;
+  DeviceCommunityModel? community;
   String? productUuid;
   String? productType;
   String? permissionType;
@@ -62,10 +66,13 @@ class AllDevicesModel {
   int? updateTime;
   String? uuid;
   int? batteryLevel;
+  String? productName;
+  List<DeviceSpaceModel>? spaces;
 
   AllDevicesModel({
     this.room,
     this.unit,
+    this.community,
     this.productUuid,
     this.productType,
     this.permissionType,
@@ -89,6 +96,8 @@ class AllDevicesModel {
     this.updateTime,
     this.uuid,
     this.batteryLevel,
+    this.productName,
+    this.spaces,
   });
   AllDevicesModel.fromJson(Map<String, dynamic> json) {
     room = (json['room'] != null && (json['room'] is Map))
@@ -97,6 +106,9 @@ class AllDevicesModel {
     unit = (json['unit'] != null && (json['unit'] is Map))
         ? DevicesModelUnit.fromJson(json['unit'])
         : null;
+    community = (json['community'] != null && (json['community'] is Map))
+        ? DeviceCommunityModel.fromJson(json['community'])
+        : null;
     productUuid = json['productUuid']?.toString();
     productType = json['productType']?.toString();
     permissionType = json['permissionType']?.toString();
@@ -105,7 +117,7 @@ class AllDevicesModel {
     categoryName = json['categoryName']?.toString();
     createTime = int.tryParse(json['createTime']?.toString() ?? '');
     gatewayId = json['gatewayId']?.toString();
-    icon = json['icon']?.toString();
+    icon = json['icon'] ?? _getDefaultIcon(productType);
     ip = json['ip']?.toString();
     lat = json['lat']?.toString();
     localKey = json['localKey']?.toString();
@@ -119,8 +131,43 @@ class AllDevicesModel {
     timeZone = json['timeZone']?.toString();
     updateTime = int.tryParse(json['updateTime']?.toString() ?? '');
     uuid = json['uuid']?.toString();
-    batteryLevel = int.tryParse(json['batteryLevel']?.toString() ?? '');
+    batteryLevel = int.tryParse(json['battery']?.toString() ?? '');
+    productName = json['productName']?.toString();
+    if (json['spaces'] != null && json['spaces'] is List) {
+      spaces = (json['spaces'] as List)
+          .map((space) => DeviceSpaceModel.fromJson(space))
+          .toList();
+    }
   }
+
+  String _getDefaultIcon(String? productType) {
+    switch (productType) {
+      case 'LightBulb':
+        return Assets.lightBulb;
+      case 'CeilingSensor':
+      case 'WallSensor':
+        return Assets.sensors;
+      case 'AC':
+        return Assets.ac;
+      case 'DoorLock':
+        return Assets.doorLock;
+      case 'Curtain':
+        return Assets.curtain;
+      case '3G':
+      case '2G':
+      case '1G':
+        return Assets.gangSwitch;
+      case 'Gateway':
+        return Assets.gateway;
+      case 'WH':
+        return Assets.blackLogo;
+      case 'DS':
+        return Assets.sensors;
+      default:
+        return Assets.logo;
+    }
+  }
+
   Map<String, dynamic> toJson() {
     final data = <String, dynamic>{};
     if (room != null) {
@@ -129,6 +176,9 @@ class AllDevicesModel {
     if (unit != null) {
       data['unit'] = unit!.toJson();
     }
+    if (community != null) {
+      data['community'] = community!.toJson();
+    }
     data['productUuid'] = productUuid;
     data['productType'] = productType;
     data['permissionType'] = permissionType;
@@ -151,7 +201,74 @@ class AllDevicesModel {
     data['timeZone'] = timeZone;
     data['updateTime'] = updateTime;
     data['uuid'] = uuid;
-    data['batteryLevel'] = batteryLevel;
+    data['battery'] = batteryLevel;
+    data['productName'] = productName;
+    if (spaces != null) {
+      data['spaces'] = spaces!.map((space) => space.toJson()).toList();
+    }
     return data;
   }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+
+    return other is AllDevicesModel &&
+        other.room == room &&
+        other.unit == unit &&
+        other.productUuid == productUuid &&
+        other.productType == productType &&
+        other.permissionType == permissionType &&
+        other.activeTime == activeTime &&
+        other.category == category &&
+        other.categoryName == categoryName &&
+        other.createTime == createTime &&
+        other.gatewayId == gatewayId &&
+        other.icon == icon &&
+        other.ip == ip &&
+        other.lat == lat &&
+        other.localKey == localKey &&
+        other.lon == lon &&
+        other.model == model &&
+        other.name == name &&
+        other.nodeId == nodeId &&
+        other.online == online &&
+        other.ownerId == ownerId &&
+        other.sub == sub &&
+        other.timeZone == timeZone &&
+        other.updateTime == updateTime &&
+        other.uuid == uuid &&
+        other.productName == productName &&
+        other.batteryLevel == batteryLevel;
+  }
+
+  @override
+  int get hashCode {
+    return room.hashCode ^
+        unit.hashCode ^
+        productUuid.hashCode ^
+        productType.hashCode ^
+        permissionType.hashCode ^
+        activeTime.hashCode ^
+        category.hashCode ^
+        categoryName.hashCode ^
+        createTime.hashCode ^
+        gatewayId.hashCode ^
+        icon.hashCode ^
+        ip.hashCode ^
+        lat.hashCode ^
+        localKey.hashCode ^
+        lon.hashCode ^
+        model.hashCode ^
+        name.hashCode ^
+        nodeId.hashCode ^
+        online.hashCode ^
+        ownerId.hashCode ^
+        sub.hashCode ^
+        timeZone.hashCode ^
+        updateTime.hashCode ^
+        uuid.hashCode ^
+        productName.hashCode ^
+        batteryLevel.hashCode;
+  }
 }

lib/pages/device_managment/all_devices/models/factory_reset_model.dart

@@ -0,0 +1,55 @@
+import 'package:flutter/foundation.dart';
+
+class FactoryResetModel {
+  final List<String> devicesUuid;
+
+  FactoryResetModel({
+    required this.devicesUuid,
+  });
+
+  factory FactoryResetModel.fromJson(Map<String, dynamic> json) {
+    return FactoryResetModel(
+      devicesUuid: List<String>.from(json['devicesUuid']),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'devicesUuid': devicesUuid,
+    };
+  }
+
+  FactoryResetModel copyWith({
+    List<String>? devicesUuid,
+  }) {
+    return FactoryResetModel(
+      devicesUuid: devicesUuid ?? this.devicesUuid,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'devicesUuid': devicesUuid,
+    };
+  }
+
+  factory FactoryResetModel.fromMap(Map<String, dynamic> map) {
+    return FactoryResetModel(
+      devicesUuid: List<String>.from(map['devicesUuid']),
+    );
+  }
+
+  @override
+  String toString() => 'FactoryReset(devicesUuid: $devicesUuid)';
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+
+    return other is FactoryResetModel &&
+        listEquals(other.devicesUuid, devicesUuid);
+  }
+
+  @override
+  int get hashCode => devicesUuid.hashCode;
+}