From b9cb076fe6127160c96c35bf9c8cebcffe1d5ccd Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:35:23 +0800
Subject: [PATCH] 2020.1.10
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index d7bdf96..8639828 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -23,14 +23,35 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddWirelessGateway));
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+ 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(() =>
+ {
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame(ssid);
+ });
+ });
}
/// <summary>
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
- private void InitMiddleFrame()
+ private void InitMiddleFrame(string ssid)
{
bodyFrameLayout.RemoveAll();
@@ -48,8 +69,7 @@
frameBack.AddChidren(btnTitle);
//WIFI
- var rowWifi = new FrameCaptionViewControl("WiFi", HdlWifiLogic.Current.SSID);
- //var rowWifi = new FrameCaptionViewControl("WiFi", "software");
+ var rowWifi = new FrameCaptionViewControl("WiFi", ssid);
rowWifi.UseClickStatu = false;
rowWifi.Y = Application.GetRealHeight(124);
frameBack.AddChidren(rowWifi);
@@ -85,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");
};
//涓嬩竴姝�
@@ -104,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