From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 369ab7e..e5fb38e 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -69,8 +69,8 @@
SubnetID = subnetID,
DeviceID = deviceID,
AddData = gatewayBytes,
- }, 3, true);
- //}, sendCount, reSend);
+ //}, 3, true);
+ }, sendCount, reSend);
}
/// <summary>
@@ -192,12 +192,13 @@
break;
}
ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
- new byte[] { f.localFunction.bus.LoopId, curtainState });
+ new byte[] { f.localFunction.bus.LoopId, curtainState },0);
break;
}
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
AC acTemp = new AC();
byte onoff = 0;
byte mode = 0;
@@ -552,6 +553,7 @@
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
var ac = new AC();
foreach (var dic in commandDictionary)
{
@@ -742,6 +744,11 @@
}
}
//7 婀垮害璁惧畾 %
+ byte hum = 0;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.Humidity) == true)
+ {
+ hum = Convert.ToByte(commandDictionary[FunctionAttributeKey.Humidity]);
+ }
//8 瀹ゅ唴娓╁害鍊� 鈩�
byte indoorTemp_airFrsh = 0;
if (commandDictionary.ContainsKey(FunctionAttributeKey.IndoorTemp) == true)
@@ -760,7 +767,7 @@
function.bus.LoopId,0, switchValue ,
airFreshMode,airFreshEnergy,
airFreshFan,
- Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Humidity)),
+ hum,
indoorTemp_airFrsh,
indoorHumidity_airFrsh,
//Convert.ToByte( function.GetAttrState(FunctionAttributeKey.FilterRemain)),
@@ -812,6 +819,7 @@
ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
--
Gitblit v1.8.0