请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -132,7 +132,7 @@
                    nowSelectIcon1.BorderColor = UserCenterColor.Current.White;

                }

                wheelSelectIcon2.BackgroundColor = this.GetColorByRGB(eColor[0], eColor[1], eColor[2]);

                wheelSelectIcon1.BorderColor = wheelSelectIcon2.BackgroundColor;

                wheelSelectIcon1.BorderColor = 0xffcccccc;

                wheelSelectIcon1.Name = listRGB[0] + "-" + listRGB[1] + "-" + listRGB[2];

                nowSelectIcon1 = wheelSelectIcon1;

            };

@@ -175,13 +175,15 @@
                btnFrame.X = Xdefult + i * Application.GetMinRealAverage(80 + 24);

                btnFrame.Y = Application.GetRealHeight(1054);

                btnFrame.BackgroundColor = UserCenterColor.Current.White;

                btnFrame.BorderWidth = 2;

                btnFrame.BorderWidth = 1;

                btnFrame.BorderColor = UserCenterColor.Current.White;

                bodyFrameLayout.AddChidren(btnFrame);



                var btnIcon = new IconViewControl(60);

                //分两步计算，不然有可能它得出的结果有误差导致不居中

                int iconWidth = btnFrame.Height - Application.GetMinRealAverage(10) - Application.GetMinRealAverage(10);

                var btnIcon = new IconViewControl(iconWidth, false);

                btnIcon.Gravity = Gravity.Center;

                btnIcon.Radius = (uint)btnIcon.IconSize;

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

                btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);



                if (dataColor != null)

@@ -193,8 +195,8 @@
                else

                {

                    //原来的颜色

                    btnFrame.BorderColor = this.GetColorByRGB((byte)i_R, (byte)i_G, (byte)i_B);

                    btnIcon.BackgroundColor = btnFrame.BorderColor;

                    btnFrame.BorderColor = 0xffcccccc;

                    btnIcon.BackgroundColor = this.GetColorByRGB((byte)i_R, (byte)i_G, (byte)i_B);

                    wheelSelectIcon1 = btnFrame;

                    wheelSelectIcon2 = btnIcon;

                    nowSelectIcon1 = btnFrame;

@@ -207,7 +209,7 @@
                    {

                        nowSelectIcon1.BorderColor = UserCenterColor.Current.White;

                    }

                    btnFrame.BorderColor = btnIcon.BackgroundColor;

                    btnFrame.BorderColor = 0xffcccccc;

                    nowSelectIcon1 = btnFrame;



                    if (btnFrame.Name != null)

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

        /// 界面关闭

        /// </summary>

        public override void CloseForm()

        public override void CloseFormBefore()

        {

            this.FinishSelectColorEvent = null;



            base.CloseForm();

            base.CloseFormBefore();

        }



        #endregion