From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index 9ec7cc9..d88351d 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(() =>
{
@@ -60,7 +62,7 @@
//璇烽�夋嫨缃戠粶
var btnTitle = new NormalViewControl(600, 64, true);
- btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.X = HdlControlResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(30);
btnTitle.TextSize = 15;
btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;
@@ -92,19 +94,19 @@
};
var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
- btnMsg.X = ControlCommonResourse.XXLeft;
+ btnMsg.X = HdlControlResourse.XXLeft;
btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
btnMsg.TextSize = 12;
btnMsg.Height = Application.GetRealHeight(40);
- btnMsg.TextColor = UserCenterColor.Current.Red;
+ btnMsg.TextColor = UserCenterColor.Current.ErrorColor;
bodyFrameLayout.AddChidren(btnMsg);
//鏌ョ湅甯姪
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Udp");
};
//涓嬩竴姝�
@@ -122,9 +124,9 @@
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);
+ this.AddFormAndCloseNowForm(form);
};
}
--
Gitblit v1.8.0