代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs

@@ -98,7 +98,7 @@
            rowName.UseClickStatu = false;

            listMidFrame.AddChidren(rowName);

            //底线

            rowName.AddBottomLine();

            var btnNameLine = rowName.AddBottomLine();

            //名称View

            rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uName), 350);

            //名称输入

@@ -121,6 +121,8 @@
                //更新用户名

                this.SaveUserName(txtName.Text.Trim());

            });

            //联动线的状态

            txtName.btnLine = btnNameLine;



            var rowQrCode = new FrameRowControl(listMidFrame.rowSpace / 2);

            listMidFrame.AddChidren(rowQrCode);

@@ -146,7 +148,6 @@
            rowEmail.AddRightArrow();

            //邮箱

            var btnEmail = rowEmail.AddMostRightView(UserCenterResourse.UserInfo.Email, 500);

            btnEmail.IsBold = true;

            if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Email) == true)

            {

                //未设置,请绑定

@@ -176,7 +177,6 @@
            rowPhone.AddRightArrow();

            //手机号

            var btnPhone = rowPhone.AddMostRightView(UserCenterResourse.UserInfo.Phone, 500);

            btnPhone.IsBold = true;

            if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Phone) == true)

            {

                //未设置,请绑定

@@ -212,7 +212,6 @@
            //微信、QQ

            //var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);

            var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChat), 500);

            btnQQ.IsBold = true;

            rowOther.ButtonClickEvent += (sender, e) =>

            {

                var form = new OtherParty.OtherPartyAccountMenuForm();

@@ -229,7 +228,6 @@
            rowSysPsw.AddRightArrow();

            //去修改

            var btnPsw = rowSysPsw.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGotoEditor), 350);

            btnPsw.IsBold = true;

            rowSysPsw.ButtonClickEvent += (sender, e) =>

            {

                var form = new Password.EditorAccountPasswordForm();

@@ -244,7 +242,6 @@
            rowSecond.AddRightArrow();

            //密码、手势、指纹

            var btnSecand = rowSecond.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uPasswordGestureFingerPrint), 400);

            btnSecand.IsBold = true;

            rowSecond.ButtonClickEvent += (sender, e) =>

            {

                var form = new SecondAuthenticationForm();