From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
index d88351d..cb05f8b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSelectNetworkForm.cs
@@ -62,7 +62,7 @@
 
             //璇烽�夋嫨缃戠粶
             var btnTitle = new NormalViewControl(600, 64, true);
-            btnTitle.X = HdlControlResourse.XXLeft;
+            btnTitle.X = ControlCommonResourse.XXLeft;
             btnTitle.Y = Application.GetRealHeight(30);
             btnTitle.TextSize = 15;
             btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;
@@ -94,7 +94,7 @@
             };
 
             var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
-            btnMsg.X = HdlControlResourse.XXLeft;
+            btnMsg.X = ControlCommonResourse.XXLeft;
             btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
             btnMsg.TextSize = 12;
             btnMsg.Height = Application.GetRealHeight(40);
@@ -126,7 +126,7 @@
                 //寮�濮媁i-Fi閰嶇綉
                 HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "");
                 var form = new WirelessUdpSearchForm();
-                this.AddFormAndCloseNowForm(form);
+                this.AddFromAndRemoveNowForm(form);
             };
         }
 

--
Gitblit v1.8.0