From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 05702e2..1758563 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -184,9 +184,11 @@
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < 3000)
{
- if (topicCount <= 0 || error == true)
+ //if (error == true) { break; }
+ if (topicCount <= 0)
{
//9娆′富棰樺叏閮ㄦ帴鏀跺畬鎴�
+ await Task.Delay(1000);
break;
}
await Task.Delay(50);
@@ -455,7 +457,7 @@
foreach (var device in listdevice)
{
int MomentStatus = 1;
- int TriggerZoneStatus = 1;
+ int TriggerZoneStatus = 3;
//鑾峰彇瀹夐槻浼犳劅鍣ㄧ殑鐬棿鐘舵�佽瀹氬��
this.GetSafeguardSensorMomentStatus(device, ref MomentStatus, ref TriggerZoneStatus);
@@ -594,43 +596,43 @@
if (device.IasDeviceType == 13)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//鐑熼浘浼犳劅鍣�
else if (device.IasDeviceType == 40)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//姘翠镜浼犳劅鍣�
else if (device.IasDeviceType == 42)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//鐕冩皵浼犳劅鍣�
else if (device.IasDeviceType == 43)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//绱ф�ユ寜閽�
else if (device.IasDeviceType == 44)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//閽ュ寵鎵�
else if (device.IasDeviceType == 277)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//闂ㄧ獥浼犳劅鍣�
else if (device.IasDeviceType == 21 || device.IasDeviceType == 22)
{
MomentStatus = 0;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//濡傛灉鏄櫄鎷熻澶囷紝鍒欒繖涓笢瑗挎案鎭掍负0
if (device.DriveCode > 0)
--
Gitblit v1.8.0