上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -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;