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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index 9ec7cc9..8639828 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -28,15 +28,17 @@
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
var ssid = HdlWifiLogic.Current.SSID;
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
if (ssid == null)
{
//鑾峰彇缃戠粶SSID澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uGetSsidFail);
- this.ShowMassage(ShowMsgType.Error, msg);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
return;
}
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
HdlThreadLogic.Current.RunMain(() =>
{
@@ -103,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");
};
//涓嬩竴姝�
@@ -122,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