代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs

@@ -55,7 +55,9 @@
            txtoldPsw.PlaceholderText = Language.StringByID(R.MyInternationalizationString.PleaseInputOldPsw);

            rowOldPsw.AddChidren(txtoldPsw);

            //底线

            rowOldPsw.AddBottomLine();

            var btnOldLine = rowOldPsw.AddBottomLine();

            //联动线的状态

            txtoldPsw.btnLine = btnOldLine;

            //图标

            var btnoldPswIcon = rowOldPsw.AddMostRightEmptyIcon(58, 58);

            btnoldPswIcon.UnSelectedImagePath = "Item/HidenPWD.png";

@@ -93,7 +95,9 @@
            txtNewPsw.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputNewPassword);

            rowNewPsw.AddChidren(txtNewPsw);

            //底线

            rowNewPsw.AddBottomLine();

            var btnNewLine = rowNewPsw.AddBottomLine();

            //联动线的状态

            txtNewPsw.btnLine = btnNewLine;

            //图标

            var btnNewPswIcon = rowNewPsw.AddMostRightEmptyIcon(58, 58);

            btnNewPswIcon.UnSelectedImagePath = "Item/HidenPWD.png";

@@ -173,7 +177,7 @@
            }

            //密码已经修改，请重新登录

            string msg = Language.StringByID(R.MyInternationalizationString.uPasswordIsHadChangedAndLoginAgain);

            this.ShowMassage(ShowMsgType.Normal, msg, () =>

            this.ShowMassage(ShowMsgType.Remind, msg, () =>

             {

                 //从新登录

                 UserCenterLogic.ReLoginAgain(Common.Config.Instance.Account);