From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index cdf98c0..cc4fdb0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -19,9 +19,12 @@
return;
if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
{
- bodyView.dimmerBar.Progress = uFunction.brightness;
+ if (!bodyView.onDimmerBar)
+ {
+ bodyView.dimmerBar.Progress = uFunction.brightness;
+ }
- if (uFunction.on_off == "on")
+ if (uFunction.trait_on_off.value.ToString() == "on")
{
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
}
@@ -30,7 +33,7 @@
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
}
//bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
+ bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
}
}
catch (Exception ex)
@@ -59,7 +62,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ light.SaveFunctionData();
};
}
@@ -86,7 +89,7 @@
}
btnSwitch.IsSelected = e > 0 ? true : false;
light.brightness = e;
- light.on_off = e > 0 ? "on" : "off";
+ light.trait_on_off.value = e > 0 ? "on" : "off";
if (e == 0 || e == 100)
{
@@ -102,18 +105,18 @@
light.refreshTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- //Control.Send(CommandType_A.write, light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
Control.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
}
- else
- {
- MainPage.Log("skip control!!");
- }
}
+
+ MainPage.Log( dimmerBar.NowProgressY.ToString());
+ //btnBrightnessText.Y = dimmerBar.NowProgressY + Application.GetRealWidth(40);
+ btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
+ btnBrightnessText.Text = light.brightness + "%";
};
}
@@ -135,9 +138,9 @@
}
new System.Threading.Thread(() =>
{
- light.on_off = btnSwitch.IsSelected ? "on" : "off";
+ light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", light.on_off.ToString());
+ d.Add("on_off", light.trait_on_off.value.ToString());
Control.SendWriteCommand(light, d);
//Control.Send(CommandType_A.write, this.light);
})
--
Gitblit v1.8.0