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/Manage/GatewayProductInfoForm.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index 70dd808..0fe5eaa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -125,7 +125,7 @@
 
             //璁惧绫诲瀷 (鍥哄畾鏅鸿兘缃戝叧)
             caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
-            var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("1");
+            var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("1");
             var btnType = new FrameCaptionViewControl(caption, infoContent != null ? infoContent.A绫诲瀷鍚嶅瓧 : string.Empty, listview.rowSpace / 2);
             btnType.UseClickStatu = false;
             listview.AddChidren(btnType);
@@ -160,12 +160,12 @@
                 btnHelp.ButtonClickEvent += (sender, e) =>
                 {
                     var form = new GatewayManage.GatewayInfoEditorForm();
-                    this.AddFromAndRemoveNowForm(form, zbGateway);
+                    this.AddFormAndCloseNowForm(form, zbGateway);
                 };
                 listBackControl.frameTable.AddChidren(btnHelp);
                 //搴曠嚎
                 int lineWidth = btnHelp.GetRealWidthByText();
-                var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+                var btnLine = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
                 btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
                 btnLine.Gravity = Gravity.CenterHorizontal;
                 btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
@@ -243,7 +243,7 @@
                     //鍏抽棴鑷韩
                     this.CloseForm();
                     //鏄惁鏄富椤垫坊鍔�
-                    if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
+                    if (HdlFormLogic.Current.IsFormOpen("GatewayListForm") == false)
                     {
                         var form = new GatewayAddSuccessForm();
                         form.AddForm();

--
Gitblit v1.8.0