From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index 913df51..8639828 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -30,12 +30,16 @@
var ssid = HdlWifiLogic.Current.SSID;
if (ssid == null)
{
+ //鑾峰彇缃戠粶SSID澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uGetSsidFail);
+ this.ShowMassage(ShowMsgType.Tip, msg);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar(ShowReLoadMode.YES);
return;
}
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
+
HdlThreadLogic.Current.RunMain(() =>
{
//鍒濆鍖栦腑閮ㄤ俊鎭�
@@ -101,8 +105,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Udp");
};
//涓嬩竴姝�
@@ -120,7 +124,7 @@
return;
}
//寮�濮媁i-Fi閰嶇綉
- HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "1");
+ HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "");
var form = new WirelessUdpSearchForm();
this.AddFromAndRemoveNowForm(form);
};
--
Gitblit v1.8.0