From 4ff00eb90ce5db8bc35f6200a676974f6c9cf429 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 14 Mar 2025 11:59:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=91?= =?UTF-8?q?=E6=97=B6=E8=AF=BB=E5=8F=96=E6=89=8B=E6=9C=BA=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?wifi=EF=BC=8C=E5=B9=B6=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF5G=E7=BD=91=E7=BB=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuringWifi/configuringWifi_page.dart | 11 +++++++++ .../configuringWifi_state.dart | 11 +++++---- .../wifiList/wifiList_page.dart | 23 +++++++++++++++---- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart index 89ea1ee1..4e8f238a 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart @@ -51,6 +51,17 @@ class _ConfiguringWifiPageState extends State logic.senderConfiguringWifiAction(); }, ), + SizedBox( + height: 20.h, + ), + Text( + '请确保网络是2.4GHz Wi-Fi ', + style: TextStyle( + color: AppColors.blackColor, + fontSize: 20.sp, + fontWeight: FontWeight.w500, + ), + ), ], )); } diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_state.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_state.dart index 1a090780..513fede2 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_state.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_state.dart @@ -1,13 +1,13 @@ - import 'dart:async'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:network_info_plus/network_info_plus.dart'; import '../../lockSet/lockSetInfo_entity.dart'; import 'configuringWifiEntity.dart'; -class ConfiguringWifiState{ +class ConfiguringWifiState { ConfiguringWifiState() { var map = Get.arguments; lockSetInfoData.value = map['lockSetInfoData']; @@ -18,6 +18,7 @@ class ConfiguringWifiState{ wifiNameController.text = wifiName.value; } } + Rx configuringWifiEntity = ConfiguringWifiEntity().obs; Rx lockSetInfoData = LockSetInfoData().obs; Rx lockBasicInfo = LockBasicInfo().obs; @@ -25,12 +26,12 @@ class ConfiguringWifiState{ RxString wifiName = ''.obs; RxString pageName = ''.obs; RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示 - RxInt sureBtnState = 0.obs;// 0普通状态(可用) 1连接中(不可用) + RxInt sureBtnState = 0.obs; // 0普通状态(可用) 1连接中(不可用) TextEditingController wifiNameController = TextEditingController(); TextEditingController wifiPWDController = TextEditingController(); String getGatewayConfigurationStr = ''; - RxBool isLoading=false.obs; + RxBool isLoading = false.obs; Timer? loadingTimer; -} \ No newline at end of file +} diff --git a/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_page.dart b/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_page.dart index d00e360d..2508cc27 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_page.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:network_info_plus/network_info_plus.dart'; import 'package:star_lock/main/lockDetail/lockSet/configuringWifi/wifiList/wifiList_state.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; @@ -91,11 +92,23 @@ class _WifiListPageState extends State { fontSize: 28.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), - onClick: () { - Get.toNamed(Routers.configuringWifiPage, arguments: { - 'lockSetInfoData': state.lockSetInfoData.value, - 'pageName': state.pageName.value, - }); + onClick: () async { + // 如果没有传wifi昵称,则使用当前系统连接的wifi + final info = NetworkInfo(); + + final wifiName = + (await info.getWifiName())?.replaceAll('"', '') ?? ''; + + // 判断是否为5G WiFi + if (wifiName.toLowerCase().contains('5g')) { + logic.showToast('请将手机切换至2.4G WiFi进行手动连接'.tr); + } else { + Get.toNamed(Routers.configuringWifiPage, arguments: { + 'lockSetInfoData': state.lockSetInfoData.value, + 'pageName': state.pageName.value, + 'wifiName': wifiName, + }); + } }, ), SizedBox(