From c47c3ec2488961b3a006aaebcb03dba582f8b19b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 12 三月 2020 17:08:42 +0800
Subject: [PATCH] 2020-03-12-1

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index ce7a88e..b885afb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -46,12 +46,17 @@
 
             bool gateWayExist = HdlGatewayLogic.Current.IsGatewayExist(zbGateway);
 
+            var framePic = new FrameLayout();
+            framePic.Width = Application.GetRealWidth(855);
+            framePic.Height = Application.GetRealHeight(570);
+            framePic.Gravity = Gravity.CenterHorizontal;
+            framePic.Y = Application.GetRealHeight(58);
+            bodyFrameLayout.AddChidren(framePic);
             //鍥剧墖
-            var btnImage = new PicViewControl(855, 570, true);
-            btnImage.Y = Application.GetRealHeight(58);
-            btnImage.Gravity = Gravity.CenterHorizontal;
-            HdlGatewayLogic.Current.SetRealGatewayPictrue(btnImage, zbGateway);
-            bodyFrameLayout.AddChidren(btnImage);
+            var btnImage = new PicViewControl(380, 328, true);
+            btnImage.Gravity = Gravity.Center;
+            btnImage.UnSelectedImagePath = "Gateway/RealGateway.png";
+            framePic.AddChidren(btnImage);
 
             //鍒濆鍖栨甯�
             var tableContr = new InformationEditorControl();
@@ -130,7 +135,7 @@
                 };
                 bodyFrameLayout.AddChidren(btnHelp);
                 //搴曠嚎
-                int lineWidth = btnHelp.GetRealWidthByText(12);
+                int lineWidth = btnHelp.GetRealWidthByText();
                 var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
                 btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
                 btnLine.Gravity = Gravity.CenterHorizontal;
@@ -148,6 +153,7 @@
                 {
                     //濡傛灉杩欎釜缃戝叧杩樻病鏈夌粦瀹�,鍒欑洿鎺ュ叧闂晫闈�
                     this.CloseForm();
+                    return;
                 }
                 //瀹屾垚鎸夐挳鎸変笅
                 this.FinishButtonClick(btnGateName.Text);

--
Gitblit v1.8.0