From dd3fecc3a8b92b377febfcf92d32ec22a07724f6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 26 九月 2021 15:21:57 +0800
Subject: [PATCH] 主从网关属性，防挤下线账号删除
---
HDL_ON/DAL/DriverLayer/Control.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 09db486..84584fd 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -407,9 +407,12 @@
switch (function.spk)
{
case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaAirCleaner2:
case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaFan2:
case SPK.ElectricTuyaWaterValve:
case SPK.ElectricTuyaWeepRobot:
+ case SPK.ElectricTuyaWeepRobot2:
useRemote = true;
break;
}
@@ -957,7 +960,6 @@
}
//鏇存柊鐣岄潰鐘舵��
- Function localObj = null;
switch (localFunction.spk)
{
case SPK.AirSwitch:
@@ -975,6 +977,7 @@
DimmerPage.UpdataStates(localFunction);
break;
case SPK.ElectricFan:
+ case SPK.HvacFan:
localFunction.lastState = Language.StringByID(StringId.Level) + " : " +
localFunction.GetAttrState(FunctionAttributeKey.OpenLevel);
FanPage.UpdataState(localFunction);
@@ -1045,6 +1048,7 @@
ACPage.UpdataStates(localFunction);
}
break;
+ case SPK.HvacFloorHeat:
case SPK.FloorHeatStandard:
localFunction.lastState = "";
switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
@@ -1082,7 +1086,7 @@
HomePage.LoadEvent_RefreshEnvirIndoorHumi();
}
EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
- A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
+ //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
break;
case SPK.SensorEnvironment:
case SPK.SensorEnvironment2:
@@ -1096,17 +1100,22 @@
HomePage.LoadEvent_RefreshEnvirIndoorHumi();
}
EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
- A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
+ //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
break;
case SPK.ElectricSocket:
+ case SPK.PanelSocket:
SocketPage.UpdataState(localFunction);
break;
case SPK.ElectricTV:
break;
case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaAirCleaner2:
case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaFan2:
case SPK.ElectricTuyaWeepRobot:
+ case SPK.ElectricTuyaWeepRobot2:
case SPK.ElectricTuyaWaterValve:
+ case SPK.ElectricTuyaWaterValve2:
case SPK.SensorPir:
case SPK.SensorDoorWindow:
case SPK.SensorSmoke:
@@ -1114,7 +1123,9 @@
case SPK.ClothesHanger:
case SPK.AcIr:
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
//璁惧鐘舵�佹帹閫�
//鐘舵�佹洿鏂�
Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
--
Gitblit v1.8.0