From ec34983e291d1c85284472a27109d55891f9a6b5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 07 八月 2020 16:20:16 +0800
Subject: [PATCH] 不是新代码，别 合并
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 70 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index a294679..a6bd03a 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>
/// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
@@ -232,6 +231,19 @@
public ZigBee.Device.CommonDevice Device = null;
}
+ /// <summary>
+ /// 璁惧鍚嶅瓧鍐呭
+ /// </summary>
+ public class DeviceNameContent
+ {
+ public string A瀹樻柟鍚嶅瓧 = string.Empty;
+ public string A鎵�灞炲悕瀛� = string.Empty;
+ public string A澶囨敞鍚嶅瓧 = string.Empty;
+ public string A绫诲瀷鍚嶅瓧 = string.Empty;
+ public int ConcreteTypeValue = 0;
+ public int BeloneTypeValue = 0;
+ }
+
#endregion
#region 鈻� 缃戝叧淇℃伅绫籣_________________________
@@ -294,6 +306,14 @@
/// 浜戠杩滅▼鍦ㄧ嚎鐘舵��
/// </summary>
public bool MqttOnlineStatus = false;
+ /// <summary>
+ /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+ /// </summary>
+ public string AesKey;
+ /// <summary>
+ /// 缃戝叧瀵瑰簲鐨勫敮涓�鐮�
+ /// </summary>
+ public string MacMark;
}
/// <summary>
@@ -927,41 +947,29 @@
/// </summary>
public bool IsHdlDevice = true;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID,涔熷彨瀹樻柟鍚嶅瓧锛圧鏂囦欢閲岄潰鐨勶級
+ /// 璁惧鐨勫畼鏂瑰悕瀛�
/// </summary>
- public int ConcreteTextId = R.MyInternationalizationString.UnknowDevice;
+ public string ConcreteText = string.Empty;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨�,涔熷彨瀹樻柟绫诲瀷(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
+ /// 璁惧鐨勫叿浣撶被鍨�
/// </summary>
public DeviceConcreteType ConcreteType = DeviceConcreteType.UnKownDevice;
+ /// <summary>
+ /// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+ /// </summary>
+ public string BeloneText = string.Empty;
/// <summary>
/// 璁惧鎵�灞炵被鍨�
/// </summary>
public DeviceBeloneType BeloneType = DeviceBeloneType.A鏈煡璁惧;
/// <summary>
- /// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
+ /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛�
/// </summary>
- public int BeloneTextId = R.MyInternationalizationString.UnknowDevice;
+ public string DeviceDefultName = string.Empty;
/// <summary>
- /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+ /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛�
/// </summary>
- public int DefultNameId
- {
- get
- {
- int value = ConcreteTextId + 20000;
- //榛樿澶囨敞鍚嶇О鏄湪50000~59999
- if (50000 <= value && value <= 59999)
- {
- return value;
- }
- return ConcreteTextId;
- }
- }
- /// <summary>
- /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
- /// </summary>
- public int ObjectTypeNameId = R.MyInternationalizationString.UnknowDevice;
+ public string ObjectTypeName = string.Empty;
}
#endregion
@@ -1296,6 +1304,14 @@
/// 鑷姩鍖栧父寮�鏃堕棿鍙樻洿涓哄垎閽�,鑰屼笉鏄皬鏃� 1->寮哄埗鍙樻洿涓哄垎閽�
/// </summary>
public int DoorLockNomallyOpenTimeMode = 0;
+ /// <summary>
+ /// 鏄惁灏嗗彂閫佸強鎺ユ敹鍒扮殑鏁版嵁鍐欏叆鍒癓og涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSendAndReceveDataToFile = 0;
+ /// <summary>
+ /// 鏄惁灏哠ocketReceive鐨勬暟鎹啓鍏ュ埌Log涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSocketReceiveDataToFile = 0;
}
#endregion
@@ -1384,13 +1400,17 @@
/// </summary>
public int ErrorMsgDiv = 1;
/// <summary>
- /// 鎺ユ敹鐨勬暟鎹�
+ /// 鎺ユ敹鐨凞ata鏁版嵁
/// </summary>
public string ReceiptData = null;
/// <summary>
/// 鎺ユ敹鐨勬暟鎹�(澶氫釜杩斿洖涓婚涓撶敤)
/// </summary>
public string[] listReceiptData = null;
+ /// <summary>
+ /// 杩欎釜鏄綉鍏冲洖澶嶇殑鏁翠釜json鏁版嵁,涓暟涓巐istReceiptData涓�鑷�
+ /// </summary>
+ public string[] JsonData = null;
}
#endregion
--
Gitblit v1.8.0