From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index 0f54777..ed13332 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -173,7 +173,7 @@
             var btnGoBack = new BottomClickButton(688);
             btnGoBack.Y = Application.GetRealHeight(1495);
             btnGoBack.TextID = R.MyInternationalizationString.uGobackGatewayManage;
-            if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
+            if (HdlFormLogic.Current.IsFormOpen("GatewayListForm") == false)
             {
                 //杩斿洖涓婚〉
                 btnGoBack.TextID = R.MyInternationalizationString.uGobackToHomePage;
@@ -183,7 +183,7 @@
             {
                 this.CloseForm();
                 //鍏抽棴鎸囧畾鐣岄潰
-                this.CloseFormByFormName("NewGateWayMenuSelectForm");
+                HdlFormLogic.Current.CloseFormByFormName("NewGateWayMenuSelectForm");
             };
         }
 
@@ -295,7 +295,7 @@
                         if (this.Parent != null)
                         {
                             var form = new GatewayManage.GatewaySearchListForm();
-                            this.AddFromAndRemoveNowForm(form, listZbGateway, dicZbGatewayDiv);
+                            this.AddFormAndCloseNowForm(form, listZbGateway, dicZbGatewayDiv);
                         }
                     });
                 }
@@ -355,7 +355,7 @@
                     continue;
                 }
                 //2020.09.18 鏈湴杩炴帴娌℃湁杩炴帴涓�,鍒欎笉澶勭悊
-                if (way.localIsConnected == false)
+                if (way.LocalIsConnected == false)
                 {
                     string strMsg = "鎼滅储鍒颁簡缃戝叧,浣嗘槸鏈湴閾炬帴涓嶄笂  ID:" + way.GwId + " IP:" + way.GwIP + " 鍚嶇О:" + way.GwName;
                     HdlLogLogic.Current.WriteLog(-1, strMsg);
@@ -421,7 +421,7 @@
                 if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
-                    Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way.GwId, true);
+                    HdlDeviceCommonLogic.Current.SetDeviceToMemmoryByGateway(way.GwId, true);
                     if (way.IsMainGateWay == true)
                     {
                         //濡傛灉瀹冩槸涓荤綉鍏�,鍒欏埛鏂板満鏅垪琛�

--
Gitblit v1.8.0