From a45fe56aeeac8f28a9891b83362954067c8166dc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 14 八月 2020 09:07:05 +0800
Subject: [PATCH] 请合并新代码，更改多功能面板绑定表重复问题

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index e35c611..accc927 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -231,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 鈻� 缃戝叧淇℃伅绫籣_________________________
@@ -934,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
@@ -1311,6 +1312,10 @@
         /// 鏄惁灏哠ocketReceive鐨勬暟鎹啓鍏ュ埌Log涓� 1->鍐欏叆
         /// </summary>
         public int WriteSocketReceiveDataToFile = 0;
+        /// <summary>
+        /// 鏄惁寮�鍚皟璇旳pp鍔熻兘 1->寮�鍚�
+        /// </summary>
+        public int StartDebugApp = 0;
     }
     #endregion
 
@@ -1399,13 +1404,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