diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart index 7a52e347..f4688019 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart @@ -16,6 +16,7 @@ import 'package:star_lock/blue/io_protocol/io_updataLockSet.dart'; import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/lockDetail/device_network_info.dart'; import 'package:star_lock/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifiEntity.dart'; +import 'package:star_lock/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart'; import 'package:star_lock/mine/gateway/addGateway/gatewayConfigurationWifi/getGatewayConfiguration_entity.dart'; import 'package:star_lock/mine/gateway/addGateway/selectGateway/getGatewayInfo_model.dart'; import 'package:star_lock/talk/starChart/entity/star_chart_register_node_entity.dart'; @@ -45,7 +46,7 @@ class ConfiguringWifiLogic extends BaseGetXController { } } - Future updateNetworkInfo({ + void updateNetworkInfo({ required String peerId, required String wifiName, required String secretKey, @@ -82,17 +83,19 @@ class ConfiguringWifiLogic extends BaseGetXController { void _initReplySubscription() { _replySubscription = EventBusManager().eventBus!.on().listen((Reply reply) async { - AppLog.log('收到蓝牙回调${EasyLoading.isShow}'); // WIFI配网结果 if (reply is GatewayConfiguringWifiResultReply) { _replySenderConfiguringWifiResult(reply); } + if (reply is GatewayConfiguringWifiReply) { + _replySenderConfiguringWifiResult(reply); + } if (reply is GatewayGetStatusReply) { _replyGatewayGetStatusReply(reply); } - if (reply is GatewayGetStatusReply) { - _replyStatusInfo(reply); - } + // if (reply is GatewayGetStatusReply) { + // _replyStatusInfo(reply); + // } // 上传数据获取锁设置 if (reply is UpdataLockSetReply) { _replyUpdataLockSetReply(reply); @@ -132,7 +135,7 @@ class ConfiguringWifiLogic extends BaseGetXController { // 保存到缓存 await Storage.saveLockNetWorkInfo(jsonMap); // 上报服务器 - updateNetworkInfo( + updateNetworkInfo( peerId: peerId ?? '', wifiName: wifiName ?? '', secretKey: secretKey ?? '', @@ -482,6 +485,7 @@ class ConfiguringWifiLogic extends BaseGetXController { @override void dispose() { + dismissEasyLoading(); // TODO: implement dispose super.dispose(); state.isLoading.value = false; @@ -489,5 +493,6 @@ class ConfiguringWifiLogic extends BaseGetXController { state.loadingTimer!.cancel(); state.loadingTimer = null; } + } }