From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/DAL/DriverLayer/Packet.cs | 457 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 280 insertions(+), 177 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Packet.cs b/HDL_ON/DAL/DriverLayer/Packet.cs
index 323b918..3e07ff2 100644
--- a/HDL_ON/DAL/DriverLayer/Packet.cs
+++ b/HDL_ON/DAL/DriverLayer/Packet.cs
@@ -97,7 +97,8 @@
{
ddd += bb + ",";
}
- MainPage.Log(ddd);
+ MainPage.Log($"bus鍛戒护:" + ((int)command).ToString("X").PadLeft(4, '0') + " : 鏁版嵁:" + ddd);
+ //MainPage.Log($"bus鍛戒护:"+ ((int)command) + " : 鏁版嵁:" + ddd);
#endif
//澶勭悊鏄惁瑕侀噸鍙戞暟鎹�
ManagerReceive(subnetID, deviceID, command, usefulBytes);
@@ -124,25 +125,26 @@
{
case Command.SetSingleLightACK:
var queryList = new List<Function>();
- queryList.AddRange(FunctionList.List.electricals);
- queryList.AddRange(FunctionList.List.lights);
+ queryList.AddRange(FunctionList.List.GetElectricals());
+ queryList.AddRange(FunctionList.List.GetLightList());
foreach (var updataObj in queryList)
{
if (updataObj.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
if (updataObj.spk != SPK.LightRGB)
{
- updataObj.trait_on_off.curValue = receiveBytes[2] > 0 ? "on" : "off";
+ updataObj.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[2] > 0 ? "on" : "off");
if (updataObj.trait_on_off.curValue.ToString() == "on")
{
switch (updataObj.spk)
{
+ case SPK.HvacFan:
case SPK.ElectricFan:
- (updataObj as Fan).openLevel = receiveBytes[2];
+ updataObj.SetAttrState(FunctionAttributeKey.OpenLevel, receiveBytes[2].ToString());
updataObj.lastState = Language.StringByID(StringId.Level) + " : " + receiveBytes[2];
break;
case SPK.LightDimming:
- (updataObj as Light).brightness = receiveBytes[2];
+ updataObj.SetAttrState(FunctionAttributeKey.Brightness, receiveBytes[2].ToString());
updataObj.lastState = Language.StringByID(StringId.Brightness) + " : " + receiveBytes[2] + "%";
break;
}
@@ -154,13 +156,14 @@
switch (updataObj.spk)
{
case SPK.LightSwitch:
- RelayPage.UpdataState(updataObj as Light);
+ RelayPage.UpdataState(updataObj);
break;
case SPK.LightDimming:
- DimmerPage.UpdataStates(updataObj as Light);
+ DimmerPage.UpdataStates(updataObj);
break;
+ case SPK.HvacFan:
case SPK.ElectricFan:
- FanPage.UpdataState(updataObj as Fan);
+ FanPage.UpdataState(updataObj);
break;
}
break;
@@ -171,15 +174,15 @@
case Command.ReadLightAllLoopBrightnessACK:
for (int i = 0; i < receiveBytes[0]; i++)
{
- var light = FunctionList.List.lights.Find((obj) => obj.bus.SubnetID == subnetID && obj.bus.DeviceID == deviceID && obj.bus.LoopId == (i + 1));
+ var light = FunctionList.List.GetLightList().Find((obj) => obj.bus.SubnetID == subnetID && obj.bus.DeviceID == deviceID && obj.bus.LoopId == (i + 1));
if (light != null)
{
if (light.spk != SPK.LightRGB)
{
- light.trait_on_off.curValue = receiveBytes[light.bus.LoopId] == 0 ? "off" : "on";
+ light.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[light.bus.LoopId] == 0 ? "off" : "on");
if (light.trait_on_off.curValue.ToString() == "on")
{
- light.brightness = receiveBytes[2];
+ light.SetAttrState(FunctionAttributeKey.Brightness, receiveBytes[i+1].ToString());
light.lastState = Language.StringByID(StringId.Brightness) + " : " + receiveBytes[2] + "%";
}
HomePage.UpdataFunctionStates(light);
@@ -199,27 +202,28 @@
}
else
{
- var e = FunctionList.List.electricals.Find((obj) => obj.bus.SubnetID == subnetID && obj.bus.DeviceID == deviceID && obj.bus.LoopId == i);
- if (e != null)
+ var function = FunctionList.List.GetElectricals().Find((obj) => obj.bus.SubnetID == subnetID && obj.bus.DeviceID == deviceID && obj.bus.LoopId == i);
+ if (function != null)
{
- var fan = e as Fan;
- fan.trait_on_off.curValue = receiveBytes[2] == 0 ? "off" : "on";
- if (fan.trait_on_off.curValue.ToString() == "on")
+ function.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[2] == 0 ? "off" : "on");
+ if (function.trait_on_off.curValue.ToString() == "on")
{
- fan.openLevel = receiveBytes[2];
- fan.lastState = Language.StringByID(StringId.Level) + " : " + receiveBytes[2];
+ function.SetAttrState(FunctionAttributeKey.OpenLevel, receiveBytes[2].ToString());
+ function.lastState = Language.StringByID(StringId.Level) + " : " + receiveBytes[2];
}
- HomePage.UpdataFunctionStates(fan);
- RoomPage.UpdataStates(fan);
- FunctionPage.UpdataStates(fan);
- ClassificationPage.UpdataInfo(fan);
- switch (fan.spk)
+ HomePage.UpdataFunctionStates(function);
+ RoomPage.UpdataStates(function);
+ FunctionPage.UpdataStates(function);
+ ClassificationPage.UpdataInfo(function);
+ switch (function.spk)
{
case SPK.ElectricFan:
- FanPage.UpdataState(fan);
+ case SPK.HvacFan:
+ FanPage.UpdataState(function);
break;
case SPK.ElectricSocket:
-
+ case SPK.PanelSocket:
+ SocketPage.UpdataState(function);
break;
}
}
@@ -228,32 +232,47 @@
break;
case Command.SetLogicLoopColorACK:
case Command.ReadLogicLoopColorACK:
- foreach (var rgb in FunctionList.List.lights)
+ foreach (var lightTeme in FunctionList.List.GetLightList())
{
- if (rgb.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ if (lightTeme.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
- if (rgb.spk == SPK.LightRGB)
+ if (lightTeme.spk == SPK.LightRGB)
{
- rgb.trait_on_off.curValue = receiveBytes[1] > 0 ? "on" : "off";
+ lightTeme.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[1] > 0 ? "on" : "off");
if (receiveBytes[1] > 0)
{
- rgb.brightness = receiveBytes[1];
- rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + receiveBytes[1] + "%";
+ lightTeme.SetAttrState(FunctionAttributeKey.Brightness, receiveBytes[1].ToString());
+ lightTeme.lastState = Language.StringByID(StringId.Brightness) + " : " + receiveBytes[1] + "%";
}
- rgb.SetRGBcolor(new byte[] { receiveBytes[6], receiveBytes[7], receiveBytes[8] });
+ new Light().SetRGBcolor(new byte[] { receiveBytes[6], receiveBytes[7], receiveBytes[8] }, lightTeme);
- HomePage.UpdataFunctionStates(rgb);
- RoomPage.UpdataStates(rgb);
- FunctionPage.UpdataStates(rgb);
- ClassificationPage.UpdataInfo(rgb);
- RGBPage.UpdataStates(rgb);
+ HomePage.UpdataFunctionStates(lightTeme);
+ RoomPage.UpdataStates(lightTeme);
+ FunctionPage.UpdataStates(lightTeme);
+ ClassificationPage.UpdataInfo(lightTeme);
+ RGBPage.UpdataStates(lightTeme);
+ }else if(lightTeme.spk == SPK.LightCCT)
+ {
+ lightTeme.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[1] > 0 ? "on" : "off");
+ if (receiveBytes[1] > 0)
+ {
+ lightTeme.SetAttrState(FunctionAttributeKey.Brightness, receiveBytes[1].ToString());
+ lightTeme.lastState = Language.StringByID(StringId.Brightness) + " : " + receiveBytes[1] + "%";
+ }
+ new Light().SetCCT(new byte[] { receiveBytes[6], receiveBytes[7] }, lightTeme);
+
+ HomePage.UpdataFunctionStates(lightTeme);
+ RoomPage.UpdataStates(lightTeme);
+ FunctionPage.UpdataStates(lightTeme);
+ ClassificationPage.UpdataInfo(lightTeme);
+ ColorTureLampPage.UpdataStatus(lightTeme);
}
}
}
break;
case Command.SetCurtainModelStutasACK:
case Command.ReadCurtainStutasACK:
- foreach (var curtain in FunctionList.List.curtains)
+ foreach (var curtain in FunctionList.List.GetCurtainList())
{
if (curtain.bus.SubnetID == subnetID && curtain.bus.DeviceID == deviceID)
{
@@ -261,14 +280,14 @@
{
if (receiveBytes[1] > 1)
{
- curtain.trait_on_off.curValue = "on";
+ curtain.SetAttrState(FunctionAttributeKey.OnOff, "on");
}
else
{
- curtain.trait_on_off.curValue = "off";
+ curtain.SetAttrState(FunctionAttributeKey.OnOff, "off");
}
- curtain.percent = receiveBytes[1];
- curtain.lastState = Language.StringByID(StringId.Open) + curtain.percent + "%";
+ curtain.SetAttrState(FunctionAttributeKey.Percent, receiveBytes[1].ToString());
+ curtain.lastState = Language.StringByID(StringId.Open) + curtain.GetAttrState(FunctionAttributeKey.Percent) + "%";
}
else
{
@@ -277,14 +296,15 @@
switch (receiveBytes[1])
{
case 0:
- curtain.trait_on_off.curValue = "stop";
- break;
+ curtain.SetAttrState(FunctionAttributeKey.OnOff, "stop");
+ return;
case 1:
- curtain.trait_on_off.curValue = "on";
+ curtain.SetAttrState(FunctionAttributeKey.OnOff, "on");
+ //curtain.
curtain.lastState = Language.StringByID(StringId.Open);
break;
case 2:
- curtain.trait_on_off.curValue = "off";
+ curtain.SetAttrState(FunctionAttributeKey.OnOff, "off");
curtain.lastState = Language.StringByID(StringId.Close);
break;
}
@@ -310,149 +330,171 @@
break;
case Command.SetACModeACK:
case Command.ReadACModeACK:
- foreach (var ac in FunctionList.List.aCs)
+ foreach (var function in FunctionList.List.GetAcList())
{
- if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ var acFunction = new AC();
+ if (function.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
- ac.curTempType = receiveBytes[1];
- ac.SetAttrState(FunctionAttributeKey.IndoorTemp, receiveBytes[2].ToString());
- ac.trait_on_off.curValue = receiveBytes[8] == 1 ? "on" : "off";
- ac.SetModeIndex(receiveBytes[9]);
- ac.SetFanIndex(receiveBytes[10]);
- ac.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[11].ToString());
- ac.lastState = "";
- switch (ac.GetAttrState(FunctionAttributeKey.Mode))
+ function.SetAttrState(FunctionAttributeKey.TempType, receiveBytes[1].ToString());
+ function.SetAttrState(FunctionAttributeKey.RoomTemp, receiveBytes[2].ToString());
+ function.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[8] == 1 ? "on" : "off");
+ acFunction.SetMode(receiveBytes[9],function);
+ acFunction.SetFan(receiveBytes[10],function);
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[11].ToString());
+ function.lastState = "";
+ switch (function.GetAttrState(FunctionAttributeKey.Mode))
{
case "cool":
- ac.lastState = Language.StringByID(StringId.Cool);
+ function.lastState = Language.StringByID(StringId.Cool);
break;
case "heat":
- ac.lastState = Language.StringByID(StringId.Heat);
+ function.lastState = Language.StringByID(StringId.Heat);
break;
case "dry":
- ac.lastState = Language.StringByID(StringId.Dry);
+ function.lastState = Language.StringByID(StringId.Dry);
break;
case "auto":
- ac.lastState = Language.StringByID(StringId.Auto);
+ function.lastState = Language.StringByID(StringId.Auto);
break;
case "fan":
- ac.lastState = Language.StringByID(StringId.AirSupply);
+ function.lastState = Language.StringByID(StringId.AirSupply);
break;
}
- switch (ac.GetAttrState(FunctionAttributeKey.FanSpeed))
+ switch (function.GetAttrState(FunctionAttributeKey.FanSpeed))
{
case "high":
- ac.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
+ function.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
break;
case "medium":
- ac.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
+ function.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
break;
case "low":
- ac.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
+ function.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
break;
case "auto":
- ac.lastState += " " + Language.StringByID(StringId.Auto);
+ function.lastState += " " + Language.StringByID(StringId.Auto);
break;
}
- ac.lastState += " " + ac.GetAttrState(FunctionAttributeKey.SetTemp) + ac.tempUnitString;
- RoomPage.UpdataStates(ac);
- FunctionPage.UpdataStates(ac);
- HomePage.UpdataFunctionStates(ac);
- ClassificationPage.UpdataInfo(ac);
- ACPage.UpdataStates(ac);
+ function.lastState += " " + function.GetAttrState(FunctionAttributeKey.SetTemp) + acFunction.GetTempUnitString(function);
+ RoomPage.UpdataStates(function);
+ FunctionPage.UpdataStates(function);
+ HomePage.UpdataFunctionStates(function);
+ ClassificationPage.UpdataInfo(function);
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(function.sid, function.status);
+
}
}
break;
case Command.ReadFloorHeatACK:
case Command.SetFloorHeatACK:
- foreach (var fh in FunctionList.List.floorHeatings)
+ foreach (var function in FunctionList.List.GetFloorHeatingList())
{
- if (fh.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ if (function.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
- fh.curTempType = receiveBytes[2];
- fh.trait_on_off.curValue = receiveBytes[1] % 2 == 0 ? "off" : "on";
- fh.curModeIndex = receiveBytes[3];
- if (fh.modeTemp.ContainsKey("normal"))
- {
- fh.modeTemp["normal"] = receiveBytes[4];
- }
- else
- {
- fh.modeTemp.Add("normal", receiveBytes[4]);
- }
- if (fh.modeTemp.ContainsKey("day"))
- {
- fh.modeTemp["day"] = receiveBytes[5];
- }
- else
- {
- fh.modeTemp.Add("day", receiveBytes[5]);
- }
- if (fh.modeTemp.ContainsKey("night"))
- {
- fh.modeTemp["night"] = receiveBytes[6];
- }
- else
- {
- fh.modeTemp.Add("night", receiveBytes[6]);
- }
- if (fh.modeTemp.ContainsKey("away"))
- {
- fh.modeTemp["away"] = receiveBytes[7];
- }
- else
- {
- fh.modeTemp.Add("away", receiveBytes[7]);
- }
+ function.SetAttrState(FunctionAttributeKey.TempType, receiveBytes[2]);
+ function.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[1] % 2 == 0 ? "off" : "on");
+ new FloorHeating().SetModeIndex(receiveBytes[3],function);
- switch (fh.trait_mode.curValue)
+ if (function.Fh_Mode_Temp.ContainsKey("normal"))
{
- case "normal":
- fh.lastState = Language.StringByID(StringId.Normal);
- fh.trait_temp.curValue = receiveBytes[4].ToString();
- break;
- case "day":
- fh.lastState = Language.StringByID(StringId.Day);
- fh.trait_temp.curValue = receiveBytes[5].ToString();
- break;
- case "night":
- fh.lastState = Language.StringByID(StringId.Night);
- fh.trait_temp.curValue = receiveBytes[6].ToString();
- break;
- case "timer":
- fh.lastState = Language.StringByID(StringId.Auto);
- if (receiveBytes[8] == 0)
- {
- fh.timeFlag = 0;
- fh.trait_temp.curValue = receiveBytes[5].ToString();
- }
- else
- {
- fh.timeFlag = 1;
- fh.trait_temp.curValue = receiveBytes[6].ToString();
- }
- break;
- case "away":
- fh.trait_temp.curValue = receiveBytes[7].ToString();
- fh.lastState = Language.StringByID(StringId.Away);
- break;
+ function.Fh_Mode_Temp["normal"] = receiveBytes[4];
}
+ else
+ {
+ function.Fh_Mode_Temp.Add("normal", receiveBytes[4]);
+ }
+ if (function.Fh_Mode_Temp.ContainsKey("day"))
+ {
+ function.Fh_Mode_Temp["day"] = receiveBytes[5];
+ }
+ else
+ {
+ function.Fh_Mode_Temp.Add("day", receiveBytes[5]);
+ }
+ if (function.Fh_Mode_Temp.ContainsKey("night"))
+ {
+ function.Fh_Mode_Temp["night"] = receiveBytes[6];
+ }
+ else
+ {
+ function.Fh_Mode_Temp.Add("night", receiveBytes[6]);
+ }
+ if (function.Fh_Mode_Temp.ContainsKey("away"))
+ {
+ function.Fh_Mode_Temp["away"] = receiveBytes[7];
+ }
+ else
+ {
+ function.Fh_Mode_Temp.Add("away", receiveBytes[7]);
+ }
+ if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
+ {
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[4].ToString());
+ }
+ else
+ {
+ switch (function.GetAttrState(FunctionAttributeKey.Mode))
+ {
+ case "normal":
+ function.lastState = Language.StringByID(StringId.Normal);
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[4].ToString());
+ break;
+ case "day":
+ function.lastState = Language.StringByID(StringId.Day);
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[5].ToString());
+ break;
+ case "night":
+ function.lastState = Language.StringByID(StringId.Night);
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[6].ToString());
+ break;
+ case "timer":
+ function.lastState = Language.StringByID(StringId.Auto);
+ if (receiveBytes[8] == 0)
+ {
+ function.SetAttrState(FunctionAttributeKey.TimeFlag, 0);
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[5].ToString());
+ }
+ else
+ {
+ function.SetAttrState(FunctionAttributeKey.TimeFlag, 1);
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[6].ToString());
+ }
+ break;
+ case "away":
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[7].ToString());
+ function.lastState = Language.StringByID(StringId.Away);
+ break;
+ }
+ }
+ var indoorTemp = 0;
+ if (receiveBytes[9] > 128)
+ {
+ indoorTemp = 1 - (receiveBytes[9] - 128);
+ }else
+ {
+ indoorTemp = receiveBytes[9];
+ }
+ function.SetAttrState(FunctionAttributeKey.RoomTemp, indoorTemp);
- fh.trait_IndoorTemp.curValue = receiveBytes[9] > 128 ? (1 - (receiveBytes[9] - 128)) : receiveBytes[9];
-
- fh.lastState += " " + fh.trait_temp.curValue + fh.tempUnitString;
- RoomPage.UpdataStates(fh);
- FunctionPage.UpdataStates(fh);
- HomePage.UpdataFunctionStates(fh);
- ClassificationPage.UpdataInfo(fh);
- FloorHeatingPage.UpdataStates(fh);
+ if (function.GetAttribute(FunctionAttributeKey.Mode) == null)
+ {
+ function.lastState = "";
+ }
+ else
+ {
+ function.lastState += " " + function.GetAttrState(FunctionAttributeKey.Mode) + new FloorHeating().GetTempUnitString(function);
+ }
+ RoomPage.UpdataStates(function);
+ FunctionPage.UpdataStates(function);
+ HomePage.UpdataFunctionStates(function);
+ ClassificationPage.UpdataInfo(function);
+ FloorHeatingPage.UpdataStates(function);
}
}
break;
case Command.ReadDeviceLoopInfoACK:
- //FunctionType dt = (FunctionType)(11 * 256 + receiveBytes[1]);
string tag = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
- foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
+ foreach (var sensor in FunctionList.List.GetEnvirSensorsList())
{
byte sensorType = 0;
switch (sensor.spk)
@@ -482,29 +524,35 @@
{
case SPK.SensorTemperature:
byte[] tempBytes = new byte[] { receiveBytes[24], receiveBytes[25], receiveBytes[26], receiveBytes[27] };
- sensor.values = Math.Round(BitConverter.ToSingle(tempBytes, 0), 1);
+ sensor.SetAttrState(FunctionAttributeKey.Value,Math.Round(BitConverter.ToSingle(tempBytes, 0), 1).ToString());
+ sensor.SetAttrState(sensor.spk,Math.Round(BitConverter.ToSingle(tempBytes, 0), 1).ToString());
break;
case SPK.SensorHumidity:
- sensor.values = Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 10;
+ sensor.SetAttrState(FunctionAttributeKey.Value, (Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 10).ToString());
+ sensor.SetAttrState(sensor.spk, (Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 10).ToString());
break;
case SPK.SensorTVOC:
- sensor.values = Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 100;
+ sensor.SetAttrState(FunctionAttributeKey.Value, (Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 100).ToString());
+ sensor.SetAttrState(sensor.spk, (Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 100).ToString());
break;
case SPK.SensorPm25:
- sensor.values = Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]);
+ sensor.SetAttrState(FunctionAttributeKey.Value,Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]).ToString());
+ sensor.SetAttrState(sensor.spk,Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]).ToString());
break;
case SPK.SensorCO2:
- sensor.values = Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]);
+ sensor.SetAttrState(FunctionAttributeKey.Value, Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]).ToString());
+ sensor.SetAttrState(sensor.spk, Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]).ToString());
break;
}
- EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
+ EnvironmentalPage.LoadEvent_UpdataStatus(sensor);
+ //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(sensor);
}
}
}
break;
case Command.New_Analog_Quantity_BROADCAST:
string tag1 = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
- foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
+ foreach (var sensor in FunctionList.List.GetEnvirSensorsList())
{
byte sensorType = 0;
switch (sensor.spk)
@@ -534,24 +582,33 @@
switch (receiveBytes[3])
{
case 1:
- sensor.values = (receiveBytes[5] * 256 * 256 * 256) + (receiveBytes[6] * 256 * 256) + (receiveBytes[7] * 256) + receiveBytes[8];
+ sensor.SetAttrState(FunctionAttributeKey.Value,( (receiveBytes[5] * 256 * 256 * 256) + (receiveBytes[6] * 256 * 256) + (receiveBytes[7] * 256) + receiveBytes[8]).ToString());
+ sensor.SetAttrState(sensor.spk,( (receiveBytes[5] * 256 * 256 * 256) + (receiveBytes[6] * 256 * 256) + (receiveBytes[7] * 256) + receiveBytes[8]).ToString());
break;
case 2:
- sensor.values = -1 * ((receiveBytes[5] * 256 * 256 * 256) + (receiveBytes[6] * 256 * 256) + (receiveBytes[7] * 256) + receiveBytes[8]);
+ sensor.SetAttrState(FunctionAttributeKey.Value,( -1 * ((receiveBytes[5] * 256 * 256 * 256) + (receiveBytes[6] * 256 * 256) + (receiveBytes[7] * 256) + receiveBytes[8])).ToString());
+ sensor.SetAttrState(sensor.spk,( -1 * ((receiveBytes[5] * 256 * 256 * 256) + (receiveBytes[6] * 256 * 256) + (receiveBytes[7] * 256) + receiveBytes[8])).ToString());
break;
case 3:
byte[] tempBytes = new byte[] { receiveBytes[5], receiveBytes[6], receiveBytes[7], receiveBytes[8] };
- sensor.values = Math.Round(BitConverter.ToSingle(tempBytes, 0), 1);
+ sensor.SetAttrState(FunctionAttributeKey.Value,( Math.Round(BitConverter.ToSingle(tempBytes, 0), 1)).ToString());
+ sensor.SetAttrState(sensor.spk,( Math.Round(BitConverter.ToSingle(tempBytes, 0), 1)).ToString());
break;
}
switch (receiveBytes[4])
{
case 2:
if (receiveBytes[1] == 5)//TVOC闇�姹傞櫎浠�100000
- sensor.values /= 100000;
+ {
+ var value = Convert.ToInt32(sensor.GetAttrState(FunctionAttributeKey.Value));
+ sensor.SetAttrState(FunctionAttributeKey.Value, (value /= 100000).ToString());
+ sensor.SetAttrState(sensor.spk, (value /= 100000).ToString());
+ }
break;
}
- EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
+
+ //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(sensor);
+ EnvironmentalPage.LoadEvent_UpdataStatus(sensor);
}
}
}
@@ -571,46 +628,47 @@
{
break;
}
- foreach (var ac in FunctionList.List.aCs)
+ foreach (var function in FunctionList.List.GetAcList())
{
- if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + reACPanel)
+ var acFunction = new AC();
+ if (function.GetBusId() == subnetID + "_" + deviceID + "_" + reACPanel)
{
switch (receiveBytes[0])
{
case 3://
- ac.trait_on_off.curValue = receiveBytes[1] == 1 ? "on" : "off";
+ function.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[1] == 1 ? "on" : "off");
break;
case 4:
case 7:
case 8:
case 19:
- ac.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[1].ToString());
+ function.SetAttrState(FunctionAttributeKey.SetTemp, receiveBytes[1].ToString());
break;
case 5:
- ac.SetFanIndex ( receiveBytes[1]);
+ acFunction.SetFan ( receiveBytes[1],function);
break;
case 6:
- ac.SetModeIndex ( receiveBytes[1]);
+ acFunction.SetMode ( receiveBytes[1],function);
break;
}
- ac.lastState = "";
- ac.lastState += " " + ac.GetAttrState(FunctionAttributeKey.SetTemp) + ac.tempUnitString;
- RoomPage.UpdataStates(ac);
- FunctionPage.UpdataStates(ac);
- HomePage.UpdataFunctionStates(ac);
- ClassificationPage.UpdataInfo(ac);
- ACPage.UpdataStates(ac);
+ function.lastState = "";
+ function.lastState += " " + function.GetAttrState(FunctionAttributeKey.SetTemp) + acFunction.GetTempUnitString(function);
+ RoomPage.UpdataStates(function);
+ FunctionPage.UpdataStates(function);
+ HomePage.UpdataFunctionStates(function);
+ ClassificationPage.UpdataInfo(function);
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(function.sid, function.status);
}
}
break;
case Command.ReadPanleTempACK://1944
case Command.PanleBroadcastTemp:
- foreach (var ac in FunctionList.List.aCs)
+ foreach (var ac in FunctionList.List.GetAcList())
{
if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
- ac.SetAttrState(FunctionAttributeKey.IndoorTemp, receiveBytes[1].ToString());
+ ac.SetAttrState(FunctionAttributeKey.RoomTemp, receiveBytes[1].ToString());
FunctionPage.UpdataStates(ac);
}
}
@@ -625,6 +683,47 @@
Control.Ins.IsSearchLocalGatewaySuccessful = true;
Control.Ins.GatewayOnline_Local = true;
DAL.Mqtt.MqttClient.DisConnectRemote();//鏂紑mqtt
+ }
+ break;
+ case Command.FreshAirControlACK_JinMao:
+ case Command.FreshAirReadACK_JinMao:
+ var airFresh = FunctionList.List.GetAirFreshList().Find((obj) => obj.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0]);
+ if (airFresh != null)
+ {
+ /// 3 寮�鍏� 0-鍏虫満锛�1-寮�鏈�
+ /// 4 杩愯妯″紡 1-閫氶锛�2-鍔犳箍 humidification/fan
+ /// 5 鑺傝兘鑸掗�傞�夋嫨 1-鑸掗�傦紝2-鑺傝兘 true/false
+ /// 6 椋庨�熸。浣� 0-鑷姩锛�1-1妗ｏ紝2-2妗ｏ紝3-3妗� level_1/level_2/level_3/auto
+ /// 7 婀垮害璁惧畾 %
+ /// 8 瀹ゅ唴娓╁害鍊� 鈩�
+ /// 9 瀹ゅ唴婀垮害鍊� 鈩�
+ /// 10 杩囨护缃戝墿浣� %
+ /// 11 杩囨护缃戜娇鐢ㄨ秴鏃� 1 瓒呮椂 0 鏃� true/false
+ airFresh.SetAttrState(FunctionAttributeKey.OnOff, receiveBytes[2] == 0 ? "off" : "on");
+ airFresh.SetAttrState(FunctionAttributeKey.Mode, receiveBytes[3] == 1 ? "fan" : "humidification");
+ airFresh.SetAttrState(FunctionAttributeKey.Energy, receiveBytes[4] == 1 ? "false" : "true");
+ switch (receiveBytes[5])
+ {
+ case 0:
+ airFresh.SetAttrState(FunctionAttributeKey.FanSpeed, "auto");
+ break;
+ case 1:
+ airFresh.SetAttrState(FunctionAttributeKey.FanSpeed, "level_1");
+ break;
+ case 2:
+ airFresh.SetAttrState(FunctionAttributeKey.FanSpeed, "level_2");
+ break;
+ case 3:
+ airFresh.SetAttrState(FunctionAttributeKey.FanSpeed, "level_3");
+ break;
+ }
+ airFresh.SetAttrState(FunctionAttributeKey.Humidity, receiveBytes[6].ToString());
+ airFresh.SetAttrState(FunctionAttributeKey.IndoorTemp, receiveBytes[7].ToString());
+ airFresh.SetAttrState(FunctionAttributeKey.IndoorHumidity, receiveBytes[8].ToString());
+ airFresh.SetAttrState(FunctionAttributeKey.FilterRemain, receiveBytes[9].ToString());
+ airFresh.SetAttrState(FunctionAttributeKey.FilterTimeout, receiveBytes[10] == 1 ? "true" : "false");
+ //璁惧鐘舵�佹帹閫�
+ Stan.HdlFormLogic.Current.DeviceStatuPush(airFresh, true);
}
break;
}
@@ -661,6 +760,10 @@
switch (command)
{
case Command.SetSingleLightACK:
+ case Command.FreshAirReadACK:
+ case Command.FreshAirControlACK:
+ case Command.FreshAirReadACK_JinMao:
+ case Command.FreshAirControlACK_JinMao:
receiveFlag += string.Format("{0}", usefulBytes[0]);
break;
case Command.SetLogicLoopColorACK:
--
Gitblit v1.8.0