From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 14:10:22 +0800
Subject: [PATCH] 上传一个很特别的新版本

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs |   56 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index c69f370..e99ab65 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>
         /// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
@@ -230,6 +229,19 @@
         /// 璁惧
         /// </summary>
         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
@@ -935,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
@@ -1304,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
 

--
Gitblit v1.8.0