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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

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

            btnErrorMsg.TextColor = 0xfff75858;

            btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;

            btnErrorMsg.IsBold = true;

            bodyFrameLayout.AddChidren(btnErrorMsg);

            btnErrorMsg.Visible = false;