From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index f4ca433..cb05f8b 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,12 +69,7 @@
frameBack.AddChidren(btnTitle);
//WIFI
- string ssiD = Shared.WiimuUPnP.SSID;
- if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))
- {
- ssiD = ssiD.Substring(1, ssiD.Length - 2);
- }
- var rowWifi = new FrameCaptionViewControl("WiFi", ssiD);
+ var rowWifi = new FrameCaptionViewControl("WiFi", ssid);
rowWifi.UseClickStatu = false;
rowWifi.Y = Application.GetRealHeight(124);
frameBack.AddChidren(rowWifi);
@@ -78,12 +94,20 @@
};
var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
- btnMsg.X = btnPsw.txtInput.X;
+ btnMsg.X = ControlCommonResourse.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 AddGatewayHelpForm();
+ form.AddForm("Udp");
+ };
//涓嬩竴姝�
var btnNext = new BottomClickButton();
@@ -95,18 +119,14 @@
btnMsg.Text = string.Empty;
if (btnPsw.Text == string.Empty)
{
- //璇疯緭鍏ョ綉缁滃瘑鐮�
+ //璇疯緭鍏ifi瀵嗙爜
btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
return;
}
-
- //鍒濆鍖朩i-Fi杩炴帴
- //var hdlWifi = new Com.Hdl.Hdlelianzigbee.ElianNative();
- //hdlWifi.InitSmartConnection(null, 1, 1);
- //寮�濮媁i-Fi杩炴帴
- //var result = hdlWifi.StartSmartConnection(rowWifi.Text, btnPsw.Text, "1");
- //var form = new WirelessGwClickButtonForm();
- //this.AddFromAndRemoveNowForm(form);
+ //寮�濮媁i-Fi閰嶇綉
+ HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "");
+ var form = new WirelessUdpSearchForm();
+ this.AddFromAndRemoveNowForm(form);
};
}
--
Gitblit v1.8.0