From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
index 5475445..304bd26 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
+++ b/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) =>
@@ -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;
};
@@ -163,26 +163,28 @@
//鎺т欢鏁�
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;
btnFrame.BorderColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(btnFrame);
- var btnIcon = new IconViewControl(60);
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ 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;
- btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
if (dataColor != null)
{
@@ -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)
--
Gitblit v1.8.0