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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs

@@ -38,7 +38,7 @@
            this.Height = Application.GetMinRealAverage(207);

            this.Width = Application.GetMinRealAverage(207);

            this.BackgroundColor = UserCenterColor.Current.White;

            this.Radius = (uint)Application.GetMinRealAverage(207);

            this.Radius = (uint)Application.GetMinRealAverage(207) / 2;

        }



        /// <summary>

@@ -51,7 +51,7 @@
            //第二层底色

            var btnIcon2 = new NormalViewControl(Application.GetMinRealAverage(184), Application.GetMinRealAverage(184), false);

            btnIcon2.BackgroundColor = 0xfffef1ed;

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184);

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184) / 2;

            btnIcon2.Gravity = Gravity.Center;

            this.AddChidren(btnIcon2);



@@ -72,7 +72,7 @@
            //第二层底色

            var btnIcon2 = new NormalViewControl(Application.GetMinRealAverage(184), Application.GetMinRealAverage(184), false);

            btnIcon2.BackgroundColor = 0xfffef1ed;

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184);

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184) / 2;

            btnIcon2.Gravity = Gravity.Center;

            this.AddChidren(btnIcon2);