完成网关配网功能
This commit is contained in:
parent
219c70d3cc
commit
427503c10b
@ -77,7 +77,7 @@ class _GatewayConfigurationWifiPageState extends State<GatewayConfigurationWifiP
|
||||
),
|
||||
CommonItem(
|
||||
leftTitel: '网络MAC'.tr,
|
||||
rightTitle: state.gatewayModel.wifiMac,
|
||||
rightTitle: state.gatewayModel.mac,
|
||||
// allHeight: 100.h,
|
||||
isHaveLine: false),
|
||||
// SizedBox(
|
||||
|
||||
@ -14,6 +14,7 @@ class GatewayConfigurationWifiState{
|
||||
|
||||
if (map['gatewayModel'] != null && map['gatewayModel'] != '') {
|
||||
gatewayModel = map['gatewayModel'];
|
||||
// AppLog.log('gatewayModel.mac:${gatewayModel.mac} gatewayModel.mac:${gatewayModel.mac}');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -72,12 +72,14 @@ class SelectGatewayListLogic extends BaseGetXController {
|
||||
index = index + 20;
|
||||
AppLog.log('软件版本 gatewayVersion:$gatewayVersion gatewayVersionStr:$gatewayVersionStr');
|
||||
|
||||
// 硬件版本
|
||||
final List<int> wifiMac = reply.data.sublist(index, index + 20);
|
||||
final String wifiMacStr = utf8String(wifiMac);
|
||||
// lockInfo['wifiMac'] = wifiMacStr;
|
||||
gatewayModel.wifiMac = wifiMacStr;
|
||||
index = index + 20;
|
||||
// wifiMac地址
|
||||
// final List<int> wifiMac = reply.data.sublist(index, index + 20);
|
||||
// final String wifiMacStr = utf8String(wifiMac);
|
||||
// // lockInfo['wifiMac'] = wifiMacStr;
|
||||
// gatewayModel.wifiMac = wifiMacStr;
|
||||
// index = index + 20;
|
||||
// AppLog.log('wifiMac地址 wifiMac:$wifiMac wifiMacStr:$wifiMacStr');
|
||||
gatewayModel.wifiMac = '00:00:00:00:00:00';
|
||||
|
||||
Get.toNamed(Routers.gatewayGetWifiListPage, arguments: {
|
||||
'gatewayModel':gatewayModel,
|
||||
|
||||
@ -68,7 +68,7 @@ class _GatewayDetailPageState extends State<GatewayDetailPage> {
|
||||
isHaveDirection: false),
|
||||
CommonItem(
|
||||
leftTitel: '网络MAC'.tr,
|
||||
rightTitle: state.getewayItemData.value.networkMac,
|
||||
rightTitle: state.getewayItemData.value.gatewayMac,
|
||||
isHaveLine: false,
|
||||
isHaveDirection: false),
|
||||
SizedBox(
|
||||
|
||||
@ -24,14 +24,11 @@ class _GatewayListPageState extends State<GatewayListPage> {
|
||||
final GatewayListState state = Get.find<GatewayListLogic>().state;
|
||||
|
||||
Future<void> getHttpData({required bool isRefresh}) async {
|
||||
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
|
||||
if (isDemoMode == false) {
|
||||
logic.getGatewayListData(isRefresh: isRefresh).then((GetewayDataEntity value) {
|
||||
if (mounted) {
|
||||
setState(() {});
|
||||
}
|
||||
});
|
||||
}
|
||||
logic.getGatewayListData(isRefresh: isRefresh).then((GetewayDataEntity value) {
|
||||
if (mounted) {
|
||||
setState(() {});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
@ -94,7 +94,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||
# 1.0.80+2024091901:添加网关功能给谢敬调试
|
||||
# 1.0.80+2024091902:网关功能去掉网关通信不够16倍数凑够16倍数功能
|
||||
|
||||
version: 1.0.80+2024100801
|
||||
version: 1.0.80+2024100803
|
||||
|
||||
environment:
|
||||
sdk: '>=2.12.0 <3.0.0'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user