From 02ef7fd8315dfa7a5d8d3ddc0d04a3d4625dc0b5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 九月 2024 16:56:34 +0800
Subject: [PATCH] 增加面板地暖SPK;增加安卓金茂热水器,光伏储能切图

---
 HDL_ON/DAL/DriverLayer/Control_Udp.cs |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 421b4c4..5008602 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -302,7 +302,7 @@
                             break;
                         case SPK.LightRGB:
                             break;
-                        case SPK.HvacFloorHeat:
+                        case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                         case SPK.FloorHeatStandard:
                             if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
                             {
@@ -393,26 +393,26 @@
                                 }
                             }
                             break;
-                        case SPK.OtherCommon://2024-02-01 15:19:28  鍒氬姞鐨勶紝涓嶅彂甯冿紝瀹㈡湇閬囧埌鐨勯棶棰�
-                            //foreach (var attr in f.status)
-                            //{
-                            //    if (attr.key == FunctionAttributeKey.OnOff)
-                            //    {
-                            //        byte onOffValue = 0;
-                            //        switch (attr.value)
-                            //        {
-                            //            case "on":
-                            //                onOffValue = 0;
-                            //                break;
-                            //            case "off":
-                            //                onOffValue = 255;
-                            //                break;
-                            //        }
-                            //        ControlBytesSend(Command.SetCommonSwitch, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
-                            //            new byte[] { f.localFunction.bus.LoopId, onOffValue });
-                            //        break;
-                            //    }
-                            //}
+                        case SPK.OtherCommon://2024-02-01 15:19:28
+                            foreach (var attr in f.status)
+                            {
+                                if (attr.key == FunctionAttributeKey.OnOff)
+                                {
+                                    byte onOffValue = 0;
+                                    switch (attr.value)
+                                    {
+                                        case "on":
+                                            onOffValue = 0;
+                                            break;
+                                        case "off":
+                                            onOffValue = 255;
+                                            break;
+                                    }
+                                    ControlBytesSend(Command.SetCommonSwitch, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
+                                        new byte[] { f.localFunction.bus.LoopId, onOffValue });
+                                    break;
+                                }
+                            }
                             break;
                     }
                 }
@@ -735,7 +735,7 @@
                         0,0,0,0,0,0,0,onoff,mode,fan,temp,sanfan});
 
                         break;
-                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                         var fhTemp = new FloorHeating();
                         if (function.Fh_Mode_Temp.Count == 4)
                         {
@@ -960,7 +960,7 @@
                     case SPK.HvacAC:
                         ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
                         break;
-                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
+                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                         ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
                         break;
                     case SPK.HvacFan:

--
Gitblit v1.8.0