From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 219 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 137 insertions(+), 82 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 3fcae40..c916cce 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -151,93 +151,148 @@
/// <summary>
/// 鎺у埗bus鍦烘櫙
+ /// todo
/// </summary>
public void ControlBusScenes(Scene scene)
{
- foreach (var function in scene.sceneFunctionList)
+ foreach (var f in scene.functions)
{
- switch (function.functionType)
+ switch (f.localFunction.functionType)
{
case FunctionType.Curtain:
- byte curtainState = 0;
- if (function.trait_on_off.curValue.ToString() == "on")
+ foreach (var attr in f.status)
{
- curtainState = 1;
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ byte curtainState = 0;
+ switch (attr.value)
+ {
+ case "on":
+ curtainState = 1;
+ break;
+ case "off":
+ curtainState = 2;
+ break;
+ }
+ ControlBytesSend(Command.SetCurtainModelStutas, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
+ new byte[] { f.localFunction.bus_Data.loopId, curtainState });
+ break;
+ }
}
- else if (function.trait_on_off.curValue.ToString() == "off")
- {
- curtainState = 2;
- }
- ControlBytesSend(Command.SetCurtainModelStutas, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
- new byte[] {
- function.bus_Data.LoopID,
- curtainState,
- });
break;
case FunctionType.AC:
- var aC = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(function));//as AC;
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.LoopID });
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.LoopID });
- byte modeKey = 4;
- switch (aC.curModeIndex)
+ AC tempAc = new AC();
+ foreach (var attr in f.status)
{
- case 3:
- modeKey = 8;
- break;
- case 0:
- modeKey = 4;
- break;
- case 1:
- modeKey = 7;
- break;
- case 4:
- modeKey = 19;
- break;
- case 2:
- modeKey = 2;
- break;
+ byte modeKey = 4;
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ tempAc.trait_on_off.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.Mode:
+ tempAc.trait_mode.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.FanSpeed:
+ tempAc.trait_fan.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.Temp:
+ tempAc.trait_temp.curValue = attr.value;
+ switch (tempAc.curModeIndex)
+ {
+ case 3:
+ modeKey = 8;
+ break;
+ case 0:
+ modeKey = 4;
+ break;
+ case 1:
+ modeKey = 7;
+ break;
+ case 4:
+ modeKey = 19;
+ break;
+ case 2:
+ modeKey = 2;
+ break;
+ }
+ break;
+ }
+ ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 3, tempAc.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, f.localFunction.bus_Data.loopId });
+ ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 6, tempAc.curModeIndex, f.localFunction.bus_Data.loopId });
+ ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { 5, tempAc.curFanIndex, f.localFunction.bus_Data.loopId });
+ ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.trait_temp.curValue), f.localFunction.bus_Data.loopId });
}
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.LoopID });
-
break;
case FunctionType.Relay:
case FunctionType.Dimmer:
byte brightness = 0;
- if (function.trait_on_off.curValue.ToString() == "on")
+ foreach (var attr in f.status)
{
- var brightnessTrait = function.function.Find((obj) => obj.key == "brightness");
- if (brightnessTrait != null)
+ switch (attr.key)
{
- brightness = Convert.ToByte(brightnessTrait.curValue);
+ case FunctionAttributeKey.OnOff:
+ switch (attr.value)
+ {
+ case "on":
+ brightness = 100;
+ break;
+ case "off":
+ brightness = 0;
+ break;
+ }
+ break;
+ case FunctionAttributeKey.Brightness:
+ brightness = Convert.ToByte(attr.value);
+ break;
}
}
- ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
- new byte[] {
- function.bus_Data.LoopID,brightness
- });
+ ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
+ new byte[] { f.localFunction.bus_Data.loopId, brightness });
break;
case FunctionType.RGB:
- //ControlBytesSend(Command.SetLogicLoopColor, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
- // new byte[] {
- // });
break;
case FunctionType.FloorHeating:
- var fh = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(function));//as AC;
- var fhModeTempTrait = function.function.Find((obj) => obj.key == "mode");
- if (fhModeTempTrait.value.Count == 4)
+ var tempFh = new FloorHeating();
+ foreach (var attr in f.status)
{
- byte b1 = function.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
- if (fh.workMode > 0)
+ switch (attr.key)
{
- b1 += (byte)(16 + fh.workMode);
+ case FunctionAttributeKey.OnOff:
+ tempFh.trait_on_off.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.Temp:
+ tempFh.trait_temp.curValue = attr.value;
+ break;
+ case FunctionAttributeKey.Mode:
+ tempFh.trait_mode.curValue = attr.value;
+ break;
}
- ControlBytesSend(Command.SetFloorHeat, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { fh.bus_Data.LoopID, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
}
+ byte b1 = tempFh.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0;
+ ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID, new byte[] {
+ f. localFunction.bus_Data.loopId, b1, 0, tempFh.curModeIndex, Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), Convert.ToByte( tempFh.trait_temp.curValue), 0, 0 });
break;
case FunctionType.Socket:
- //var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { function.bus_Data.LoopID, function.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
+ foreach (var attr in f.status)
+ {
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ byte onOffValue = 0;
+ switch (attr.value)
+ {
+ case "on":
+ onOffValue = 1;
+ break;
+ case "off":
+ onOffValue = 2;
+ break;
+ }
+ ControlBytesSend(Command.SetSingleLight, f.localFunction.bus_Data.SubnetID, f.localFunction.bus_Data.DeviceID,
+ new byte[] { f.localFunction.bus_Data.loopId, onOffValue });
+ break;
+ }
+ }
break;
}
}
@@ -254,7 +309,7 @@
{
var subnetId = function.bus_Data.SubnetID;
var deviceId = function.bus_Data.DeviceID;
- var loopId = function.bus_Data.LoopID;
+ var loopId = function.bus_Data.loopId;
switch (function.functionCategory)
{
@@ -273,7 +328,7 @@
{
b = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
}
- var bytes = new byte[] { function.bus_Data.LoopID,
+ var bytes = new byte[] { function.bus_Data.loopId,
b,
254, 0,Convert.ToByte(light.fadeTime) ,3,
(byte)light.redColor,(byte)light.greenColor,
@@ -292,13 +347,13 @@
b1 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
}
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] {
- function.bus_Data.LoopID,
+ function.bus_Data.loopId,
b1,
0, Convert.ToByte(light.fadeTime) });
//DimmerPage.UpdataStates(light);
break;
case FunctionType.Relay:
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.LoopID, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus_Data.loopId, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
//RelayPage.UpdataState(light);
break;
}
@@ -321,7 +376,7 @@
{
b1 = 2;
}
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, b1 });
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, b1 });
break;
case FunctionType.MotorCurtain:
case FunctionType.RollingShutter:
@@ -329,7 +384,7 @@
//{
if (curtain.trait_on_off.curValue.ToString() == "stop")
{
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, 0 });
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
}
else
{
@@ -341,7 +396,7 @@
//{
// if (curtain.trait_on_off.value.ToString() == "stop")
// {
- // ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.LoopID, 0 });
+ // ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus_Data.loopId, 0 });
// }
// else if (curtain.trait_on_off.value.ToString() == "on")
// {
@@ -360,20 +415,20 @@
{
case FunctionType.AC:
var aC = function as AC;
- ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus_Data.LoopID, (byte)aC.curTempType, 32, 32, 32, 32, 32, 0, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, Convert.ToByte(aC.trait_temp.curValue), 0 });
- //ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.on_off == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
+ ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus_Data.loopId, (byte)aC.curTempType, 32, 32, 32, 32, 32, 0, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.curModeIndex, aC.curFanIndex, Convert.ToByte(aC.trait_temp.curValue), 0 });
+ //ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.on_off == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
foreach (var dic in commandDictionary)
{
switch (dic.Key)
{
case "on_off":
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.curValue.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.loopId });
break;
case "mode":
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.LoopID });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 6, aC.curModeIndex, aC.bus_Data.loopId });
break;
case "fan":
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.LoopID });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 5, aC.curFanIndex, aC.bus_Data.loopId });
break;
case "temp":
byte modeKey = 4;
@@ -395,7 +450,7 @@
modeKey = 2;
break;
}
- ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.LoopID });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.curValue), aC.bus_Data.loopId });
break;
default:
MainPage.Log($"鍔熻兘鏈敮鎸� : {dic.Key}");
@@ -434,7 +489,7 @@
break;
}
}
- ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus_Data.LoopID, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
+ ControlBytesSend(Command.SetFloorHeat, subnetId, deviceId, new byte[] { fh.bus_Data.loopId, b1, (byte)fh.curTempType, fh.curModeIndex, fh.modeTemp["normal"], fh.modeTemp["day"], fh.modeTemp["night"], fh.modeTemp["away"], 0, 0 });
}
break;
}
@@ -446,10 +501,10 @@
var fan = function as Fan;
if (fan.trait_on_off.curValue.ToString() == "on")
{
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID, (byte)fan.openLevel });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, (byte)fan.openLevel });
}
{
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID, 0 });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId, 0 });
}
break;
}
@@ -459,7 +514,7 @@
{
case FunctionType.Socket:
var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
break;
}
break;
@@ -486,7 +541,7 @@
{
var subnetId = function.bus_Data.SubnetID;
var deviceId = function.bus_Data.DeviceID;
- var loopId = function.bus_Data.LoopID;
+ var loopId = function.bus_Data.loopId;
switch (function.functionCategory)
{
@@ -498,7 +553,7 @@
ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
break;
case FunctionType.RGB:
- ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
+ ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
break;
}
break;
@@ -508,7 +563,7 @@
case FunctionType.Curtain:
case FunctionType.MotorCurtain:
case FunctionType.RollingShutter:
- ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
+ ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
break;
}
break;
@@ -516,10 +571,10 @@
switch (function.functionType)
{
case FunctionType.AC:
- ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
+ ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
break;
case FunctionType.FloorHeating:
- ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus_Data.LoopID });
+ ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus_Data.loopId });
break;
}
break;
@@ -528,7 +583,7 @@
{
case FunctionType.Fan:
var fan = function as Fan;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.loopId });
break;
}
break;
@@ -537,14 +592,14 @@
{
case FunctionType.Socket:
var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.loopId });
break;
}
break;
case FunctionCategory.Sensor:
var sensor = function as Sensor;
ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { (byte)5,
- (byte)((int)sensor.functionType % 256), sensor.bus_Data.LoopID });
+ (byte)((int)sensor.functionType % 256), sensor.bus_Data.loopId });
break;
}
}
--
Gitblit v1.8.0