From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 05b0c56..4b9483b 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -699,46 +699,60 @@
case SPK.AirFreshJinmao:
//1 鏂伴缂栧彿 1~200
//2 绫诲瀷 绗笁鏂圭被鍨� 0锛氶噾鑼傛柊椋�
+
//3 寮�鍏� 0 - 鍏虫満锛�1 - 寮�鏈�
+ byte switchValue = 0;
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) == true
+ && commandDictionary[FunctionAttributeKey.OnOff] == "on")
+ {
+ switchValue = 1;
+ }
+
//4 杩愯妯″紡 1 - 閫氶锛�2 - 鍔犳箍
byte airFreshMode = 1;
- if (function.GetAttrState(FunctionAttributeKey.Mode) == "fan")
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.Mode) == true
+ && commandDictionary[FunctionAttributeKey.Mode] == "humidification")
{
airFreshMode = 2;
}
//5 鑺傝兘鑸掗�傞�夋嫨 1 - 鑸掗�傦紝2 - 鑺傝兘
byte airFreshEnergy = 1;
- if( function.GetAttrState(FunctionAttributeKey.Energy)=="true")
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.Energy) == true
+ && commandDictionary[FunctionAttributeKey.Energy] == "true")
{
airFreshEnergy = 2;
}
//6 椋庨�熸。浣� 0 - 鑷姩锛�1 - 1妗ｏ紝2 - 2妗ｏ紝3 - 3妗�
byte airFreshFan = 0;
- switch(function.GetAttrState(FunctionAttributeKey.FanSpeed))
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.FanSpeed) == true)
{
- case "auto":
- airFreshFan = 0;
- break;
- case "level_1":
- airFreshFan = 1;
- break;
- case "level_2":
- airFreshFan = 2;
- break;
- case "level_3":
- airFreshFan = 3;
- break;
+ switch (commandDictionary[FunctionAttributeKey.FanSpeed])
+ {
+ case "auto":
+ airFreshFan = 0;
+ break;
+ case "level_1":
+ airFreshFan = 1;
+ break;
+ case "level_2":
+ airFreshFan = 2;
+ break;
+ case "level_3":
+ airFreshFan = 3;
+ break;
+ }
}
+
//7 婀垮害璁惧畾 %
//8 瀹ゅ唴娓╁害鍊� 鈩�
//9 瀹ゅ唴婀垮害鍊� 鈩�
//10 杩囨护缃戝墿浣� %
//11 杩囨护缃戜娇鐢ㄨ秴鏃� 1 瓒呮椂 0 鏃�
ControlBytesSend(Command.FreshAirControl_JinMao, subnetId, deviceId, new byte[] {
- function.bus.LoopId,0, function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0 ,
+ function.bus.LoopId,0, switchValue ,
airFreshMode,airFreshEnergy,
airFreshFan,
- Convert.ToByte( function.GetAttrState(FunctionAttributeKey.Humidity)),
+ Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Humidity)),
0,0,0,0
//Convert.ToByte( function.GetAttrState(FunctionAttributeKey.IndoorTemp)),
//Convert.ToByte( function.GetAttrState(FunctionAttributeKey.IndoorHumidity)),
@@ -970,7 +984,7 @@
try
{
- //MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
+ MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
UdpSocket._BusSocket.AsyncBeginSend(packet);
packet.HaveSendCount--;
@@ -1093,11 +1107,22 @@
var sendBytes = Control.Ins.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString);
//缁勬挱鍙戦��
packet = new Packet(sendBytes, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("239.0.168.188"), 8585));
- packet.HaveSendCount = 4;//ps锛氭病鏈夐噸鍙戯紝鍚庢湡鏈夋椂闂村彲浠ュ鍔犻噸鍙戝垽鏂�
+ packet.HaveSendCount = 4;
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
thread.IsBackground = true;
thread.Start(packet);
//wait();涓嶉渶瑕佺瓑寰�
+
+
+
+
+ //hjSocket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+ //hjSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.Broadcast, true);
+ //EndPoint ipep = new IPEndPoint(IPAddress.Parse(CsConst.myLocalIP), HDLUDP.UDPPort);
+ //hjSocket.Bind(ipep);
+
+
+
}
catch (Exception ex)
{
--
Gitblit v1.8.0