sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 增加网关配网时的参数

Browse Source
This commit is contained in:
liyi 2025-10-20 14:48:13 +08:00
parent 2bfbac52fa
commit ae176ffb6c
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_logic.dart
View File

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