2020-4-27-1

陈嘉乐

2020-04-27 18b93d511dc764b469d7c4a7e755f7274f89cdb4

 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 = 0xff666666;

                wheelSelectIcon1.BorderColor = 0xffcccccc;

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

                nowSelectIcon1 = wheelSelectIcon1;

            };

@@ -179,7 +179,9 @@
                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 / 2;

                btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

@@ -193,7 +195,7 @@
                else

                {

                    //原来的颜色

                    btnFrame.BorderColor = 0xff666666;

                    btnFrame.BorderColor = 0xffcccccc;

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

                    wheelSelectIcon1 = btnFrame;

                    wheelSelectIcon2 = btnIcon;

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

                        nowSelectIcon1.BorderColor = UserCenterColor.Current.White;

                    }

                    btnFrame.BorderColor = 0xff666666;

                    btnFrame.BorderColor = 0xffcccccc;

                    nowSelectIcon1 = btnFrame;



                    if (btnFrame.Name != null)