From 9dcd17ee7578c5a06bfcd960cc72ea2995716004 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 七月 2020 16:43:38 +0800
Subject: [PATCH] 20200715
---
HDL_ON/DriverLayer/CommonPage.cs | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/DriverLayer/CommonPage.cs b/HDL_ON/DriverLayer/CommonPage.cs
index 9d732f0..07fa7ec 100644
--- a/HDL_ON/DriverLayer/CommonPage.cs
+++ b/HDL_ON/DriverLayer/CommonPage.cs
@@ -211,38 +211,45 @@
case Command.ReadCurtainStutasACK:
foreach (var curtain in DB_ResidenceData.residenceData.functionList.curtains)
{
- if (curtain.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ if (curtain.bus_Data.SubnetID == subnetID && curtain.bus_Data.DeviceID == deviceID)
{
- switch(receiveBytes[1])
+ if (receiveBytes[0] == 17)
{
- case 0:
- curtain.on_off = "stop";
- break;
- case 1:
+ if (receiveBytes[1] > 1)
+ {
curtain.on_off = "on";
- curtain.lastState = Language.StringByID(StringId.Open);
- break;
- case 2:
+ }
+ else
+ {
curtain.on_off = "off";
- curtain.lastState = Language.StringByID(StringId.Close);
- break;
- default:
- if (receiveBytes[1] > 1)
- {
+ }
+ curtain.openLevel = receiveBytes[1];
+ curtain.lastState = Language.StringByID(StringId.Open) + curtain.openLevel + "%";
+ }
+ else
+ {
+ if (curtain.bus_Data.LoopID != receiveBytes[0])
+ continue;
+ switch (receiveBytes[1])
+ {
+ case 0:
+ curtain.on_off = "stop";
+ break;
+ case 1:
curtain.on_off = "on";
- }
- else
- {
+ curtain.lastState = Language.StringByID(StringId.Open);
+ break;
+ case 2:
curtain.on_off = "off";
- }
- curtain.openLevel = receiveBytes[1];
- curtain.lastState = Language.StringByID(StringId.Open) + curtain.openLevel + "%";
- break;
+ curtain.lastState = Language.StringByID(StringId.Close);
+ break;
+ }
}
RoomPage.UpdataStates(curtain);
FunctionPage.UpdataStates(curtain);
HomePage.UpdataFunctionStates(curtain);
ClassificationPage.UpdataInfo(curtain);
+ RollingShutterPage.UpdataState(curtain);
switch (curtain.functionType)
{
case FunctionType.Curtain:
--
Gitblit v1.8.0