合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 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);