From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
index 04f6b80..713fb8c 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
@@ -2763,6 +2763,10 @@
[System.Serializable]
public class TaskListInfo
{
+ /// <summary>
+ /// 鈽呪槄鈽呪槄鏅捐。鏋朵复鏃惰拷鍔�,鍚庢湡浼氬垹鎺�
+ /// </summary>
+ public int Epoint = -1;
/// <summary>
/// 浠诲姟绫诲瀷銆�
///<para>1锛氬紑鍏� 锛堣澶囧叿鏈夊紑鍏冲姛鑳芥椂鍙敤锛�</para>
@@ -4706,7 +4710,15 @@
/// <summary>
/// 闃插尯鍚嶇О 锛屾渶澶�32涓瓧绗�
/// </summary>
- public string ZoneName;
+ public string ZoneName;
+
+ /// <summary>
+ /// 鏄惁绂佺敤淇℃伅鎺ㄩ�侊細
+ ///<para>0锛氫笉绂佺敤</para>
+ ///<para>1锛氱鐢�</para>
+ ///<para>褰撻槻鍖虹殑淇℃伅鎺ㄩ�佽绂佺敤鏃讹紝闃插尯琚Е鍙戞椂涓嶄細鍙戦��18灏忚妭鐨勨�濋槻鍖鸿瑙﹀彂鏄姤鍛娾�濈殑涓婚淇℃伅銆�</para>
+ /// </summary>
+ public int IsDisablePushMessage = 0;
/// <summary>
/// 瀹夐槻璁惧鍒楄〃
--
Gitblit v1.8.0