From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
index 4ccf131..5475445 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
+++ b/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,13 +175,13 @@
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);
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 +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)
--
Gitblit v1.8.0