上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

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

        /// 当前选择的控件(外框)

        /// </summary>

        private FrameLayoutControl nowSelectIcon1 = null;

        private FrameLayoutStatuControl nowSelectIcon1 = null;

        /// <summary>

        /// 圆盘选择的颜色显示控件(外框)

        /// </summary>

        private FrameLayoutControl wheelSelectIcon1 = null;

        private FrameLayoutStatuControl wheelSelectIcon1 = null;

        /// <summary>

        /// 圆盘选择的颜色显示控件(内框)

        /// </summary>

@@ -102,8 +102,8 @@
            bodyFrameLayout.AddChidren(frameBack);



            var framePic = new FrameLayout();

            framePic.Width = Application.GetMinRealAverage(588);

            framePic.Height = Application.GetMinRealAverage(588);

            framePic.Width = this.GetPictrueRealSize(588);

            framePic.Height = this.GetPictrueRealSize(588);

            framePic.Gravity = Gravity.Center;

            frameBack.AddChidren(framePic);



@@ -116,7 +116,7 @@
            var btnWhiteView = new IconViewControl(30);

            btnWhiteView.Visible = false;

            btnWhiteView.BackgroundColor = UserCenterColor.Current.White;

            btnWhiteView.Radius = (uint)Application.GetMinRealAverage(30) / 2;

            btnWhiteView.Radius = (uint)this.GetPictrueRealSize(30) / 2;

            framePic.AddChidren(btnWhiteView);



            colorPic.ColorChaged += (sender, eColor) =>

@@ -163,16 +163,16 @@
            //控件数

            var listColor = this.InitSpareDefultColor();

            //X轴初始坐标

            int Xdefult = (bodyFrameLayout.Width - Application.GetMinRealAverage(80 + 24) * (listColor.Count - 1) - Application.GetMinRealAverage(80)) / 2;

            int Xdefult = (bodyFrameLayout.Width - this.GetPictrueRealSize(80 + 24) * (listColor.Count - 1) - this.GetPictrueRealSize(80)) / 2;

            for (int i = 0; i < listColor.Count; i++)

            {

                var dataColor = listColor[i];



                var btnFrame = new FrameLayoutControl();

                btnFrame.Height = Application.GetMinRealAverage(80);

                btnFrame.Width = Application.GetMinRealAverage(80);

                btnFrame.Radius = (uint)Application.GetMinRealAverage(80) / 2;

                btnFrame.X = Xdefult + i * Application.GetMinRealAverage(80 + 24);

                var btnFrame = new FrameLayoutStatuControl();

                btnFrame.Height = this.GetPictrueRealSize(80);

                btnFrame.Width = this.GetPictrueRealSize(80);

                btnFrame.Radius = (uint)this.GetPictrueRealSize(80) / 2;

                btnFrame.X = Xdefult + i * this.GetPictrueRealSize(80 + 24);

                btnFrame.Y = Application.GetRealHeight(1054);

                btnFrame.BackgroundColor = UserCenterColor.Current.White;

                btnFrame.BorderWidth = 1;

@@ -180,7 +180,7 @@
                bodyFrameLayout.AddChidren(btnFrame);



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

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

                int iconWidth = btnFrame.Height - this.GetPictrueRealSize(10) - this.GetPictrueRealSize(10);

                var btnIcon = new IconViewControl(iconWidth, false);

                btnIcon.Gravity = Gravity.Center;

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