From ae176ffb6c150e0a429f89b364353c150a63332c Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Mon, 20 Oct 2025 14:48:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E7=BD=91=E5=85=B3?=
 =?UTF-8?q?=E9=85=8D=E7=BD=91=E6=97=B6=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gatewayConfigurationWifi_logic.dart       | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart
index bf3a61e9..ff6ff5fc 100644
--- a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart
+++ b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart
@@ -22,17 +22,16 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
   final GatewayConfigurationWifiState state = GatewayConfigurationWifiState();
 
   Future<void> gatewayDistributionNetwork() async {
-    final LoginEntity entity = await ApiRepository.to
-        .gatewayDistributionNetwork(
-            gatewayName: state.gatewayNameTF.text,
-            gatewayMac: state.gatewayModel.mac,
-            serialNumber: state.gatewayModel.serialNum,
-            gatewayType: 2,
-            networkName: state.wifiNameTF.text,
-            networkMac: state.gatewayModel.wifiMac,
-            version: state.gatewayModel.gatewayVersion,
-            gatewayJson: jsonDecode(state.gatewayJson),
-            timeout: 60);
+    final LoginEntity entity = await ApiRepository.to.gatewayDistributionNetwork(
+        gatewayName: state.gatewayNameTF.text,
+        gatewayMac: state.gatewayModel.mac,
+        serialNumber: state.gatewayModel.serialNum,
+        gatewayType: 2,
+        networkName: state.wifiNameTF.text,
+        networkMac: state.gatewayModel.wifiMac,
+        version: state.gatewayModel.gatewayVersion,
+        gatewayJson: jsonDecode(state.gatewayJson),
+        timeout: 60);
     if (entity.errorCode!.codeIsSuccessful) {
       showToast('网关添加成功'.tr, something: () {
         // eventBus.fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
@@ -42,8 +41,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
   }
 
   Future<void> getGatewayConfiguration() async {
-    final GetGatewayConfigurationEntity entity =
-    await ApiRepository.to.getGatewayConfiguration(timeout: 60);
+    final GetGatewayConfigurationEntity entity = await ApiRepository.to.getGatewayConfiguration(timeout: 60);
     if (entity.errorCode!.codeIsSuccessful) {
       String configStr = entity.data ?? '';
 
@@ -52,6 +50,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
         try {
           Map<String, dynamic> config = jsonDecode(configStr);
           config['timeZoneOffset'] = DateTime.now().timeZoneOffset.inSeconds;
+          AppLog.log('state.config:$config');
           state.getGatewayConfigurationStr = jsonEncode(config);
         } catch (e) {
           AppLog.log('处理网关配置时区信息失败: $e');
@@ -68,9 +67,9 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
 
   // 监听设备返回的数据
   late StreamSubscription<Reply> _replySubscription;
+
   void _initReplySubscription() {
-    _replySubscription =
-        EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
+    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((Reply reply) async {
       // WIFI配网
       // if(reply is GatewayConfiguringWifiReply) {
       //   _replySenderConfiguringWifi(reply);
@@ -112,8 +111,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
         cancelBlueConnetctToastTimer();
         dismissEasyLoading();
         final int secretKeyJsonLength = (reply.data[3] << 8) + reply.data[4];
-        final List<int> secretKeyList =
-            reply.data.sublist(5, 5 + secretKeyJsonLength);
+        final List<int> secretKeyList = reply.data.sublist(5, 5 + secretKeyJsonLength);
         state.gatewayJson = utf8String(secretKeyList);
 
         gatewayDistributionNetwork();
@@ -129,8 +127,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
 
   // 点击配置wifi
   Future<void> senderConfiguringWifiAction() async {
-    AppLog.log(
-        'state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
+    AppLog.log('state.getGatewayConfigurationStr:${state.getGatewayConfigurationStr}');
     if (state.wifiNameTF.text.isEmpty) {
       showToast('请输入wifi名称'.tr);
       return;
@@ -158,8 +155,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
           dismissEasyLoading();
           state.sureBtnState.value = 0;
         });
-    BlueManage().blueSendData(BlueManage().connectDeviceName,
-        (BluetoothConnectionState connectionState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
         IoSenderManage.gatewayConfiguringWifiCommand(
           ssid: state.wifiNameTF.text,
@@ -178,6 +174,7 @@ class GatewayConfigurationWifiLogic extends BaseGetXController {
   }
 
   final NetworkInfo _networkInfo = NetworkInfo();
+
   Future<String> getWifiName() async {
     String ssid = '';
     ssid = (await _networkInfo.getWifiName())!;