From f2d122dc78c58925a05d770d716e7fefcbd784ef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 11:09:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
old mode 100644
new mode 100755
index b866713..70311e9
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -31,11 +31,14 @@
bodyView.dimmerBar.Progress = uFunction.brightness;
}
}
- else
+ //鐘舵�佷竴鏍锋椂,涓嶅啀鍒锋柊瑙嗗浘
+ else if (uFunction.trait_on_off.curValue.ToString() == "off" && bodyView.btnSwitch.IsSelected == true)
{
bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png";
bodyView.dimmerBar.ProgressBarColor = CSS.CSS_Color.PromptingColor2;
bodyView.btnSwitch.IsSelected = false;
+ //鑹茬洏鐨勫渾鐐归殣钘�
+ bodyView.btnWhiteRound.Visible = false;
}
}
}
@@ -69,9 +72,17 @@
void LoadColorChangeEvent()
{
DateTime colorChangeTime = DateTime.MinValue;
+
+ //褰撳墠鐐瑰嚮鐨勩�愮偣銆戞槸鍚︽纭�
+ bool pointIsRight = false;
+ //鍦嗙殑鍗婂緞(鑰冭檻杈圭晫,闇�瑕佽缃畠鐨勫崐寰勬瘮杈冨皬涓�鐐�)
+ int circleR = colorPicker.Width / 2 - Application.GetRealWidth(12);
+
colorPicker.ColorChaged += (sender2, e2) => {
- if(light.trait_on_off.curValue.ToString() == "off")
+ if (light.trait_on_off.curValue.ToString() == "off"
+ || pointIsRight == false)
{
+ //pointIsRight:鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
return;
}
if ((DateTime.Now - colorChangeTime).TotalMilliseconds > 200)
@@ -85,13 +96,32 @@
Control.Ins.SendWriteCommand(light, d);
}
};
- colorPicker.MouseUpEventHandler = (sender, e) =>
+ colorPicker.MouseDownEventHandler += (sender, e) =>
{
- var ss = btnCurColor.BackgroundColor;
+ if (light.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
+ pointIsRight = this.CheckPoint(circleR, colorPicker.Width / 2, colorPicker.Height / 2, (int)e.X, (int)e.Y);
+ if (pointIsRight == false)
+ {
+ //鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
+ return;
+ }
+ //鏄剧ず鐧界偣
+ btnWhiteRound.X = (int)e.X - btnWhiteRound.Width / 2;
+ btnWhiteRound.Y = (int)e.Y - btnWhiteRound.Height / 2;
+ if (btnWhiteRound.Visible == false)
+ {
+ btnWhiteRound.Visible = true;
+ }
};
-
+ colorPicker.MouseMoveEventHandler += (sender, e) =>
+ {
+ //褰撻紶鏍囩偣涓嬩簨浠跺鐞�
+ colorPicker.MouseDownEventHandler(sender, e);
+ };
}
-
/// <summary>
/// 鏀惰棌鍔熻兘鎸夐挳浜嬩欢
@@ -215,5 +245,34 @@
Control.Ins.SendWriteCommand(light, d);
};
}
+
+ /// <summary>
+ /// 妫�娴嬬偣鍑荤偣
+ /// </summary>
+ /// <param name="circleR">鍦嗙殑鍗婂緞</param>
+ /// <param name="circleX">鍦嗗績X杞�</param>
+ /// <param name="circleY">鍦嗗績Y杞�</param>
+ /// <param name="pointX">鐐瑰嚮鐐圭殑X杞�</param>
+ /// <param name="pointY">鐐瑰嚮鐐圭殑Y杞�</param>
+ /// <returns></returns>
+ private bool CheckPoint(int circleR, int circleX, int circleY, int pointX, int pointY)
+ {
+ int dwidth = circleX - pointX;
+ if (dwidth < 0) { dwidth *= -1; }
+
+ int dHeight = circleY - pointY;
+ if (dHeight < 0) { dHeight *= -1; }
+
+ //鏍规嵁涓夎鍑芥暟,姹備笁瑙掑舰鐨勬枩杈归暱
+ int dlength = dwidth * dwidth + dHeight * dHeight;
+ //鍗婂緞闀垮害(涓嶅紑鏂�,鎵�浠ユ槸鎸夊钩鏂圭畻)
+ circleR *= circleR;
+ if (dlength < circleR)
+ {
+ //濡傛灉缁勬垚鐨勪笁瑙掑舰骞舵病鏈夐暱杩囧崐寰�,鍒欎唬琛ㄨ繕鍦ㄥ渾鍐�(涓嶅厑璁哥偣杈圭晫)
+ return true;
+ }
+ return false;
+ }
}
}
--
Gitblit v1.8.0