From da3634e011bbda29cf4e1c168997b780fe795b20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 09:05:23 +0800
Subject: [PATCH] 优化新风模块和新风面板的测试功能，请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
old mode 100755
new mode 100644
index d47001c..2cdcbbb
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
@@ -69,7 +69,8 @@
listview = new VerticalScrolViewLayout();
listview.Height = Application.GetRealHeight(1981 - 184);
- bodyFrameLayout.AddChidren(listview);
+ bodyFrameLayout.AddChidren(listview);
+ listview.ScrollEnabled = false;
HdlThreadLogic.Current.RunMain(() =>
{
@@ -79,10 +80,8 @@
//娣诲姞灞忓箷浜害绾у埆鎺т欢
this.AddScreenBrightnesLevelControl();
- //娣诲姞鑳屽厜鐏寒搴︽帶浠躲�愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
- this.AddBackLightControl();
- //銆愭殏鏃朵笉闇�瑕侊紝鍙兘鍚庢湡鏂伴闈㈡澘鐨勮繖涓鑹茶琛ュ洖鏉ャ��
- //this.FinishInitControl(listview, energyModeInfo.enable);
+ //娣诲姞鏂伴闈㈡澘鐨勯鑹�
+ this.AddColorControl();
//淇濆瓨
var btnSave = new BottomClickButton();
@@ -262,7 +261,7 @@
/// <summary>
/// 娣诲姞鑳屽厜棰滆壊鎺т欢
/// </summary>
- private void AddBackLightControl()
+ private void AddColorControl()
{
var btnEspace = new NormalViewControl(600, 58, true);
btnEspace.X = ControlCommonResourse.XXLeft;
@@ -289,9 +288,9 @@
frameColor.Height = this.GetPictrueRealSize(79);
frameColor.Gravity = Gravity.CenterVertical;
frameColor.X = frameBack.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
- frameBack.AddChidren(frameColor);
-
- //棰滆壊
+ frameBack.AddChidren(frameColor);
+
+ //棰滆壊
var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
btnColorView.Gravity = Gravity.CenterVertical;
btnColorView.TextAlignment = TextAlignment.CenterRight;
@@ -327,25 +326,49 @@
btnRight.Y = Application.GetRealHeight(5);
btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
- btnRight.Y += this.GetPictrueRealSize(8);
-
+ btnRight.Y += this.GetPictrueRealSize(8);
+
frameColor.ButtonClickEvent += (sender, e) =>
{
- 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);
-
- btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
- };
+ PanelColor(btnColor, R1, G1, B1);
+ };
+ btnColorView.ButtonClickEvent += (sender, e) =>
+ {
+ PanelColor(btnColor, R1, G1, B1);
+ };
+ btnColor.ButtonClickEvent += (sender, e) =>
+ {
+ PanelColor(btnColor, R1, G1, B1);
+ };
+ btnColorLine.ButtonClickEvent += (sender, e) =>
+ {
+ PanelColor(btnColor, R1, G1, B1);
+ };
+ btnRight.ButtonClickEvent += (sender, e) =>
+ {
+ PanelColor(btnColor, R1, G1, B1);
};
+ }
+
+ /// <summary>
+ /// PanelColorSelectForm
+ /// </summary>
+ private void PanelColor(NormalViewControl btnColor, 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);
+
+ btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+ };
}
#endregion
@@ -381,9 +404,7 @@
else
{
frameBack.Height -= value;
- }
- //瀹瑰櫒琛ュ厖
- this.FinishInitControl(listview, energyModeInfo.enable);
+ }
};
if (energyModeInfo.enable == true)
{
--
Gitblit v1.8.0