From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +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