From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Control.cs | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 64eb96a..d1164c5 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -181,6 +181,7 @@
/// </summary>
public void SearchLoaclGateway()
{
+ MainPage.Log($"鎼滅储鏈湴缃戝叧鍒楄〃锛岀綉鍏崇被鍨�:{DB_ResidenceData.Instance.GatewayType}");
OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
new System.Threading.Thread(() =>
{
@@ -565,7 +566,23 @@
}
break;
case SPK.LightRGBW:
- case SPK.LightCCT:
+ break;
+ case SPK.LightCCT:
+ var lightCCT = FunctionList.List.lights.Find((obj) => obj.sid == updateTemp.sid);
+ if (lightCCT != null)
+ {
+ localObj = lightCCT;
+ foreach (var attr in updateTemp.status)
+ {
+ var localAttr = lightCCT.attributes.Find((obj) => obj.key == attr.key);
+ if (localAttr != null)
+ {
+ localAttr.curValue = attr.value;
+ }
+ }
+ lightCCT.lastState = Language.StringByID(StringId.Brightness) + " : " + lightCCT.brightness + "%";
+ DimmerPage.UpdataStates(lightCCT);
+ }
break;
case SPK.CurtainSwitch:
var curtain = FunctionList.List.curtains.Find((obj) => obj.sid == updateTemp.sid);
--
Gitblit v1.8.0