From a41a96b555f3aabf243741352bded5f28cd0ced5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 21 七月 2020 15:56:32 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs | 159 ++++++++++++++++++++---------------------------------
1 files changed, 60 insertions(+), 99 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
index e81a59c..f66cf40 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -448,21 +448,25 @@
int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- //棰滆壊澶栨
- var btnColorLine = new FrameLayoutStatuControl();
- btnColorLine.Width = Application.GetRealHeight(79);
- btnColorLine.Height = this.GetPictrueRealSize(79);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xffcccccc;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+ //棰滆壊澶栨
+ var frameColorLine = new FrameLayoutStatuControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = this.GetPictrueRealSize(79);
+ frameColorLine.Width = this.GetPictrueRealSize(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
btnColor.Gravity = Gravity.Center;
- btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
@@ -476,46 +480,22 @@
frameColor.ButtonClickEvent += (sender, e) =>
{
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorView.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColor.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorLine.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnRight.ButtonClickEvent += (sender, e) =>
- {
- PanelColor(btnColor, seekBar1, R1, G1, B1);
- };
- }
+ var form = new PanelColorSelectForm();
+ form.AddForm(R1, G1, B1);
+ form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+ {
+ R1 = Rcolor;
+ G1 = Gcolor;
+ B1 = Bcolor;
- /// <summary>
- /// PanelColorBefore
- /// </summary>
- private void PanelColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)
- {
- var form = new PanelColorSelectForm();
- form.AddForm(R1, G1, B1);
- form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
- {
- R1 = Rcolor;
- G1 = Gcolor;
- B1 = Bcolor;
+ this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);
+ this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);
+ this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
- this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);
- this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);
- this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
-
- btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
- //鍙樻洿婊戝姩鏉＄殑棰滆壊
- seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ };
};
}
@@ -536,6 +516,7 @@
btnClick.TextColor = UserCenterColor.Current.TextGrayColor3;
btnClick.TextID = R.MyInternationalizationString.uAfterClick;
listview.AddChidren(btnClick);
+
//鑳屾櫙
var frameBack = new FrameLayout();
frameBack.Y = Application.GetRealHeight(608);
@@ -611,20 +592,24 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new FrameLayoutStatuControl();
- btnColorLine.Width = Application.GetRealHeight(79);
- btnColorLine.Height = this.GetPictrueRealSize(79);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xffcccccc;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+ var frameColorLine = new FrameLayoutStatuControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = this.GetPictrueRealSize(79);
+ frameColorLine.Width = this.GetPictrueRealSize(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - this.GetPictrueRealSize(7) - this.GetPictrueRealSize(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
btnColor.Gravity = Gravity.Center;
- btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEvent);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
@@ -638,46 +623,22 @@
frameColor.ButtonClickEvent += (sender, e) =>
{
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorView.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColor.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnColorLine.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- btnRight.ButtonClickEvent += (sender, e) =>
- {
- PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
- };
- }
+ var form = new PanelColorSelectForm();
+ form.AddForm(R1, G1, B1);
+ form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+ {
+ R1 = Rcolor;
+ G1 = Gcolor;
+ B1 = Bcolor;
- /// <summary>
- /// PanelColorBefore
- /// </summary>
- private void PanelAfterColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)
- {
- var form = new PanelColorSelectForm();
- form.AddForm(R1, G1, B1);
- form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
- {
- R1 = Rcolor;
- G1 = Gcolor;
- B1 = Bcolor;
+ this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
+ this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
+ this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
- this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
- this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
- this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
-
- btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
- //鍙樻洿婊戝姩鏉＄殑棰滆壊
- seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ //鍙樻洿婊戝姩鏉＄殑棰滆壊
+ seekBar1.ProgressBarColor = btnColor.BackgroundColor;
+ };
};
}
#endregion
--
Gitblit v1.8.0