请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -23,6 +23,10 @@
        /// 撤防

        /// </summary>

        private GarrisonControl btnReGarrisonGarrison = null;

        /// <summary>

        /// 桌布控件

        /// </summary>

        private FrameLayout frameTable = null;



        #endregion



@@ -36,8 +40,6 @@
            this.Gravity = Gravity.CenterHorizontal;

            this.Width = Application.GetRealWidth(964);

            this.Height = Application.GetRealHeight(340);

            this.Radius = 20;

            this.BackgroundColor = UserCenterColor.Current.White;

        }



        /// <summary>

@@ -49,17 +51,24 @@
            this.btnReGarrisonGarrison = null;

            this.btnRemovehomeGarrison = null;



            this.frameTable = new FrameLayout();

            frameTable.Height = this.Height;

            frameTable.Width = this.Width;

            frameTable.Radius = (uint)Application.GetRealHeight(58);

            frameTable.BackgroundColor = UserCenterColor.Current.White;

            this.AddChidren(frameTable);



            //右上圆角背景

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

            var btnTopRight = new NormalViewControl(150, 60, true);

            btnTopRight.BackgroundColor = UserCenterColor.Current.White;

            btnTopRight.Radius = 6;

            btnTopRight.RadiusEx = 17;

            this.AddChidren(btnTopRight);

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



            //左下圆角背景

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

            var btnBottomRight = new NormalViewControl(150, 60, true);

            btnBottomRight.BackgroundColor = UserCenterColor.Current.White;

            btnBottomRight.Radius = 6;

            btnBottomRight.RadiusEx = 17;

            this.AddChidren(btnBottomRight);

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



@@ -68,7 +77,7 @@
            {

                //在家布防

                btnAthomeGarrison = new GarrisonControl();

                this.AddChidren(btnAthomeGarrison);

                frameTable.AddChidren(btnAthomeGarrison);

                btnAthomeGarrison.InitControl(GarrisonMode.AtHome);

                btnAthomeGarrison.ButtonClickEvent += (sender, e) =>

                {

@@ -80,7 +89,7 @@
                //离家布防

                btnRemovehomeGarrison = new GarrisonControl();

                btnRemovehomeGarrison.X = btnAthomeGarrison.Right + Application.GetRealWidth(32);

                this.AddChidren(btnRemovehomeGarrison);

                frameTable.AddChidren(btnRemovehomeGarrison);

                btnRemovehomeGarrison.InitControl(GarrisonMode.RemoveHome);

                btnRemovehomeGarrison.ButtonClickEvent += (sender, e) =>

                {

@@ -92,7 +101,7 @@
                //撤防

                btnReGarrisonGarrison = new GarrisonControl();

                btnReGarrisonGarrison.X = btnRemovehomeGarrison.Right + Application.GetRealWidth(32);

                this.AddChidren(btnReGarrisonGarrison);

                frameTable.AddChidren(btnReGarrisonGarrison);

                btnReGarrisonGarrison.InitControl(GarrisonMode.RemoveGarrison);

                btnReGarrisonGarrison.ButtonClickEvent += (sender, e) =>

                {

@@ -104,7 +113,7 @@
                //布防

                btnAthomeGarrison = new GarrisonControl();

                btnAthomeGarrison.X = Application.GetRealWidth(166);

                this.AddChidren(btnAthomeGarrison);

                frameTable.AddChidren(btnAthomeGarrison);

                btnAthomeGarrison.InitControl(GarrisonMode.AtHome);

                btnAthomeGarrison.ButtonClickEvent += (sender, e) =>

                {

@@ -116,7 +125,7 @@
                //撤防

                btnReGarrisonGarrison = new GarrisonControl();

                btnReGarrisonGarrison.X = btnAthomeGarrison.Right + Application.GetRealWidth(32);

                this.AddChidren(btnReGarrisonGarrison);

                frameTable.AddChidren(btnReGarrisonGarrison);

                btnReGarrisonGarrison.InitControl(GarrisonMode.RemoveGarrison);

                btnReGarrisonGarrison.ButtonClickEvent += (sender, e) =>

                {