代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

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

                nowSelectIcon1 = wheelSelectIcon1;

            };

@@ -175,7 +175,7 @@
                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);



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

                {

                    //原来的颜色

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

                    btnIcon.BackgroundColor = btnFrame.BorderColor;

                    btnFrame.BorderColor = 0xff666666;

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

                    wheelSelectIcon1 = btnFrame;

                    wheelSelectIcon2 = btnIcon;

                    nowSelectIcon1 = btnFrame;

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

                        nowSelectIcon1.BorderColor = UserCenterColor.Current.White;

                    }

                    btnFrame.BorderColor = btnIcon.BackgroundColor;

                    btnFrame.BorderColor = 0xff666666;

                    nowSelectIcon1 = btnFrame;



                    if (btnFrame.Name != null)