From 6e580804d74d7a6fb118b6ba381e88aa81f267c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 三月 2021 15:30:23 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into dev-tzy
---
HDL_ON/Entity/Function/TV.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Function/TV.cs b/HDL_ON/Entity/Function/TV.cs
index c0b23c5..8dde74a 100644
--- a/HDL_ON/Entity/Function/TV.cs
+++ b/HDL_ON/Entity/Function/TV.cs
@@ -3,20 +3,19 @@
namespace HDL_ON.Entity
{
- public class TV : Function
+ public class TV
{
public TV()
{
- trait_on_off.curValue = "off";
}
- public void ControlTV(InfraredCode_TV iCode)
+ public void ControlTV(InfraredCode_TV iCode,Function function)
{
int RandKey = new Random().Next(0, 255);
var textByte = (byte)iCode;
- new Control_Udp().ControlBytesSend(Command.InfraredControl, bus.SubnetID, bus.DeviceID, new byte[] { 1, bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
+ new Control_Udp().ControlBytesSend(Command.InfraredControl, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 1, function.bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
}
- public void ControlTV(int number)
+ public void ControlTV(int number,Function function)
{
int RandKey = new Random().Next(0, 255);
var textByte = (byte)(number + 7);
@@ -24,7 +23,7 @@
{
textByte = 18;
}
- new Control_Udp().ControlBytesSend(Command.InfraredControl, bus.SubnetID, bus.DeviceID, new byte[] { 1, bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
+ new Control_Udp().ControlBytesSend(Command.InfraredControl, function.bus.SubnetID, function.bus.DeviceID, new byte[] { 1, function.bus.LoopId, textByte, 0, 0, (byte)RandKey }, 0);
}
}
}
--
Gitblit v1.8.0