From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 7c602f5..e35c611 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -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>
+ /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+ /// </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>
+ /// 鏄惁灏嗗彂閫佸強鎺ユ敹鍒扮殑鏁版嵁鍐欏叆鍒癓og涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSendAndReceveDataToFile = 0;
+ /// <summary>
+ /// 鏄惁灏哠ocketReceive鐨勬暟鎹啓鍏ュ埌Log涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSocketReceiveDataToFile = 0;
}
#endregion
@@ -1363,4 +1382,31 @@
}
#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
}
--
Gitblit v1.8.0