From c157f5a31db9878bfa4f0481378cbfc927e34074 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 23 八月 2023 10:04:03 +0800 Subject: [PATCH] 1 --- HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs | 3 --- HDL_ON/DAL/DriverLayer/Control.cs | 2 +- HDL_ON/DAL/DriverLayer/Control_Udp.cs | 6 +++++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs index c95823d..85737d2 100644 --- a/HDL_ON/DAL/DriverLayer/Control.cs +++ b/HDL_ON/DAL/DriverLayer/Control.cs @@ -870,7 +870,7 @@ }, time_stamp = Utlis.GetTimestamp() }; - var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData); + var aLinkJson = JsonConvert.SerializeObject(aLinkData); var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlScene, aLinkJson); new Control_Udp().SendLocalHdlLinkData(sendBytes, aLinkData.id, 0); } diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs index 5dba3fd..a98ad05 100644 --- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs +++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs @@ -302,7 +302,8 @@ break; case SPK.LightRGB: break; - case SPK.HvacFloorHeat:case SPK.FloorHeatStandard: + case SPK.HvacFloorHeat: + case SPK.FloorHeatStandard: if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null) { foreach (var dic in f.status) @@ -392,6 +393,9 @@ } } break; + case SPK.OtherCommon: + + break; } } } diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs index 4a05b7c..8269b50 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs @@ -1,10 +1,7 @@ 锘縰sing System; using System.Collections.Generic; -using HDL_ON.Common; -using HDL_ON.DriverLayer; using HDL_ON.Entity; using HDL_ON.UI.CSS; -using Java.Util.Functions; using Shared; namespace HDL_ON.UI -- Gitblit v1.8.0