上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -138,11 +138,11 @@


        #endregion



        #region ■ 布防撤防___________________________
        #region ■ 布防撤防___________________________



        /// <summary>

        /// 在家布防

        /// </summary>
        /// </summary>

        private async void SetSafetyGarrisonModeInAtHome()

        {

            //打开进度条

@@ -180,11 +180,11 @@
                var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                control.Show();

            });

        }

        }



        /// <summary>

        /// 离家布防

        /// </summary>
        /// </summary>

        private async void SetSafetyGarrisonModeInRemoveHome()

        {

            //打开进度条

@@ -212,11 +212,11 @@
                var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                control.Show();

            });

        }

        }



        /// <summary>

        /// 撤防

        /// </summary>
        /// </summary>

        private async void RemoveSafetyGarrisonMode()

        {

            //打开进度条

@@ -240,12 +240,12 @@
                var control = new ShowMsgControl(ShowMsgType.Tip, msg);

                control.Show();

            });

        }

        }



        /// <summary>

        /// 根据布防模式，设置图标的选择状态

        /// </summary>

        /// <param name="mode"></param>
        /// <param name="mode"></param>

        public void SetIconStatuByGarrisonMode(GarrisonMode mode)

        {

            //在家布防

@@ -277,7 +277,7 @@


        /// <summary>

        /// 设置布防按钮的可视状态

        /// </summary>
        /// </summary>

        public void SetButtonVisible()

        {

            //设置有内部防区

@@ -303,7 +303,7 @@
        /// <summary>

        /// 封装的布防控件

        /// </summary>

        private class GarrisonControl : FrameLayoutControl

        private class GarrisonControl : FrameLayoutStatuControl

        {

            #region ■ 变量声明___________________________



@@ -350,7 +350,7 @@
                this.RemoveBaseClickEvent();



                //背景

                int backHeight = Application.GetMinRealAverage(132);

                int backHeight = this.GetPictrueRealSize(132);

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

                btnBack.Gravity = Gravity.CenterHorizontal;

                btnBack.Radius = (uint)backHeight / 2;