From 9b5399d3dd4299563821af0a7131f9a52402feea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 17:42:19 +0800
Subject: [PATCH] 20209112
---
HDL_ON/DriverLayer/CommonPage.cs | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/DriverLayer/CommonPage.cs b/HDL_ON/DriverLayer/CommonPage.cs
index 92167dd..f366770 100644
--- a/HDL_ON/DriverLayer/CommonPage.cs
+++ b/HDL_ON/DriverLayer/CommonPage.cs
@@ -65,15 +65,10 @@
return BitConverter.ToSingle(byteTemp, 0);
}
-
static void Packet_ReceiveEvent(byte subnetID, byte deviceID, Command command, byte[] receiveBytes, string revGatewayIP)
{
try
{
- if(revGatewayIP == "172.16.2.237")
- {
-
- }
Control.controlLostCount = 0;
switch (command)
@@ -88,12 +83,6 @@
{
if (updataObj.functionType != FunctionType.RGB)
{
- var newState = receiveBytes[2] == 0 ? "off" : "on";
- if (updataObj.trait_on_off.value.ToString() == newState)
- {
- //鐘舵�佷竴鏍凤紝涓嶇敤鍐嶅埛鏂伴〉闈�
- break;
- }
if (updataObj.trait_on_off.value.ToString() == "on")
{
if (updataObj.functionType == FunctionType.Fan)
@@ -255,12 +244,17 @@
FunctionPage.UpdataStates(curtain);
HomePage.UpdataFunctionStates(curtain);
ClassificationPage.UpdataInfo(curtain);
- RollingShutterPage.UpdataState(curtain);
switch (curtain.functionType)
{
case FunctionType.Curtain:
CurtainModulePage.UpdataState(curtain);
break;
+ case FunctionType.MotorCurtain:
+ MotorCurtainPage.UpdataState(curtain);
+ break;
+ case FunctionType.RollingShutter:
+ RollingShutterPage.UpdataState(curtain);
+ break;
}
}
}
--
Gitblit v1.8.0