From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index d2ecb43..0a5103d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -48,7 +48,7 @@
             btnIcon.ButtonClickEvent += (sender, e) =>
             {
                 //娴嬭瘯
-                HdlGatewayLogic.Current.SetTestCommand(i_zbGateway);
+                HdlGatewayLogic.Current.SetFixedPositionCommand(i_zbGateway);
             };
 
             //鍒濆鍖栦腑閮ㄦ帶浠�
@@ -146,7 +146,7 @@
 
             //缃戝叧绫诲瀷
             caption = Language.StringByID(R.MyInternationalizationString.uGatewayType);
-            nameValue = HdlGatewayLogic.Current.GetGatewayImageText(this.zbGateway);
+            //nameValue = HdlGatewayLogic.Current.GetGatewayImageText(this.zbGateway);
             var btnObject = new FrameCaptionViewControl(caption, nameValue);
             listDeviceControl.AddChidren(btnObject);
             btnObject.InitControl();

--
Gitblit v1.8.0