请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs

@@ -114,7 +114,7 @@
            bodyFrameLayout.AddChidren(frame);



            //用户图标

            string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");

            string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfo.DistributedMark + ".png");

            var btnUserIcon = new ImageView();

            btnUserIcon.Height = Application.GetMinRealAverage(207);

            btnUserIcon.Width = Application.GetMinRealAverage(207);

@@ -139,7 +139,7 @@
            btnAuthority.TextSize = 12;

            btnAuthority.Y = btnUserIcon.Bottom + Application.GetRealHeight(23);

            btnAuthority.Gravity = Gravity.CenterHorizontal;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnAuthority.TextID = R.MyInternationalizationString.uMember;

            if (memberInfo.AccountType == 1)

            {

@@ -159,7 +159,7 @@
        private void InitInfoList()

        {

            //标题:成员权限

            var btnMenberTile = new DetailTitleControl(800, 60, true);

            var btnMenberTile = new NormalViewControl(800, 60, true);

            btnMenberTile.X = ControlCommonResourse.XXLeft;

            btnMenberTile.Y = Application.GetRealHeight(418);

            btnMenberTile.TextColor = UserCenterColor.Current.TextColor2;

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



@@ -430,7 +430,7 @@
                if (infoResult.HeadImage != null)

                {

                    //写入头像内容

                    string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, memberInfo.DistributedMark + ".png");

                    string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfo.DistributedMark + ".png");

                    Shared.IO.FileUtils.WriteFileByBytes(iconPath, infoResult.HeadImage);

                    HdlThreadLogic.Current.RunMain(() =>

                    {