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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs

@@ -44,6 +44,15 @@
            {

                Contacts.ContactAction = (phoneName, phoneNum) =>

                {

                    if (string.IsNullOrEmpty(phoneName) == true)

                    {

                        return;

                    }

                    //手机号检测

                    if (this.CheckPhoneNumber("86", phoneNum, phoneName) == false)

                    {

                        return;

                    }

                    //保存联系人

                    this.SaveCoercePhoneNumber("86", phoneNum, phoneName);

                };

@@ -107,6 +116,8 @@
            btnLine.Y = Application.GetRealHeight(150);

            btnLine.Gravity = Gravity.CenterHorizontal;

            frameBack.AddChidren(btnLine);

            //联动线的状态

            txtPhone.btnLine = btnLine;



            //备注

            var txtNote = new TextInputControl(Application.GetRealWidth(740), txtPhone.Height, false);