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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs

@@ -36,7 +36,7 @@
            this.Gravity = Gravity.CenterHorizontal;

            this.Width = Application.GetRealWidth(964);

            this.Height = Application.GetRealHeight(340);

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

            this.Radius = 20;

            this.BackgroundColor = UserCenterColor.Current.White;

        }



@@ -52,14 +52,14 @@
            //右上圆角背景

            var btnTopRight = new NormalViewControl(50, 50, true);

            btnTopRight.BackgroundColor = UserCenterColor.Current.White;

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

            btnTopRight.Radius = 6;

            this.AddChidren(btnTopRight);

            btnTopRight.X = this.Width - btnTopRight.Width;



            //左下圆角背景

            var btnBottomRight = new NormalViewControl(50, 50, true);

            btnBottomRight.BackgroundColor = UserCenterColor.Current.White;

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

            btnBottomRight.Radius = 6;

            this.AddChidren(btnBottomRight);

            btnBottomRight.Y = this.Height - btnBottomRight.Height;



@@ -159,8 +159,8 @@
                //如果设置有内部防区

                string msg = string.Empty;

                if (HdlSafeguardLogic.Current.IsHadInternalDefenseArea() == true)


                 {



                {

                    //在家布防设置成功

                    msg = Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess);

                }

@@ -373,7 +373,7 @@
                int backHeight = Application.GetMinRealAverage(132);

                btnBack = new NormalViewControl(backHeight, backHeight, false);

                btnBack.Gravity = Gravity.CenterHorizontal;

                btnBack.Radius = (uint)backHeight;

                btnBack.Radius = (uint)backHeight / 2;

                btnBack.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;

                this.AddChidren(btnBack, ChidrenBindMode.BindEventOnly);