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/WirelessApSelectNetworkForm.cs | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
index 1c4d446..c3a2d29 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Security.Cryptography;
using System.Text;
namespace Shared.Phone.UserCenter.GatewayAdd
@@ -45,7 +46,7 @@
frameBack.AddChidren(btnTitle);
//WIFI
- var rowWifi = new FrameCaptionInputControl("WiFi", string.Empty);
+ var rowWifi = new FrameCaptionInputControl("WiFi", "");
rowWifi.Y = Application.GetRealHeight(124);
frameBack.AddChidren(rowWifi);
rowWifi.InitControl();
@@ -74,15 +75,15 @@
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("Ap");
};
//涓嬩竴姝�
@@ -105,11 +106,35 @@
btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
return;
}
+ //鍙戦�佸瘑鐮�
+ var result = HdlWifiLogic.Current.SendApHomeWifiPassword(rowWifi.Text, btnPsw.Text);
+ if (result == false)
+ {
+ //瀵嗙爜鍙戦�佸け璐�
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uSendPasswordFail));
+ return;
+ }
+
var form = new WirelessApDirection3Form();
this.AddFromAndRemoveNowForm(form);
};
}
#endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ //鍏抽棴Tcp閾炬帴
+ HdlWifiLogic.Current.CloseApTcpConnection();
+
+ base.CloseFormBefore();
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0