diff --git a/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart b/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart index df27b2f1..d725a85d 100755 --- a/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart +++ b/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart @@ -142,10 +142,7 @@ class _BasicInformationPageState extends State { visible: state.lockSetInfoData.value.lockFeature?.wifi == 1, child: CommonItem( leftTitel: '网络信号强度'.tr, - rightTitle: state.lockSetInfoData.value.lockBasicInfo?.networkInfo?.rssi != null - ? '${rssiToPercentage(state.lockSetInfoData.value.lockBasicInfo?.networkInfo?.rssi)}' - '%(${state.lockSetInfoData.value.lockBasicInfo?.networkInfo?.rssi}dBm)' - : '-', + rightTitle: _getRssiDisplayText(state.lockSetInfoData.value.lockBasicInfo?.networkInfo?.rssi), allHeight: 70.h, isHaveLine: true, ), @@ -156,7 +153,7 @@ class _BasicInformationPageState extends State { visible: state.lockSetInfoData.value.lockFeature?.wifi == 1, child: CommonItem( leftTitel: '设备时区'.tr, - rightTitle: '-', + rightTitle: state.lockSetInfoData.value.lockBasicInfo?.timezoneName ?? '-', allHeight: 70.h, isHaveLine: true, ), @@ -230,6 +227,16 @@ class _BasicInformationPageState extends State { ); } + // 获取网络信号强度 + String _getRssiDisplayText(int? rssi) { + if (rssi == null) { + return '-'; + } + final int percentage = rssiToPercentage(rssi); + return '$percentage%(${rssi}dBm)'; + } + + // 获取的网络信号 转换成 百分数% int rssiToPercentage(int? rssi) { if (rssi == null) return 0; // 限制RSSI值在合理范围内 diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart b/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart index ccda689f..80b668b2 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart @@ -374,6 +374,7 @@ class LockBasicInfo { this.address, this.network, this.vendor, + this.timezoneName, this.networkInfo}); LockBasicInfo.fromJson(Map json) { @@ -409,6 +410,7 @@ class LockBasicInfo { address = json['address']; network = json['network']; vendor = json['vendor']; + timezoneName = json['timezoneName']; networkInfo = json['networkInfo'] != null ? NetworkInfo.fromJson(json['networkInfo']) : null; @@ -441,6 +443,7 @@ class LockBasicInfo { String? address; String? network; String? vendor; + String? timezoneName; NetworkInfo? networkInfo; Map toJson() { @@ -474,6 +477,7 @@ class LockBasicInfo { data['address'] = address; data['network'] = network; data['vendor'] = vendor; + data['timezoneName'] = timezoneName; if (networkInfo != null) { data['networkInfo'] = networkInfo!.toJson(); } diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart index 01ee8636..3cd00048 100755 --- a/lib/network/api_repository.dart +++ b/lib/network/api_repository.dart @@ -2363,6 +2363,7 @@ class ApiRepository { required String secretKey, required String peerId, int? rssi, + String? timezoneName, }) async { final res = await apiProvider.settingDeviceNetwork(deviceType, deviceMac, wifiName, networkMac, secretKey, peerId, rssi!); return LoginEntity.fromJson(res.body);