From d4811b7d34b45ff6b21b97f11da128b5572ec526 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 03 三月 2021 16:03:03 +0800
Subject: [PATCH] 20210303-1
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 205 ++++++++++++++++++++++++++++++---------------------
1 files changed, 121 insertions(+), 84 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 1a0f2b2..507f1c1 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -156,35 +156,7 @@
/// </summary>
public void ControlBusScenes(Scene scene)
{
- if (Control.Ins.IsRemote)
- {
- foreach (var f in scene.functions)
- {
- var count = 0;
- List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
- Dictionary<string, string> d = new Dictionary<string, string>();
- var pm = new DAL.Server.HttpServerRequest();
- foreach (var temp in f.status)
- {
- if (f.localFunction == null)
- {
- continue;
- }
- d.Add(temp.key, temp.value);
- var apiControlData = f.localFunction.GetApiControlData(d);
- actionObjs.Add(apiControlData);
- count++;
- if (count > 9)
- {
- var result = pm.ControlDevice(actionObjs);
- actionObjs = new List<ApiAlinkControlActionObj>();
- count = 0;
- }
- }
- var pack = pm.ControlDevice(actionObjs);
- }
- }
- else
+ if(Control.Ins.GatewayOnline_Local)
{
foreach (var f in scene.functions)
{
@@ -192,9 +164,9 @@
{
continue;
}
- switch (f.localFunction.functionType)
+ switch (f.localFunction.spk)
{
- case FunctionType.Curtain:
+ case SPK.CurtainSwitch:
foreach (var attr in f.status)
{
if (attr.key == FunctionAttributeKey.OnOff)
@@ -215,7 +187,7 @@
}
}
break;
- case FunctionType.AC:
+ case SPK.AcStandard:
AC tempAc = new AC();
foreach (var attr in f.status)
{
@@ -259,8 +231,8 @@
ControlBytesSend(Command.InstructionPanelKey, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] { modeKey, Convert.ToByte(tempAc.trait_temp.curValue), f.localFunction.bus.LoopId });
}
break;
- case FunctionType.Relay:
- case FunctionType.Dimmer:
+ case SPK.LightSwitch:
+ case SPK.LightDimming:
byte brightness = 0;
foreach (var attr in f.status)
{
@@ -285,9 +257,9 @@
ControlBytesSend(Command.SetSingleLight, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID,
new byte[] { f.localFunction.bus.LoopId, brightness, (byte)(f.localFunction.delay / 255), (byte)(f.localFunction.delay % 255) });
break;
- case FunctionType.RGB:
+ case SPK.LightRGB:
break;
- case FunctionType.FloorHeating:
+ case SPK.FloorHeatStandard:
var tempFh = new FloorHeating();
foreach (var attr in f.status)
{
@@ -308,7 +280,7 @@
ControlBytesSend(Command.SetFloorHeat, f.localFunction.bus.SubnetID, f.localFunction.bus.DeviceID, new byte[] {
f. localFunction.bus.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:
+ case SPK.ElectricSocket:
foreach (var attr in f.status)
{
if (attr.key == FunctionAttributeKey.OnOff)
@@ -332,6 +304,34 @@
}
}
}
+ else
+ {
+ foreach (var f in scene.functions)
+ {
+ var count = 0;
+ List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ var pm = new DAL.Server.HttpServerRequest();
+ foreach (var temp in f.status)
+ {
+ if (f.localFunction == null)
+ {
+ continue;
+ }
+ d.Add(temp.key, temp.value);
+ var apiControlData = f.localFunction.GetApiControlData(d);
+ actionObjs.Add(apiControlData);
+ count++;
+ if (count > 9)
+ {
+ var result = pm.ControlDevice(actionObjs);
+ actionObjs = new List<ApiAlinkControlActionObj>();
+ count = 0;
+ }
+ }
+ var pack = pm.ControlDevice(actionObjs);
+ }
+ }
}
/// <summary>
@@ -347,14 +347,31 @@
var deviceId = function.bus.DeviceID;
var loopId = function.bus.LoopId;
- switch (function.functionCategory)
+ switch (function.Spk_Prefix)
{
case FunctionCategory.Light:
var light = function as Light;
- switch (light.functionType)
+ switch (light.spk)
{
- case FunctionType.RGB:
- MainPage.Log($"rgb level : {light.brightness}");
+ case SPK.LightCCT:
+ byte b0 = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
+ if (light.trait_on_off.curValue.ToString() == "off")
+ {
+ b0 = 0;
+ }
+ else
+ {
+ b0 = (byte)light.brightness == 0 ? (byte)100 : (byte)light.brightness;
+ }
+ var bytes0 = new byte[] { function.bus.LoopId,
+ b0,
+ 254, 0,Convert.ToByte(light.fadeTime) ,2,
+ (byte)((int)light.Attr_CCT.curValue/256),(byte)((int)light.Attr_CCT.curValue%256),
+ (byte)light.BlueColor,
+ 0,0};
+ ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes0, 1);
+ break;
+ case SPK.LightRGB:
byte b = 100;//寮�鍏虫搷浣滀緷鎹畂n_off瀛楁锛屽疄闄呭紑鍏冲�间緷鎹産rightness锛屽綋on_off涓烘墦寮�锛宐rightness涓嶈兘涓�0
if (light.trait_on_off.curValue.ToString() == "off")
{
@@ -372,7 +389,7 @@
0,0};
ControlBytesSend(Command.SetLogicLoopColor, subnetId, deviceId, bytes, 1);
break;
- case FunctionType.Dimmer:
+ case SPK.LightDimming:
byte b1 = 100;
if (light.trait_on_off.curValue.ToString() == "off")
{
@@ -388,7 +405,7 @@
0, Convert.ToByte(light.fadeTime) });
//DimmerPage.UpdataStates(light);
break;
- case FunctionType.Relay:
+ case SPK.LightSwitch:
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { function.bus.LoopId, light.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0, 0, 0 });
//RelayPage.UpdataState(light);
break;
@@ -396,9 +413,9 @@
break;
case FunctionCategory.Curtain:
var curtain = function as Curtain;
- switch (curtain.functionType)
+ switch (curtain.spk)
{
- case FunctionType.Curtain:
+ case SPK.CurtainSwitch:
byte b1 = 0;
if (curtain.trait_on_off.curValue.ToString() == "stop")
{
@@ -414,8 +431,8 @@
}
ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { curtain.bus.LoopId, b1 });
break;
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
//if (commandDictionary.Count > 0)
//{
if (curtain.trait_on_off.curValue.ToString() == "stop")
@@ -446,10 +463,10 @@
break;
}
break;
- case FunctionCategory.Thermostat:
- switch (function.functionType)
+ case FunctionCategory.AC:
+ switch (function.spk)
{
- case FunctionType.AC:
+ case SPK.AcStandard:
var aC = function as AC;
ControlBytesSend(Command.SetACMode, subnetId, deviceId, new byte[] { aC.bus.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 });
@@ -495,7 +512,11 @@
}
break;
- case FunctionType.FloorHeating:
+ }
+ break;
+ case FunctionCategory.FloorHeat:
+ switch (function.spk) {
+ case SPK.FloorHeatStandard:
var fh = function as FloorHeating;
if (fh.modeTemp.Count == 4)
{
@@ -530,10 +551,10 @@
break;
}
break;
- case FunctionCategory.Electrical:
- switch (function.functionType)
+ case FunctionCategory.Electric:
+ switch (function.spk)
{
- case FunctionType.Fan:
+ case SPK.ElectricFan:
var fan = function as Fan;
if (fan.trait_on_off.curValue.ToString() == "on")
{
@@ -543,12 +564,7 @@
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId, 0 });
}
break;
- }
- break;
- case FunctionCategory.SwitchDevice:
- switch (function.functionType)
- {
- case FunctionType.Socket:
+ case SPK.ElectricSocket:
var s = function as SwitchSocket;
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId, s.trait_on_off.curValue.ToString() == "on" ? (byte)100 : (byte)0 });
break;
@@ -579,54 +595,57 @@
var deviceId = function.bus.DeviceID;
var loopId = function.bus.LoopId;
- switch (function.functionCategory)
+ switch (function.Spk_Prefix)
{
case FunctionCategory.Light:
- switch (function.functionType)
+ switch (function.spk)
{
- case FunctionType.Relay:
- case FunctionType.Dimmer:
+ case SPK.LightSwitch:
+ case SPK.LightDimming:
ControlBytesSend(Command.ReadLightAllLoopBrightness, subnetId, deviceId, new byte[] { });
break;
- case FunctionType.RGB:
+ case SPK.LightRGB:
+ ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId});
+ break;
+ case SPK.LightCCT:
ControlBytesSend(Command.ReadLogicLoopColor, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
}
break;
case FunctionCategory.Curtain:
- switch (function.functionType)
+ switch (function.spk)
{
- case FunctionType.Curtain:
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
+ case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
ControlBytesSend(Command.ReadCurtainStatus, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
}
break;
- case FunctionCategory.Thermostat:
- switch (function.functionType)
+ case FunctionCategory.AC:
+ switch (function.spk)
{
- case FunctionType.AC:
+ case SPK.AcStandard:
ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
- case FunctionType.FloorHeating:
+ }
+ break;
+ case FunctionCategory.FloorHeat:
+ switch (function.spk)
+ {
+ case SPK.FloorHeatStandard:
ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
break;
}
break;
- case FunctionCategory.Electrical:
- switch (function.functionType)
+ case FunctionCategory.Electric:
+ switch (function.spk)
{
- case FunctionType.Fan:
+ case SPK.ElectricFan:
var fan = function as Fan;
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus.LoopId });
break;
- }
- break;
- case FunctionCategory.SwitchDevice:
- switch (function.functionType)
- {
- case FunctionType.Socket:
+ case SPK.ElectricSocket:
var s = function as SwitchSocket;
ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus.LoopId });
break;
@@ -634,8 +653,26 @@
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.LoopId });
+ byte sensorType = 0;
+ switch (function.spk)
+ {
+ case SPK.SensorTemperature:
+ sensorType = 2;
+ break;
+ case SPK.SensorHumidity:
+ sensorType = 3;
+ break;
+ case SPK.SensorTVOC:
+ sensorType = 5;
+ break;
+ case SPK.SensorPm25:
+ sensorType = 6;
+ break;
+ case SPK.SensorCO2:
+ sensorType = 7;
+ break;
+ }
+ ControlBytesSend(Command.ReadDeviceLoopInfo, subnetId, deviceId, new byte[] { 5, sensorType, sensor.bus.LoopId });
break;
}
}
--
Gitblit v1.8.0