~wjc/HomeApp.git

			@@ -62,7 +62,6 @@
			/// <summary>
			/// 登陆权限编号的翻译名：1:主账号自己(本人) 2:赋予管理员权限的成员 3:成员
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public string AuthorityText = string.Empty;
			/// <summary>
			/// 用户头像数据(临时用,会置空)
			@@ -294,6 +293,14 @@
			/// 云端远程在线状态
			/// </summary>
			public bool MqttOnlineStatus = false;
			/// <summary>
			/// 与此网关在云端Emq通信时，负载加解的16位Aes密钥
			/// </summary>
			public string AesKey;
			/// <summary>
			/// 网关对应的唯一码
			/// </summary>
			public string MacMark;
			}

			/// <summary>
			@@ -1292,6 +1299,18 @@
			/// 强制跳转网关产品界面 1->网关列表强制跳转
			/// </summary>
			public int GotoGatewayProductInfoForm = 0;
			/// <summary>
			/// 自动化常开时间变更为分钟,而不是小时 1->强制变更为分钟
			/// </summary>
			public int DoorLockNomallyOpenTimeMode = 0;
			/// <summary>
			/// 是否将发送及接收到的数据写入到Log中 1->写入
			/// </summary>
			public int WriteSendAndReceveDataToFile = 0;
			/// <summary>
			/// 是否将SocketReceive的数据写入到Log中 1->写入
			/// </summary>
			public int WriteSocketReceiveDataToFile = 0;
			}
			#endregion

			@@ -1313,4 +1332,81 @@
			}

			#endregion

			#region ■ 自动化推送结果______________________

			/// <summary>
			/// 自动化推送内容
			/// </summary>
			public class LogicPushResult
			{
			/// <summary>
			/// 自动化ID
			/// </summary>
			public int LogicId = -1;
			/// <summary>
			/// 自动化名称
			/// </summary>
			public string LogicName = string.Empty;
			/// <summary>
			/// 自动化推送内容
			/// </summary>
			public string LogicCustomPushText = string.Empty;
			/// <summary>
			/// 门锁常开模式数据(自动化推送)
			/// </summary>
			public DoorNormallyOpenData ActionData = null;
			}

			/// <summary>
			/// 门锁常开模式数据(自动化推送)
			/// </summary>
			public class DoorNormallyOpenData
			{
			/// <summary>
			/// 8:常开模式的数据
			/// </summary>
			public int Actiontype = -1;
			/// <summary>
			/// 门锁Mac地址
			/// </summary>
			public string MacStr = string.Empty;
			/// <summary>
			/// 门锁端口号
			/// </summary>
			public int Epoint = -1;
			/// <summary>
			/// 设置自动化时，发送的透传数据 055704010112:常开模式打开 055704010113:常开模式关闭
			/// </summary>
			public string PassDataString = string.Empty;
			}

			#endregion

			#region ■ 网关回复接收类______________________

			/// <summary>
			/// 网关回复接收类
			/// </summary>
			public class ReceiptGatewayResult
			{
			/// <summary>
			/// 错误消息,如果没有错误,则为null(网关超时也为null)
			/// </summary>
			public string ErrorMsg = null;
			/// <summary>
			/// 错误消息的类型 -1:网关对象丢失 0:超时网关没有回复 1:正常
			/// </summary>
			public int ErrorMsgDiv = 1;
			/// <summary>
			/// 接收的数据
			/// </summary>
			public string ReceiptData = null;
			/// <summary>
			/// 接收的数据(多个返回主题专用)
			/// </summary>
			public string[] listReceiptData = null;
			}

			#endregion
			}