From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/DriverLayer/Control.cs | 159 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 121 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/DriverLayer/Control.cs b/HDL_ON/DriverLayer/Control.cs
index 968b248..ed96608 100644
--- a/HDL_ON/DriverLayer/Control.cs
+++ b/HDL_ON/DriverLayer/Control.cs
@@ -8,9 +8,34 @@
{
public partial class Control
{
+ /// <summary>
+ /// 鍙戦�佸懡浠�
+ /// </summary>
public static void Send(Function function)
{
- ControlBusScenes(function as Scene);
+ switch(function.functionCategory)
+ {
+ case FunctionCategory.Scene:
+ ControlScene(function as Scene);
+ break;
+
+ }
+ }
+
+ /// <summary>
+ /// 鍦烘櫙鎺у埗鍏ュ彛
+ /// </summary>
+ /// <param name="scene"></param>
+ static void ControlScene(Scene scene)
+ {
+ if (DB_ResidenceData.residenceData.GatewayType == 0)
+ {
+ ControlBusScenes(scene);
+ }
+ else
+ {
+ ControlAProtocolScene(scene);
+ }
}
/// <summary>
@@ -79,47 +104,106 @@
/// </summary>
static void ControlBusScenes(Scene scene)
{
- foreach(var busSceneData in scene.bus_SceneData)
+ foreach (var function in scene.sceneFunctionList)
{
- foreach(var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
+ switch (function.functionType)
{
- if(busSceneData.Key == function.sid)
- {
- switch (function.functionType)
+ case FunctionType.Curtain:
+ byte curtainState = 0;
+ if (function.trait_on_off.value.ToString() == "on")
{
- case FunctionType.Curtain:
- ControlBytesSend(Command.SetCurtainModelStutas, function.bus_Data.SubnetID, function.bus_Data.DeviceID, busSceneData.Value);
+ curtainState = 1;
+ }
+ else if (function.trait_on_off.value.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 = function as AC;
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.value.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)
+ {
+ case 3:
+ modeKey = 8;
break;
- case FunctionType.AC:
- ControlBytesSend(Command.SetACMode, function.bus_Data.SubnetID, function.bus_Data.DeviceID, busSceneData.Value);
+ case 0:
+ modeKey = 4;
break;
- case FunctionType.Relay:
- case FunctionType.Dimmer:
- ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, busSceneData.Value);
+ case 1:
+ modeKey = 7;
break;
- case FunctionType.RGB:
- ControlBytesSend(Command.SetLogicLoopColor, function.bus_Data.SubnetID, function.bus_Data.DeviceID, busSceneData.Value);
+ case 4:
+ modeKey = 19;
break;
- case FunctionType.FloorHeating:
- var fh = function as FloorHeating;
- if (fh.modeTemp.Count == 4)
- {
- byte b1 = fh.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
- if (fh.workMode > 0)
- {
- b1 += (byte)(16 + fh.workMode);
- }
- 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 });
- }
- break;
- case FunctionType.Socket:
- var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { s.bus_Data.LoopID, s.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
+ case 2:
+ modeKey = 2;
break;
}
- }
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
+
+ break;
+ case FunctionType.Relay:
+ case FunctionType.Dimmer:
+ byte brightness = 0;
+ if(function.trait_on_off.value.ToString() == "on")
+ {
+ var brightnessTrait = function.function.Find((obj) => obj.name == "brightness");
+ if (brightnessTrait != null)
+ {
+ brightness = Convert.ToByte(brightnessTrait.value);
+ }
+ }
+ ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID,
+ new byte[] {
+ function.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 = function as FloorHeating;
+ if (fh.modeTemp.Count == 4)
+ {
+ byte b1 = fh.trait_on_off.value.ToString() == "on" ? (byte)1 : (byte)0;
+ if (fh.workMode > 0)
+ {
+ b1 += (byte)(16 + fh.workMode);
+ }
+ 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 });
+ }
+ break;
+ case FunctionType.Socket:
+ var s = function as SwitchSocket;
+ ControlBytesSend(Command.SetSingleLight, function.bus_Data.SubnetID, function.bus_Data.DeviceID, new byte[] { s.bus_Data.LoopID, s.trait_on_off.value.ToString() == "on" ? (byte)100 : (byte)0 });
+ break;
}
}
+ }
+ /// <summary>
+ /// 鎺у埗a鍗忚鍦烘櫙
+ /// </summary>
+ /// <param name="scene"></param>
+ static void ControlAProtocolScene(Scene scene)
+ {
+ var sendSidObj = new AProtocolSendingObject();
+ //sendSidObj.from_oid = "";
+ //sendSidObj.to_oid = "";
+ sendSidObj.time_stamp = "";
+ sendSidObj.type = "device_sid";
+ sendSidObj.command = "get_list_response";
+ //杞崲鎴恇us闇�瑕佺殑鏁版嵁鏍煎紡
}
/// <summary>
@@ -134,7 +218,6 @@
var subnetId = function.bus_Data.SubnetID;
var deviceId = function.bus_Data.DeviceID;
var loopId = function.bus_Data.LoopID;
-
switch (function.functionCategory)
{
@@ -230,13 +313,13 @@
switch (dic.Key)
{
case "on_off":
- Control.ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { 3, aC.trait_on_off.value.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.value.ToString() == "on" ? (byte)1 : (byte)0, aC.bus_Data.LoopID });
break;
case "mode":
- Control.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":
- Control.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;
@@ -258,7 +341,7 @@
modeKey = 2;
break;
}
- Control.ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
+ ControlBytesSend(Command.InstructionPanelKey, aC.bus_Data.SubnetID, aC.bus_Data.DeviceID, new byte[] { modeKey, Convert.ToByte(aC.trait_temp.value), aC.bus_Data.LoopID });
break;
default:
MainPage.Log($"鍔熻兘鏈敮鎸� : {dic.Key}");
@@ -417,7 +500,7 @@
{
case FunctionType.Fan:
var fan = function as Fan;
- ControlBytesSend(Command.SetSingleLightACK, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { fan.bus_Data.LoopID });
break;
}
break;
@@ -426,7 +509,7 @@
{
case FunctionType.Socket:
var s = function as SwitchSocket;
- ControlBytesSend(Command.SetSingleLightACK, subnetId, deviceId, new byte[] { s.bus_Data.LoopID });
+ ControlBytesSend(Command.SetSingleLight, subnetId, deviceId, new byte[] { s.bus_Data.LoopID });
break;
}
break;
--
Gitblit v1.8.0