diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart b/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart index 4e01541b..8e1d29d2 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart @@ -1,5 +1,6 @@ -class LockSetInfoEntity { +import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart'; +class LockSetInfoEntity { LockSetInfoEntity( {this.errorCode, this.description, this.errorMsg, this.data}); @@ -9,6 +10,7 @@ class LockSetInfoEntity { errorMsg = json['errorMsg']; data = json['data'] != null ? LockSetInfoData.fromJson(json['data']) : null; } + int? errorCode; String? description; String? errorMsg; @@ -27,7 +29,6 @@ class LockSetInfoEntity { } class LockSetInfoData { - LockSetInfoData( {this.lockId, this.lockStatus, @@ -50,6 +51,7 @@ class LockSetInfoData { ? LockSettingInfo.fromJson(json['lockSettingInfo']) : null; } + int? lockId; LockStatus? lockStatus; LockFeature? lockFeature; @@ -76,12 +78,12 @@ class LockSetInfoData { } class LockStatus { - LockStatus({this.roomStatus}); LockStatus.fromJson(Map json) { roomStatus = json['roomStatus']; } + int? roomStatus; Map toJson() { @@ -91,7 +93,8 @@ class LockStatus { } } -class LockFeature { //人脸开关 0:关闭 1:开启 +class LockFeature { + //人脸开关 0:关闭 1:开启 LockFeature({ this.password, @@ -206,6 +209,7 @@ class LockFeature { //人脸开关 0:关闭 1:开启 abnormalWarn = json['abnormalWarn']; isSupportBackupBattery = json['isSupportBackupBattery']; } + int? password; int? icCard; int? fingerprint; @@ -322,7 +326,6 @@ class LockFeature { //人脸开关 0:关闭 1:开启 } class LockBasicInfo { - LockBasicInfo( {this.lockId, this.electricQuantityDate, @@ -348,7 +351,8 @@ class LockBasicInfo { this.weekDays, this.address, this.network, - this.vendor}); + this.vendor, + this.networkInfo}); LockBasicInfo.fromJson(Map json) { lockId = json['lockId']; @@ -381,7 +385,11 @@ class LockBasicInfo { address = json['address']; network = json['network']; vendor = json['vendor']; + networkInfo = json['networkInfo'] != null + ? NetworkInfo.fromJson(json['networkInfo']) + : null; } + int? lockId; int? electricQuantityDate; int? keyId; @@ -407,6 +415,7 @@ class LockBasicInfo { String? address; String? network; String? vendor; + NetworkInfo? networkInfo; Map toJson() { final Map data = {}; @@ -437,18 +446,21 @@ class LockBasicInfo { data['address'] = address; data['network'] = network; data['vendor'] = vendor; + if (networkInfo != null) { + data['networkInfo'] = networkInfo!.toJson(); + } return data; } } class GroupData { - GroupData({this.id, this.name}); GroupData.fromJson(Map json) { id = json['id']; name = json['name']; } + int? id; String? name; @@ -460,7 +472,8 @@ class GroupData { } } -class LockSettingInfo { // 防误开 +class LockSettingInfo { + // 防误开 LockSettingInfo({ this.remoteUnlock, this.autoLock, @@ -540,6 +553,7 @@ class LockSettingInfo { // 防误开 autoLightScreenTime = json['autoLightScreenTime']; faceEnErrUnlock = json['faceEnErrUnlock']; } + int? remoteUnlock; int? autoLock; int? autoLockSecond; @@ -619,7 +633,6 @@ class LockSettingInfo { // 防误开 } class PassageModeConfig { - PassageModeConfig( {this.startDate, this.endDate, this.weekDays, this.isAllDay}); @@ -629,6 +642,7 @@ class PassageModeConfig { weekDays = json['weekDays'].cast(); isAllDay = json['isAllDay']; } + int? startDate; int? endDate; List? weekDays; @@ -645,7 +659,6 @@ class PassageModeConfig { } class CatEyeConfig { - CatEyeConfig({this.catEyeMode, this.catEyeModeConfig}); CatEyeConfig.fromJson(Map json) { @@ -654,6 +667,7 @@ class CatEyeConfig { ? CatEyeModeConfig.fromJson(json['catEyeModeConfig']) : null; } + int? catEyeMode; //1省电模式 2逗留抓拍模式 3实时监控模式 4自定义模式(自定义模式下存在其他设置参数) CatEyeModeConfig? catEyeModeConfig; @@ -667,7 +681,8 @@ class CatEyeConfig { } } -class CatEyeModeConfig { //人体侦测距离 +class CatEyeModeConfig { + //人体侦测距离 CatEyeModeConfig( {this.recordMode, @@ -689,6 +704,7 @@ class CatEyeModeConfig { //人体侦测距离 recordStartTime = json['recordStartTime']; detectionDistance = json['detectionDistance']; } + int? recordMode; //录像时段 0全天 1自定义时间 String? recordTime; //有人出现时录像 int? realTimeMode; //实时画面 0发生事件事查看 1实时查看 diff --git a/lib/main/lockMian/entity/lockListInfo_entity.dart b/lib/main/lockMian/entity/lockListInfo_entity.dart index 2a462bcc..b3b46464 100755 --- a/lib/main/lockMian/entity/lockListInfo_entity.dart +++ b/lib/main/lockMian/entity/lockListInfo_entity.dart @@ -422,17 +422,26 @@ class LockSetting { class NetworkInfo { NetworkInfo({ this.peerId, + this.isOnline, + this.wifiName, + }); NetworkInfo.fromJson(Map json) { peerId = json['peerId']; + isOnline = json['isOnline']; + wifiName = json['wifiName']; } String? peerId; + String? wifiName; + int? isOnline; Map toJson() { final Map data = {}; data['peerId'] = peerId; + data['wifiName'] = wifiName; + data['isOnline'] = isOnline; return data; } }