From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index 0973115..cd409ea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -191,9 +191,9 @@
             this.AddShardContentRow(rowShard);
 
             //涓�鏃︾Щ闄よ瀹跺涵鎴愬憳锛屼粬/濂瑰皢鏃犳硶浣跨敤璇ョ綉鍏充笅鎵�缁戝畾鐨勮澶�
-            var btnNote1 = new NormalViewControl(613, 98, true);
-            btnNote1.X = Application.GetRealWidth(246);
-            btnNote1.Y = Application.GetRealHeight(1328);
+            var btnNote1 = new NormalViewControl(613, 100, true);
+            btnNote1.X = Application.GetRealWidth(248);
+            btnNote1.Y = Application.GetRealHeight(1327);
             btnNote1.TextSize = 12;
             btnNote1.TextID = R.MyInternationalizationString.RemoveMenberAndDonotUserBindGatewayDevice;
             btnNote1.IsMoreLines = true;
@@ -203,7 +203,7 @@
 
             var btnIcon = new IconViewControl(58);
             btnIcon.X = Application.GetRealWidth(167);
-            btnIcon.Y = Application.GetRealHeight(1328);
+            btnIcon.Y = btnNote1.Y;
             btnIcon.UnSelectedImagePath = "Item/Tips.png";
             bodyFrameLayout.AddChidren(btnIcon);
 

--
Gitblit v1.8.0