Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -65,6 +65,8 @@
            btnLine.Y = txtValue.Bottom;

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            frame.AddChidren(btnLine);

            //联动线的状态

            txtValue.btnLine = btnLine;



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

            {

@@ -102,6 +104,7 @@
            btnErrorMsg.TextAlignment = TextAlignment.Center;

            btnErrorMsg.TextColor = 0xfff75858;

            btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;

            btnErrorMsg.IsBold = true;

            bodyFrameLayout.AddChidren(btnErrorMsg);

            btnErrorMsg.Visible = false;