合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs

@@ -181,7 +181,7 @@


                var btnIcon = new IconViewControl(60);

                btnIcon.Gravity = Gravity.Center;

                btnIcon.Radius = (uint)btnIcon.IconSize;

                btnIcon.Radius = (uint)btnIcon.IconSize / 2;

                btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);



                if (dataColor != null)

@@ -262,11 +262,11 @@
        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseForm()

        public override void CloseFormBefore()

        {

            this.FinishSelectColorEvent = null;



            base.CloseForm();

            base.CloseFormBefore();

        }



        #endregion