From 7b60238359b94125d591678eff105ae2bf47843f Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 15 十一月 2019 13:16:21 +0800
Subject: [PATCH] 2019.11.15
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index f4ca433..d7bdf96 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -48,12 +48,8 @@
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", HdlWifiLogic.Current.SSID);
+ //var rowWifi = new FrameCaptionViewControl("WiFi", "software");
rowWifi.UseClickStatu = false;
rowWifi.Y = Application.GetRealHeight(124);
frameBack.AddChidren(rowWifi);
@@ -78,12 +74,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;
bodyFrameLayout.AddChidren(btnMsg);
+
+ //鏌ョ湅甯姪
+ var btnHelp = this.AddHelpControl();
+ btnHelp.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceDirection.DeviceDirectionHelpForm();
+ form.AddForm("WirelessUdp");
+ };
//涓嬩竴姝�
var btnNext = new BottomClickButton();
@@ -95,18 +99,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, "1");
+ var form = new WirelessUdpSearchForm();
+ this.AddFromAndRemoveNowForm(form);
};
}
--
Gitblit v1.8.0