Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

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

            btnErrorMsg.TextColor = 0xfff75858;

            btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;

            btnErrorMsg.IsBold = true;

            bodyFrameLayout.AddChidren(btnErrorMsg);

            btnErrorMsg.Visible = false;