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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs

@@ -306,7 +306,7 @@
        private NormalViewControl InitUserSelectButton(bool select)

        {

            var btnContr = new NormalViewControl(207, 63, true);

            btnContr.Radius = (uint)Application.GetMinRealAverage(6);

            btnContr.Radius = 6;

            btnContr.TextAlignment = TextAlignment.Center;

            if (select == false)

            {

@@ -367,7 +367,7 @@
        private NormalViewControl InitLockSelectButton(bool select)

        {

            var btnContr = new NormalViewControl(207, 63, true);

            btnContr.Radius = (uint)Application.GetMinRealAverage(6);

            btnContr.Radius = 6;

            btnContr.TextAlignment = TextAlignment.Center;

            if (select == false)

            {