From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28

---
 ZigbeeApp/Shared/Common/Device.cs | 4945 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2,625 insertions(+), 2,320 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 2e6ff99..32b497d 100644
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -1,2345 +1,2650 @@
-锘縰sing Shared.Phone.UserCenter;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using ZigBee.Device;
-
-namespace Shared.Common
-{
-    /// <summary>
-    /// 鏈湴璁惧
-    /// </summary>
-    public class LocalDevice
-    {
-        #region 鈻� 鍙橀噺澹版槑___________________________
-
-        /// <summary>
-        /// 鏈湴璁惧
+锘縰sing Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using ZigBee.Device;
+
+namespace Shared.Common
+{
+    /// <summary>
+    /// 鏈湴璁惧
+    /// </summary>
+    public class LocalDevice
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+
+        /// <summary>
+        /// 鏈湴璁惧
         /// </summary>
         private static LocalDevice m_Current = null;
-        /// <summary>
-        /// 鏈湴璁惧
+        /// <summary>
+        /// 鏈湴璁惧
         /// </summary>
-        public static LocalDevice Current
-        {
-            get
-            {
-                if (m_Current == null)
-                {
-                    m_Current = new LocalDevice();
-                }
-                return m_Current;
-            }
-            set
-            {
-                m_Current = value;
-            }
-        }
-        /// <summary>
-        /// 鏈湴鎵�鏈夎澶囩殑缂撳瓨(鎺掑簭)
-        /// </summary>
-        public List<CommonDevice> listAllDevice
-        {
-            get
-            {
-                lock (dicAllDevice)
-                {
-                    var list = new List<CommonDevice>();
-                    foreach (var device in dicAllDevice.Values)
-                    {
-                        list.Add(device);
-                    }
-                    return list;
-                }
-            }
-        }
-
-        /// <summary>
-        /// R鏂囦欢閲岄潰璁惧妯″潡ID鐨勭炕璇戝悕瀛楃殑鍓嶇紑
-        /// </summary>
-        public const string deviceModelIdName = "uDeviceModelId";
-        /// <summary>
-        /// R鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
-        /// </summary>
-        public Dictionary<string, int> dicDeviceDefultNameID = null;
-        /// <summary>
-        /// 璁惧鐨勬ā鍧桰D鐨勬灇涓�(keys:妯″潡ID  value:璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
-        /// </summary>
-        private Dictionary<string, string> dicDeviceModelIdEnum = null;
-        /// <summary>
-        /// 闇�瑕佽浆鎹㈢殑璁惧鐨勬ā鍧桰D(keys:鏃фā鍧桰D,value:鏂版ā鍧桰D)
-        /// </summary>
-        private Dictionary<string, string> dicDeviceModelIdChanged = null;
-        /// <summary>
-        /// 鏈湴鎵�鏈夎澶囩殑缂撳瓨(闈炲叕寮�)
-        /// </summary>
-        private Dictionary<string, CommonDevice> dicAllDevice = new Dictionary<string, CommonDevice>();
-        /// <summary>
-        /// 鏈湴鎵�鏈夌殑椤剁偣鍗囩骇璁惧(闈炲叕寮�锛屼富閿槸MAC+200绔彛)
-        /// </summary>
-        private Dictionary<string, OTADevice> dicOTADevice = new Dictionary<string, OTADevice>();
-        /// <summary>
-        /// 璁惧鐨勬�诲洖璺�(keys:Mac鍦板潃  value:鍏ㄩ儴绔彛鍙�)
-        /// </summary>
-        private Dictionary<string, HashSet<int>> dicDeviceEpoint = new Dictionary<string, HashSet<int>>();
-        /// <summary>
-        /// 鐗╃悊璁惧灞炰簬鍝釜鎴块棿鐨勮褰�
-        /// </summary>
-        private Dictionary<string, string> dicDeviceRoomId = null;
-
-        #endregion
-
-        #region 鈻� 鍒锋柊璁惧___________________________
-
+        public static LocalDevice Current
+        {
+            get
+            {
+                if (m_Current == null)
+                {
+                    m_Current = new LocalDevice();
+                }
+                return m_Current;
+            }
+            set
+            {
+                m_Current = value;
+            }
+        }
+        /// <summary>
+        /// 鏈湴鎵�鏈夎澶囩殑缂撳瓨
+        /// </summary>
+        public List<CommonDevice> listAllDevice
+        {
+            get
+            {
+                lock (dicAllDevice)
+                {
+                    var list = new List<CommonDevice>();
+                    foreach (var device in dicAllDevice.Values)
+                    {
+                        list.Add(device);
+                    }
+                    return list;
+                }
+            }
+        }
+
+        /// <summary>
+        /// R鏂囦欢閲岄潰璁惧妯″潡ID鐨勭炕璇戝悕瀛楃殑鍓嶇紑
+        /// </summary>
+        public const string deviceModelIdName = "uDeviceModelId";
+        /// <summary>
+        /// R鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
+        /// </summary>
+        public Dictionary<string, int> dicDeviceDefultNameID = null;
+        /// <summary>
+        /// 璁惧鐨勬ā鍧桰D鐨勬灇涓�(keys:妯″潡ID  value:璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
+        /// </summary>
+        private Dictionary<string, string> dicDeviceModelIdEnum = null;
+        /// <summary>
+        /// 闇�瑕佽浆鎹㈢殑璁惧鐨勬ā鍧桰D(keys:鏃фā鍧桰D,value:鏂版ā鍧桰D)
+        /// </summary>
+        private Dictionary<string, string> dicDeviceModelIdChanged = null;
+        /// <summary>
+        /// 鍥剧墖鍏辨湁(keys:鎸囧畾璁惧鐨勫叿浣撶被鍨� value:鎸囧畾鍏辨湁瀵硅薄鐨勫叿浣撶被鍨�)
+        /// </summary>
+        private Dictionary<string, string> dicPictrueShard = null;
+        /// <summary>
+        /// 鏈湴鎵�鏈夎澶囩殑缂撳瓨(闈炲叕寮�)
+        /// </summary>
+        private Dictionary<string, CommonDevice> dicAllDevice = new Dictionary<string, CommonDevice>();
+        /// <summary>
+        /// 鏈湴鎵�鏈夌殑椤剁偣鍗囩骇璁惧(闈炲叕寮�锛屼富閿槸MAC+200绔彛)
+        /// </summary>
+        private Dictionary<string, OTADevice> dicOTADevice = new Dictionary<string, OTADevice>();
+        /// <summary>
+        /// 璁惧鐨勬�诲洖璺�(keys:Mac鍦板潃  value:鍏ㄩ儴绔彛鍙�)
+        /// </summary>
+        private Dictionary<string, HashSet<int>> dicDeviceEpoint = new Dictionary<string, HashSet<int>>();
+        /// <summary>
+        /// 鐗╃悊璁惧灞炰簬鍝釜鎴块棿鐨勮褰�
+        /// </summary>
+        private Dictionary<string, string> dicDeviceRoomId = null;
+
+        #endregion
+
+        #region 鈻� 鍒锋柊璁惧___________________________
+
         /// <summary>
         /// 鍒锋柊鏈湴璁惧淇℃伅
         /// </summary>
         public void ReFreshByLocal()
         {
             this.dicAllDevice.Clear();
-            this.dicDeviceEpoint.Clear();
+            this.dicDeviceEpoint.Clear();
 
             //鍒濆鍖朢鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
             this.InitDeviceDefultNameIDList();
 
             //鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
             List<string> listFile = this.GetAllDeviceFile();
-            foreach (string file in listFile)
-            {
-                //鍙嶅簭鍒楀寲涓烘寚瀹氱殑绫伙紝涓嶇劧鏁版嵁浼氫涪澶辫�屽鑷存棤娉曞己杞�
-                var device = ZigBee.Device.CommonDevice.CommonDeviceByFilePath(file);
-                if (device == null || device.CurrentGateWayId == null)
-                {
-#if DEBUG
-                    //璋冩煡,涓轰粈涔堝畠浼氭妸鍏ㄩ儴璁惧鍒犳帀锛�
-                    string file1 = UserCenterLogic.CombinePath(file);
-                    string file2 = UserCenterLogic.CombinePath("Back_" + file);
-                    System.IO.File.Copy(file1, file2, true);
-#endif
-                    //澶辨晥鐨勬枃浠讹紝娌℃湁缃戝叧id鐨勯兘鍒犻櫎鎺�
-                    Global.DeleteFilebyHomeId(file);
-                    continue;
-                }
-                //濡傛灉杩欎釜璁惧鐨勭綉鍏矷D涓嶅瓨鍦ㄧ殑璇�
-                if (HdlGatewayLogic.Current.IsGatewayExist(device.CurrentGateWayId) == false)
-                {
-                    if (UserCenterResourse.UserInfo.AuthorityNo == 3)
-                    {
-                        //濡傛灉浠栨槸鎴愬憳鐨勮瘽,甯粬鏂板缓涓�涓綉鍏�
-                        HdlGatewayLogic.Current.AddVirtualGateway(device.CurrentGateWayId);
-                    }
-                    else
-                    {
-#if DEBUG
-                        //璋冩煡,涓轰粈涔堝畠浼氭妸鍏ㄩ儴璁惧鍒犳帀锛�
-                        string file1 = UserCenterLogic.CombinePath(file);
-                        string file2 = UserCenterLogic.CombinePath("Back_" + file);
-                        System.IO.File.Copy(file1, file2, true);
-#endif
-                        //濡傛灉鏄富浜�,鎴栬�呯鐞嗗憳,閭d箞杩欎釜鏂囦欢鏄潪娉曠殑,鐩存帴鍒犻櫎
-                        Global.DeleteFilebyHomeId(file);
-                        continue;
-                    }
-                }
-
-                string mainKey = this.GetDeviceMainKeys(device);
-                if (device is OTADevice)
-                {
-                    //200绔彛涓嶉渶瑕佸鐞�
-                    this.dicOTADevice[mainKey] = (OTADevice)device;
-                    continue;
-                }
-                //娣诲姞缂撳瓨
-                this.dicAllDevice[mainKey] = device;
-
-                //鍥炶矾鏀堕泦
-                if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
-                {
-                    this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
-                }
-                this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
-
-                //妫�娴婾i鍥剧墖鏄惁姝g‘,杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
-                if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(device.IconPath)) == true)
-                {
-                    //涓嶅瓨鍦ㄧ殑璇濓紝閲嶆柊鐢熸垚
-                    device.IconPath = string.Empty;
-                    device.ReSave();
-                    HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
-                }
+            foreach (string file in listFile)
+            {
+                CommonDevice device = null;
+                //鍙嶅簭鍒楀寲涓烘寚瀹氱殑绫伙紝涓嶇劧鏁版嵁浼氫涪澶辫�屽鑷存棤娉曞己杞�
+                try
+                {
+                    device = CommonDevice.CommonDeviceByFilePath(file);
+                }
+                catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
+
+                if (device == null || device.CurrentGateWayId == null)
+                {
+#if DEBUG
+                    //璋冩煡,涓轰粈涔堝畠浼氭妸鍏ㄩ儴璁惧鍒犳帀锛�
+                    string file1 = UserCenterLogic.CombinePath(file);
+                    string file2 = UserCenterLogic.CombinePath("Back_" + file);
+                    System.IO.File.Copy(file1, file2, true);
+#endif
+                    //澶辨晥鐨勬枃浠讹紝娌℃湁缃戝叧id鐨勯兘鍒犻櫎鎺�
+                    Global.DeleteFilebyHomeId(file);
+                    continue;
+                }
+                //濡傛灉杩欎釜璁惧鐨勭綉鍏矷D涓嶅瓨鍦ㄧ殑璇�
+                if (HdlGatewayLogic.Current.IsGatewayExist(device.CurrentGateWayId) == false)
+                {
+                    if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+                    {
+                        //濡傛灉浠栨槸鎴愬憳鐨勮瘽,甯粬鏂板缓涓�涓綉鍏�
+                        HdlGatewayLogic.Current.AddVirtualGateway(device.CurrentGateWayId);
+                    }
+                    else
+                    {
+#if DEBUG
+                        //璋冩煡,涓轰粈涔堝畠浼氭妸鍏ㄩ儴璁惧鍒犳帀锛�
+                        string file1 = UserCenterLogic.CombinePath(file);
+                        string file2 = UserCenterLogic.CombinePath("Back_" + file);
+                        System.IO.File.Copy(file1, file2, true);
+#endif
+                        //濡傛灉鏄富浜�,鎴栬�呯鐞嗗憳,閭d箞杩欎釜鏂囦欢鏄潪娉曠殑,鐩存帴鍒犻櫎
+                        Global.DeleteFilebyHomeId(file);
+                        continue;
+                    }
+                }
+
+                string mainKey = this.GetDeviceMainKeys(device);
+                if (device is OTADevice)
+                {
+                    //200绔彛涓嶉渶瑕佸鐞�
+                    this.dicOTADevice[mainKey] = (OTADevice)device;
+                    continue;
+                }
+                //娣诲姞缂撳瓨
+                this.dicAllDevice[mainKey] = device;
+
+                //鍥炶矾鏀堕泦
+                if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
+                {
+                    this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
+                }
+                this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
+
+                //妫�娴婾i鍥剧墖鏄惁姝g‘,杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
+                if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(device.IconPath)) == true)
+                {
+                    //涓嶅瓨鍦ㄧ殑璇濓紝閲嶆柊鐢熸垚
+                    device.IconPath = string.Empty;
+                    device.ReSave();
+                    HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+                }
             }
             //鎴愬憳韬唤鐨勬椂鍊�,鍒犻櫎鎺夐潪娉曠殑缃戝叧鏂囦欢
             this.DeleteGatewayFileByMemberModel();
             //鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
             this.InitRealDeviceRoomId();
-        }
-
-        /// <summary>
-        /// 鎴愬憳韬唤鐨勬椂鍊�,鍒犻櫎鎺夐潪娉曠殑缃戝叧鏂囦欢
-        /// </summary>
-        private void DeleteGatewayFileByMemberModel()
-        {
-            if (UserCenterResourse.UserInfo.AuthorityNo != 3)
-            {
-                return;
-            }
-            var listId = new HashSet<string>();
-
-            lock (dicAllDevice)
-            {
-                foreach (var device in this.dicAllDevice.Values)
-                {
-                    if (listId.Contains(device.CurrentGateWayId) == false)
-                    {
-                        listId.Add(device.CurrentGateWayId);
-                    }
-                }
-            }
-            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
-            foreach (var gateway in listGateway)
-            {
-                string gwId = HdlGatewayLogic.Current.GetGatewayId(gateway);
-                if (listId.Contains(gwId) == false)
-                {
-                    //杩欎釜缃戝叧瀵逛簬褰撳墠杩欎釜鎴愬憳鏉ヨ鏄潪娉曠殑
-                    HdlGatewayLogic.Current.DeleteGatewayFile(gwId);
-                }
-            }
-        }
-
-        #endregion
-
-        #region 鈻� 娣诲姞璁惧___________________________
-
-        /// <summary>
-        /// 灏嗘寚瀹氱綉鍏崇殑璁惧瀛樺叆缂撳瓨涓�(浠庢柊鑾峰彇闀滃儚)
-        /// </summary>
-        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
-        /// <param name="deviceComingAction">鎺ユ敹鍒拌澶囨椂鐨勪簨浠�,璁惧瀵硅薄涓簄ull鏃�,浠h〃鎺ユ敹瀹屾垚</param>
-        /// <returns>涓�鐩磋繑鍥瀟rue</returns>
-        public bool SetDeviceToMemmoryByGateway(ZbGateway zbGateway, Action<CommonDevice> deviceComingAction = null)
-        {
-            //浠庣綉鍏宠幏鍙栧叏閮ㄧ殑璁惧
-            List<CommonDevice> listDevice = new List<CommonDevice>();
-            List<CommonDevice> list = this.GetDeviceListFromGateway(zbGateway, true, deviceComingAction);
-
-            if (list == null)
-            {
-                return false;
-            }
-            listDevice.AddRange(list);
-
-            //鑾峰彇杩欎釜缃戝叧鐨勬湰鍦版墍鏈夎澶�
-            string gwID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
-            List<CommonDevice> listLocalDevices = this.GetDeviceByGatewayID(gwID);
-            Dictionary<string, CommonDevice> dicExist = new Dictionary<string, CommonDevice>();
-            foreach (var device in listLocalDevices)
-            {
-                string maikey = this.GetDeviceMainKeys(device);
-                dicExist[maikey] = device;
-            }
-
-            //娣诲姞璁惧鐨勭紦瀛�
-            for (int i = 0; i < listDevice.Count; i++)
-            {
-                var device = listDevice[i];
-                if (device == null || device.DeviceAddr == null)
-                {
-                    continue;
-                }
-                //娣诲姞缂撳瓨
-                this.AddDeviceToMemory(ref device);
-
-                //绉婚櫎瀛樺湪鐨勮澶囧唴瀛� 
-                string maikey = this.GetDeviceMainKeys(device);
-                if (dicExist.ContainsKey(maikey) == true)
-                {
-                    dicExist.Remove(maikey);
-                }
-                //鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
-                HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
-            }
-
-            for (int i = 0; i < listDevice.Count; i++)
-            {
-                var device = listDevice[i];
-                //瀵规湭鍛藉悕鐨勮澶囬噸鏂板懡鍚�
-                if (this.GetSimpleEpointName(device) == string.Empty)
-                {
-                    //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
-                    var dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
-                    //铏氭嫙璁惧鐨勮瘽锛岄檮鍔犲洖璺彿
-                    if (device.DriveCode > 0)
-                    {
-                        //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
-                        dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
-                    }
-                    //澶氬洖璺澶囩殑璇濓紝闄勫姞鍥炶矾鍙�
-                    else if (dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && dicDeviceEpoint[device.DeviceAddr].Count > 1)
-                    {
-                        var arry = dName.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
-                        dName = arry[0].Trim();
-                        //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
-                        dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
-                    }
-
-                    HdlThreadLogic.Current.RunThread(async () =>
-                    {
-                        await this.ReName(device, dName, ShowErrorMode.NO);
-                    });
-                }
-            }
-
-            //濡傛灉鏈湴鍜岀綉鍏崇殑璁惧涓嶄竴鑷寸殑鏃跺�欙紝鏆傛椂鍒犻櫎鏈湴鐨勮澶�
-            //娉ㄦ剰锛氬彧鏄垹闄よ澶囨枃浠讹紝鎴块棿鍐呭浠�涔堢殑杩樺瓨鍦ㄧ潃
-            foreach (var device in dicExist.Values)
-            {
-                this.DeleteMemmoryDevice(device, false);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// 娣诲姞璁惧鍒扮紦瀛�,瀛樺湪鏃惰鐩�
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄(杩欎釜涓滆タ鏈夊彲鑳戒細琚洿鏀�)</param>
-        public void AddDeviceToMemory(ref CommonDevice device)
-        {
-            string mainKeys = this.GetDeviceMainKeys(device);
-            //濡傛灉瀹冩槸鍗囩骇鐨勯《绔鐐�,鍒欎笉鑳借瀹冨姞鍏ュ埌缂撳瓨锛屼絾鏄彲浠ヨ浠栫敓鎴愭枃浠�
-            if (device is OTADevice)
-            {
-                if (this.dicOTADevice.ContainsKey(mainKeys) == false)
-                {
-                    this.dicOTADevice[mainKeys] = (OTADevice)device;
-                }
-                else
-                {
-                    //浜ゆ崲灞炴��
-                    var tempDevice = this.dicOTADevice[mainKeys];
-                    //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
-                    this.SetDeviceInfoToMain(tempDevice, device);
-                    device = tempDevice;
-                }
-
-                bool exists = Global.IsExistsByHomeId(device.FilePath);
-                device.ReSave();
-                if (exists == false)
-                {
-                    //娣诲姞鑷姩澶囦唤
-                    HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
-                }
-                return;
-            }
-
-            lock (dicAllDevice)
-            {
-                if (this.dicAllDevice.ContainsKey(mainKeys) == true)
-                {
-                    //浜ゆ崲灞炴��
-                    var tempDevice = this.dicAllDevice[mainKeys];
-                    //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
-                    this.SetDeviceInfoToMain(tempDevice, device);
-                    device = tempDevice;
-                }
-                else
-                {
-                    this.dicAllDevice[mainKeys] = device;
-                }
-            }
-
-            //璁惧鍥炶矾鏀堕泦
-            if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
-            {
-                this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
-            }
-            if (this.dicDeviceEpoint[device.DeviceAddr].Contains(device.DeviceEpoint) == false)
-            {
-                this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
-            }
-
-            bool exists2 = Global.IsExistsByHomeId(device.FilePath);
-            device.ReSave();
-            if (exists2 == false)
-            {
-                //娣诲姞鑷姩澶囦唤
-                HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
-            }
-        }
-
-        #endregion
-
-        #region 鈻� 淇敼璁惧___________________________
-
-        /// <summary>
-        /// 鏇存敼鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <param name="newName">鏂板悕瀛�</param>
-        /// <param name="mode">鏄惁鏄剧ず閿欒</param>
-        public async Task<bool> ReName(CommonDevice device, string newName, ShowErrorMode mode = ShowErrorMode.YES)
-        {
-            //鍏堝埆绠¢偅涔堝锛屾洿鏀瑰悕瀛楀悗锛屽埛鏂拌澶囩紦瀛�
-            this.SetEpointName(device, newName);
-
-            this.BackupDeviceAfterReName(device);
-
-            //涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
-            //鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
-            if (UserCenterResourse.UserInfo.AuthorityNo != 3)
-            {
-                var result = await device.RenameDeviceNameAsync(device.DeviceAddr, device.DeviceEpoint, newName);
-                if (result == null || result.deviceRenameData == null || result.deviceRenameData.Result == 1)
-                {
-                    //璁惧鍚嶇О淇敼澶辫触
-                    string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail);
-                    //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
-                    msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
-
-                    if (mode == ShowErrorMode.YES)
-                    {
-                        this.ShowErrorMsg(msg);
-                    }
-                    return false;
-                }
-                //澶囦唤鏁版嵁
-                await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A绔偣鍚嶇О, newName);
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 鏇存敼Mac鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
-        /// </summary>
-        /// <param name="listDevice">璁惧瀵硅薄</param>
-        /// <param name="newMacName">鏂板悕瀛�</param>
-        /// <param name="mode">鏄惁鏄剧ず閿欒</param>
-        public async Task<bool> ReMacName(List<CommonDevice> listDevice, string newMacName, ShowErrorMode mode = ShowErrorMode.YES)
-        {
-            if (listDevice.Count == 0)
-            {
-                return true;
-            }
-            //鍏堝埆绠¢偅涔堝锛屽厛淇敼缂撳瓨
-            for (int i = 0; i < listDevice.Count; i++)
-            {
-                var device2 = listDevice[i];
-                //杩欎袱涓笢瑗垮緢鐗规畩
-                this.SetMacName(device2, newMacName);
-
-                //鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
-                this.BackupDeviceAfterReName(device2);
-            }
-
-            CommonDevice device = listDevice[0];
-            //涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
-            //鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
-            if (UserCenterResourse.UserInfo.AuthorityNo != 3)
-            {
-                //淇敼鐗╃悊鍚嶅瓧
-                var result = await device.RenameDeviceMacNameAsync(device.DeviceAddr, device.DeviceEpoint, newMacName);
-                if (result == null || result.renameDeviceMacNameData == null || result.renameDeviceMacNameData.Result != 0)
-                {
-                    //璁惧鍚嶇О淇敼澶辫触
-                    string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail);
-                    //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
-                    msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
-                    if (mode == ShowErrorMode.YES)
-                    {
-                        this.ShowErrorMsg(msg);
-                    }
-                    return false;
-                }
-                //澶囦唤鏁版嵁
-                await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.AMac鍚嶇О, newMacName);
-                //濡傛灉瀹冨彧鏈変竴涓洖璺�,鍒欐洿鏀圭鐐瑰悕瀛�
-                if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count == 1)
-                {
-                    return await this.ReName(device, newMacName);
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
-        /// </summary>
-        /// <param name="device"></param>
-        private void BackupDeviceAfterReName(CommonDevice device)
-        {
-            lock (dicAllDevice)
-            {
-                string mainKeys = this.GetDeviceMainKeys(device);
-                if (this.dicAllDevice.ContainsKey(mainKeys) == false)
-                {
-                    return;
-                }
-                this.dicAllDevice[mainKeys] = device;
-                device.ReSave();
-
-                //娣诲姞鑷姩澶囦唤
-                HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
-            }
-        }
-
-        #endregion
-
-        #region 鈻� 鍒犻櫎璁惧___________________________
-
-        /// <summary>
-        /// 鍒犻櫎璁惧骞朵笖鍒锋柊缂撳瓨(鍒犻櫎澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
-        /// </summary>
-        /// <param name="listdevice">璁惧瀵硅薄(MAC鍦板潃蹇呴』瑕佺浉鍚�)</param>
-        public async Task<bool> DeleteDevice(List<CommonDevice> listdevice)
-        {
-            var data = new CommonDevice.RemoveDeviceData();
-            var info = new CommonDevice.RemoveDeviceListInfo();
-            info.DeviceAddr = listdevice[0].DeviceAddr;
-            data.DeviceAddrList.Add(info);
-
-            //鍒犱竴娆$殑鏃跺�欙紝瀹冧細鎶奙AC鍦板潃涓嬮潰鍏ㄩ儴鐨勮澶囬兘鍒犻櫎
-            var result = await listdevice[0].DeleteDeviceAsync(data);
-            if (result == null || result.removeDeviceResponseData == null || result.removeDeviceResponseData.Result != 0)
-            {
-                //璁惧鍒犻櫎澶辫触
-                string msg = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail);
-                //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
-                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
-
-                this.ShowErrorMsg(msg);
-                return false;
-            }
-
-            //鍒犻櫎鏂囦欢
-            foreach (CommonDevice device in listdevice)
-            {
-                this.DeleteMemmoryDevice(device);
-            }
-            if (this.dicDeviceRoomId.ContainsKey(listdevice[0].DeviceAddr) == true)
-            {
-                //绉婚櫎鐪熷疄璁惧鐨勬埧闂寸储寮�
-                this.dicDeviceRoomId.Remove(listdevice[0].DeviceAddr);
-                this.SaveRealDeviceRoomId(null, null);
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// 鍒犻櫎缂撳瓨鐨勮澶�
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <param name="deleteRoom">鏄惁浠庢埧闂村垹闄�</param>
-        public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
-        {
-            //鍒犻櫎缂撳瓨
-            string mainKeys = this.GetDeviceMainKeys(device);
-            lock (dicAllDevice)
-            {
-                if (this.dicAllDevice.ContainsKey(mainKeys) == true)
-                {
-                    this.dicAllDevice.Remove(mainKeys);
-                }
-            }
-
-            //鍒犻櫎璁惧鏂囦欢
-            string filePath = device.FilePath;
-            if (Global.IsExistsByHomeId(filePath) == true)
-            {
-                if (UserCenterResourse.UserInfo.AuthorityNo == 3)
-                {
-                    //鎴愬憳鐨勮瘽,鐩存帴鍒犻櫎,娌℃湁鍟嗛噺鐨勪綑鍦�
-                    Global.DeleteFilebyHomeId(filePath);
-                }
-                else
-                {
-                    //鍙樻洿锛氭悶鎺夊畠,涓嶇暀浜�
-                    Global.DeleteFilebyHomeId(filePath);
-                    //鍒犻櫎鑷姩澶囦唤
-                    HdlAutoBackupLogic.DeleteFile(device.FilePath);
-                }
-            }
-
-            //鍒犻櫎200绔彛鏂囦欢
-            string otaKeys = this.GetDeviceMainKeys(device.DeviceAddr, 200);
-            if (this.dicOTADevice.ContainsKey(otaKeys) == true)
-            {
-                string otaFile = this.dicOTADevice[otaKeys].FilePath;
-                if (Global.IsExistsByHomeId(otaFile) == true)
-                {
-                    if (UserCenterResourse.UserInfo.AuthorityNo == 3)
-                    {
-                        //鎴愬憳鐨勮瘽,鐩存帴鍒犻櫎,娌℃湁鍟嗛噺鐨勪綑鍦�
-                        Global.DeleteFilebyHomeId(filePath);
-                    }
-                    else
-                    {
-                        //鍙樻洿锛氭悶鎺夊畠,涓嶇暀浜�
-                        Global.DeleteFilebyHomeId(filePath);
-                        //鍒犻櫎鑷姩澶囦唤
-                        HdlAutoBackupLogic.DeleteFile(otaFile);
-                    }
-                }
-                this.dicOTADevice.Remove(otaKeys);
-            }
-
-            if (deleteRoom == true && Room.CurrentRoom != null)
-            {
-                //浠庢埧闂翠腑鍒犻櫎
-                Room.CurrentRoom.DeleteDevice(device);
-            }
-        }
-
-        #endregion
-
-        #region 鈻� 娴嬭瘯璁惧___________________________
-
-        /// <summary>
-        /// 鍙戦�佸畾浣嶆寚浠ゅ埌璁惧
-        /// </summary>
-        /// <param name="device"></param>
-        public void SetFixedPositionCommand(CommonDevice device)
-        {
-            device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
-        }
-
-        /// <summary>
-        /// 妫�娴嬭澶囨槸鍚︽嫢鏈夊畾浣嶇殑鍔熻兘
-        /// </summary>
-        /// <param name="device"></param>
-        /// <returns></returns>
-        public bool DeviceIsCanFixedPosition(CommonDevice device)
-        {
-            foreach (var data in device.InClusterList)
-            {
-                //鎷ユ湁on/off鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
-                if (data.InCluster == 3)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// 妫�娴嬭澶囨槸鍚︽嫢鏈夊紑鍏崇殑鍔熻兘(杈撳嚭绨�)
-        /// </summary>
-        /// <param name="device"></param>
-        /// <returns></returns>
-        public bool OutDeviceIsCanOnOff(CommonDevice device)
-        {
-            foreach (var data in device.OutClusterList)
-            {
-                //鎷ユ湁on/off鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
-                if (data.OutCluster == 6)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// 妫�娴嬭澶囨槸鍚︽嫢鏈夊紑鍏崇殑鍔熻兘(杈撳叆绨�)
-        /// </summary>
-        /// <param name="device"></param>
-        /// <returns></returns>
-        public bool InDeviceIsCanOnOff(CommonDevice device)
-        {
-            foreach (var data in device.InClusterList)
-            {
-                //鎷ユ湁on/off鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
-                if (data.InCluster == 6)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        #endregion
-
-        #region 鈻� 鑾峰彇璁惧___________________________
-
-        /// <summary>
-        /// 鏍规嵁缃戝叧ID鑾峰彇鎵�鏈夌殑璁惧
-        /// </summary>
-        /// <param name="gwId">缃戝叧ID</param>
-        /// <returns></returns>
-        public List<CommonDevice> GetDeviceByGatewayID(string gwId)
-        {
-            List<CommonDevice> list = new List<CommonDevice>();
-            lock (dicAllDevice)
-            {
-                //鍚勭綉鍏崇殑鎵�鏈夎澶�
-                foreach (CommonDevice device in this.dicAllDevice.Values)
-                {
-                    if (gwId == device.CurrentGateWayId)
-                    {
-                        list.Add(device);
-                    }
-                }
-            }
-
-            return list;
-        }
-
-        /// <summary>
-        /// 鑾峰彇鎸囧畾璁惧(涓婚敭鏄細Mac鍦板潃+绔彛鍙�),涓嶅瓨鍦ㄦ椂锛岃繑鍥瀗ull
-        /// </summary>
-        /// <param name="mainKeys">Mac鍦板潃+绔彛鍙�</param>
-        /// <returns></returns>
-        public CommonDevice GetDevice(string mainKeys)
-        {
-            lock (dicAllDevice)
-            {
-                if (this.dicAllDevice.ContainsKey(mainKeys) == true)
-                {
-                    return this.dicAllDevice[mainKeys];
-                }
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// 鑾峰彇鎸囧畾璁惧,涓嶅瓨鍦ㄦ椂锛岃繑鍥瀗ull
-        /// </summary>
-        /// <param name="DeviceAddr">Mac鍦板潃</param>
-        /// <param name="DeviceEpoint">绔彛鍙�</param>
-        /// <returns></returns>
-        public CommonDevice GetDevice(string DeviceAddr, int DeviceEpoint)
-        {
-            string mainkeys = this.GetDeviceMainKeys(DeviceAddr, DeviceEpoint);
-            return this.GetDevice(mainkeys);
-        }
-
-        /// <summary>
-        /// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�(宸茬粡鎺掑簭)
-        /// </summary>
-        /// <param name="DeviceAddr">Mac鍦板潃</param>
-        /// <returns></returns>
-        public List<CommonDevice> GetDevicesByMac(string DeviceAddr)
-        {
-            var list = new List<CommonDevice>();
-            if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
-            {
-                return list;
-            }
-            foreach (var point in dicDeviceEpoint[DeviceAddr])
-            {
-                var device = this.GetDevice(DeviceAddr, point);
-                if (device != null)
-                {
-                    list.Add(device);
-                }
-            }
-            //鎺掑簭
-            list.Sort((obj1, obj2) =>
-            {
-                if (obj1.DeviceEpoint > obj2.DeviceEpoint)
-                {
-                    return 1;
-                }
-                return -1;
-            });
-            return list;
-        }
-
-        /// <summary>
-        /// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勬暟閲�
-        /// </summary>
-        /// <param name="DeviceAddr">Mac鍦板潃</param>
-        /// <returns></returns>
-        public int GetDevicesCountByMac(string DeviceAddr)
-        {
-            if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
-            {
-                return 0;
-            }
-            return dicDeviceEpoint[DeviceAddr].Count;
-        }
-
-        /// <summary>
-        /// 鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
-        /// </summary>
-        /// <returns></returns>
-        public List<string> GetAllDeviceFile()
-        {
-            List<string> listDeviceFile = new List<string>();
+        }
+
+        /// <summary>
+        /// 鎴愬憳韬唤鐨勬椂鍊�,鍒犻櫎鎺夐潪娉曠殑缃戝叧鏂囦欢
+        /// </summary>
+        private void DeleteGatewayFileByMemberModel()
+        {
+            if (UserCenterResourse.UserInfo.AuthorityNo != 3)
+            {
+                return;
+            }
+            var listId = new HashSet<string>();
+
+            lock (dicAllDevice)
+            {
+                foreach (var device in this.dicAllDevice.Values)
+                {
+                    if (listId.Contains(device.CurrentGateWayId) == false)
+                    {
+                        listId.Add(device.CurrentGateWayId);
+                    }
+                }
+            }
+            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
+            foreach (var gateway in listGateway)
+            {
+                string gwId = HdlGatewayLogic.Current.GetGatewayId(gateway);
+                if (listId.Contains(gwId) == false)
+                {
+                    //杩欎釜缃戝叧瀵逛簬褰撳墠杩欎釜鎴愬憳鏉ヨ鏄潪娉曠殑
+                    HdlGatewayLogic.Current.DeleteGatewayFile(gwId);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 鈻� 娣诲姞璁惧___________________________
+
+        /// <summary>
+        /// <para>灏嗘寚瀹氱綉鍏崇殑璁惧瀛樺叆缂撳瓨涓�(浠庢柊鑾峰彇闀滃儚)</para>
+        /// <para>-1:寮傚父 1:姝e父 2:璁惧淇℃伅缂烘崯</para>
+        /// </summary>
+        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+        public int SetDeviceToMemmoryByGateway(ZbGateway zbGateway)
+        {
+            //浠庣綉鍏宠幏鍙栧叏閮ㄧ殑璁惧
+            int statu = 0;
+            List<CommonDevice> listDevice = new List<CommonDevice>();
+            List<CommonDevice> list = this.GetDeviceListFromGateway(zbGateway, ref statu, true);
+            if (list == null)
+            {
+                return -1;
+            }
+            listDevice.AddRange(list);
+
+            //鑾峰彇杩欎釜缃戝叧鐨勬湰鍦版墍鏈夎澶�
+            string gwID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
+            List<CommonDevice> listLocalDevices = this.GetDeviceByGatewayID(gwID, true);
+            Dictionary<string, CommonDevice> dicExist = new Dictionary<string, CommonDevice>();
+            foreach (var device in listLocalDevices)
+            {
+                string maikey = this.GetDeviceMainKeys(device);
+                dicExist[maikey] = device;
+            }
+
+            //娣诲姞璁惧鐨勭紦瀛�
+            for (int i = 0; i < listDevice.Count; i++)
+            {
+                var device = listDevice[i];
+                if (device == null || device.DeviceAddr == null)
+                {
+                    continue;
+                }
+                //娣诲姞缂撳瓨
+                this.AddDeviceToMemory(ref device);
+
+                //绉婚櫎瀛樺湪鐨勮澶囧唴瀛�
+                string maikey = this.GetDeviceMainKeys(device);
+                if (dicExist.ContainsKey(maikey) == true)
+                {
+                    dicExist.Remove(maikey);
+                }
+                //鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
+                HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
+            }
+
+            for (int i = 0; i < listDevice.Count; i++)
+            {
+                var device = listDevice[i];
+                //瀵规湭鍛藉悕鐨勮櫄鎷熻澶囬噸鏂板懡鍚�
+                if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
+                {
+                    //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
+                    var dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
+                    //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
+                    dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
+
+                    HdlThreadLogic.Current.RunThread(async () =>
+                    {
+                        await this.ReName(device, dName, ShowErrorMode.NO);
+                    });
+                }
+            }
+
+            //鍙湁瀹屽叏鑾峰彇鐨勬椂鍊�,鎵嶄細鍘诲鐞嗗垹闄ょ殑闂
+            if (statu != 1)
+            {
+                return statu;
+            }
+
+            //濡傛灉鏈湴鍜岀綉鍏崇殑璁惧涓嶄竴鑷寸殑鏃跺�欙紝鍒犻櫎鏈湴鐨勮澶�
+            foreach (var device in dicExist.Values)
+            {
+                if (device is OTADevice)
+                {
+                    this.DeleteMemmoryOtaDevice(device.DeviceAddr);
+                }
+                else
+                {
+                    this.DeleteMemmoryDevice(device, true);
+                }
+            }
+
+            return statu;
+        }
+
+        /// <summary>
+        /// 娣诲姞璁惧鍒扮紦瀛�,瀛樺湪鏃惰鐩�
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄(杩欎釜涓滆タ鏈夊彲鑳戒細琚洿鏀�)</param>
+        public void AddDeviceToMemory(ref CommonDevice device)
+        {
+            string mainKeys = this.GetDeviceMainKeys(device);
+            //濡傛灉瀹冩槸鍗囩骇鐨勯《绔鐐�,鍒欎笉鑳借瀹冨姞鍏ュ埌缂撳瓨锛屼絾鏄彲浠ヨ浠栫敓鎴愭枃浠�
+            if (device is OTADevice)
+            {
+                if (this.dicOTADevice.ContainsKey(mainKeys) == false)
+                {
+                    this.dicOTADevice[mainKeys] = (OTADevice)device;
+                }
+                else
+                {
+                    //浜ゆ崲灞炴��
+                    var tempDevice = this.dicOTADevice[mainKeys];
+                    //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
+                    this.SetDeviceInfoToMain(tempDevice, device);
+                    device = tempDevice;
+                }
+
+                bool exists = Global.IsExistsByHomeId(device.FilePath);
+                device.ReSave();
+                if (exists == false)
+                {
+                    //娣诲姞鑷姩澶囦唤
+                    HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+                }
+                return;
+            }
+
+            lock (dicAllDevice)
+            {
+                if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+                {
+                    //浜ゆ崲灞炴��
+                    var tempDevice = this.dicAllDevice[mainKeys];
+                    //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
+                    this.SetDeviceInfoToMain(tempDevice, device);
+                    device = tempDevice;
+                }
+                else
+                {
+                    this.dicAllDevice[mainKeys] = device;
+                }
+            }
+
+            //璁惧鍥炶矾鏀堕泦
+            if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
+            {
+                this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
+            }
+            if (this.dicDeviceEpoint[device.DeviceAddr].Contains(device.DeviceEpoint) == false)
+            {
+                this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
+            }
+
+            bool exists2 = Global.IsExistsByHomeId(device.FilePath);
+            device.ReSave();
+            if (exists2 == false)
+            {
+                //娣诲姞鑷姩澶囦唤
+                HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+            }
+        }
+
+        #endregion
+
+        #region 鈻� 淇敼璁惧___________________________
+
+        /// <summary>
+        /// 鏇存敼鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <param name="newName">鏂板悕瀛�</param>
+        /// <param name="mode">鏄惁鏄剧ず閿欒</param>
+        public async Task<bool> ReName(CommonDevice device, string newName, ShowErrorMode mode = ShowErrorMode.YES)
+        {
+            //鍏堝埆绠¢偅涔堝锛屾洿鏀瑰悕瀛楀悗锛屽埛鏂拌澶囩紦瀛�
+            this.SetEpointName(device, newName);
+
+            this.BackupDeviceAfterReName(device);
+
+            //涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
+            //鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
+            if (UserCenterResourse.UserInfo.AuthorityNo != 3)
+            {
+                var result = await device.RenameDeviceNameAsync(device.DeviceAddr, device.DeviceEpoint, newName);
+                if (result == null || result.deviceRenameData == null || result.deviceRenameData.Result == 1)
+                {
+                    //璁惧鍚嶇О淇敼澶辫触
+                    string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail);
+                    //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+                    msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+
+                    if (mode == ShowErrorMode.YES)
+                    {
+                        this.ShowErrorMsg(msg);
+                    }
+                    return false;
+                }
+                //澶囦唤鏁版嵁
+                await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A绔偣鍚嶇О, newName);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏇存敼Mac鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
+        /// </summary>
+        /// <param name="listDevice">璁惧瀵硅薄</param>
+        /// <param name="newMacName">鏂板悕瀛�</param>
+        /// <param name="mode">鏄惁鏄剧ず閿欒</param>
+        public async Task<bool> ReMacName(List<CommonDevice> listDevice, string newMacName, ShowErrorMode mode = ShowErrorMode.YES)
+        {
+            if (listDevice.Count == 0)
+            {
+                return true;
+            }
+            //鍏堝埆绠¢偅涔堝锛屽厛淇敼缂撳瓨
+            for (int i = 0; i < listDevice.Count; i++)
+            {
+                var device2 = listDevice[i];
+                //杩欎袱涓笢瑗垮緢鐗规畩
+                this.SetMacName(device2, newMacName);
+
+                //鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
+                this.BackupDeviceAfterReName(device2);
+            }
+
+            CommonDevice device = listDevice[0];
+            //涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
+            //鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
+            if (UserCenterResourse.UserInfo.AuthorityNo != 3)
+            {
+                //淇敼鐗╃悊鍚嶅瓧
+                var result = await device.RenameDeviceMacNameAsync(device.DeviceAddr, device.DeviceEpoint, newMacName);
+                if (result == null || result.renameDeviceMacNameData == null || result.renameDeviceMacNameData.Result != 0)
+                {
+                    //璁惧鍚嶇О淇敼澶辫触
+                    string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail);
+                    //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+                    msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+                    if (mode == ShowErrorMode.YES)
+                    {
+                        this.ShowErrorMsg(msg);
+                    }
+                    return false;
+                }
+                //澶囦唤鏁版嵁
+                await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.AMac鍚嶇О, newMacName);
+                //濡傛灉瀹冨彧鏈変竴涓洖璺�,鍒欐洿鏀圭鐐瑰悕瀛�
+                if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count == 1)
+                {
+                    return await this.ReName(device, newMacName);
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
+        /// </summary>
+        /// <param name="device"></param>
+        private void BackupDeviceAfterReName(CommonDevice device)
+        {
+            lock (dicAllDevice)
+            {
+                string mainKeys = this.GetDeviceMainKeys(device);
+                if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+                {
+                    //涓�鑸澶�
+                    this.dicAllDevice[mainKeys] = device;
+                    device.ReSave();
+
+                    //娣诲姞鑷姩澶囦唤
+                    HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+                }
+                else if (this.dicOTADevice.ContainsKey(mainKeys) == true)
+                {
+                    //Ota璁惧
+                    this.dicOTADevice[mainKeys] = (OTADevice)device;
+                    device.ReSave();
+
+                    //娣诲姞鑷姩澶囦唤
+                    HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+
+                }
+            }
+        }
+
+        #endregion
+
+        #region 鈻� 鍒犻櫎璁惧___________________________
+
+        /// <summary>
+        /// 鍒犻櫎璁惧骞朵笖鍒锋柊缂撳瓨(鍒犻櫎澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
+        /// </summary>
+        /// <param name="listdevice">璁惧瀵硅薄(MAC鍦板潃蹇呴』瑕佺浉鍚�)</param>
+        public async Task<bool> DeleteDevice(List<CommonDevice> listdevice)
+        {
+            var data = new CommonDevice.RemoveDeviceData();
+            var info = new CommonDevice.RemoveDeviceListInfo();
+            info.DeviceAddr = listdevice[0].DeviceAddr;
+            data.DeviceAddrList.Add(info);
+
+            //鍒犱竴娆$殑鏃跺�欙紝瀹冧細鎶奙AC鍦板潃涓嬮潰鍏ㄩ儴鐨勮澶囬兘鍒犻櫎
+            var result = await listdevice[0].DeleteDeviceAsync(data);
+            if (result == null || result.removeDeviceResponseData == null || result.removeDeviceResponseData.Result != 0)
+            {
+                //璁惧鍒犻櫎澶辫触
+                string msg = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail);
+                //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+
+                this.ShowErrorMsg(msg);
+                return false;
+            }
+
+            //鍒犻櫎缂撳瓨鐨凮ta璁惧
+            this.DeleteMemmoryOtaDevice(listdevice[0].DeviceAddr);
+            //鍒犻櫎涓�鑸澶囨枃浠�
+            foreach (CommonDevice device in listdevice)
+            {
+                this.DeleteMemmoryDevice(device);
+            }
+
+            if (this.dicDeviceRoomId.ContainsKey(listdevice[0].DeviceAddr) == true)
+            {
+                //绉婚櫎鐪熷疄璁惧鐨勬埧闂寸储寮�
+                this.dicDeviceRoomId.Remove(listdevice[0].DeviceAddr);
+                this.SaveRealDeviceRoomId(null, null);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鍒犻櫎缂撳瓨鐨勪竴鑸澶�
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <param name="deleteRoom">鏄惁浠庢埧闂村垹闄�</param>
+        public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
+        {
+            if (deleteRoom == true && Room.CurrentRoom != null)
+            {
+                //浠庢埧闂翠腑鍒犻櫎
+                Room.CurrentRoom.DeleteDevice(device);
+                //鍒犻櫎鎴戠殑鍠滅埍鐨勮澶�
+                Room.CurrentRoom.DeleteLoveDevice(device);
+            }
+
+            //鍒犻櫎缂撳瓨
+            string mainKeys = this.GetDeviceMainKeys(device);
+            lock (dicAllDevice)
+            {
+                if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+                {
+                    this.dicAllDevice.Remove(mainKeys);
+                }
+                if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true)
+                {
+                    //鍙樻洿绔偣鏁�
+                    this.dicDeviceEpoint[device.DeviceAddr].Remove(device.DeviceEpoint);
+                }
+            }
+
+            //鍒犻櫎璁惧鏂囦欢
+            string filePath = device.FilePath;
+            if (Global.IsExistsByHomeId(filePath) == true)
+            {
+                if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+                {
+                    //鎴愬憳鐨勮瘽,鐩存帴鍒犻櫎,娌℃湁鍟嗛噺鐨勪綑鍦�
+                    Global.DeleteFilebyHomeId(filePath);
+                }
+                else
+                {
+                    //鍙樻洿锛氭悶鎺夊畠,涓嶇暀浜�
+                    Global.DeleteFilebyHomeId(filePath);
+                    //鍒犻櫎鑷姩澶囦唤
+                    HdlAutoBackupLogic.DeleteFile(device.FilePath);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 鍒犻櫎缂撳瓨鐨凮ta璁惧
+        /// </summary>
+        /// <param name="macAdrr"></param>
+        /// <param name="ePoint"></param>
+        public void DeleteMemmoryOtaDevice(string macAdrr, int ePoint = 200)
+        {
+            //鍒犻櫎200绔彛鏂囦欢
+            string otaKeys = this.GetDeviceMainKeys(macAdrr, ePoint);
+            if (this.dicOTADevice.ContainsKey(otaKeys) == true)
+            {
+                string otaFile = this.dicOTADevice[otaKeys].FilePath;
+                if (Global.IsExistsByHomeId(otaFile) == true)
+                {
+                    if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+                    {
+                        //鎴愬憳鐨勮瘽,鐩存帴鍒犻櫎,娌℃湁鍟嗛噺鐨勪綑鍦�
+                        Global.DeleteFilebyHomeId(otaFile);
+                    }
+                    else
+                    {
+                        //鍙樻洿锛氭悶鎺夊畠,涓嶇暀浜�
+                        Global.DeleteFilebyHomeId(otaFile);
+                        //鍒犻櫎鑷姩澶囦唤
+                        HdlAutoBackupLogic.DeleteFile(otaFile);
+                    }
+                }
+                this.dicOTADevice.Remove(otaKeys);
+            }
+        }
+
+        #endregion
+
+        #region 鈻� 娴嬭瘯璁惧___________________________
+
+        /// <summary>
+        /// 鍙戦�佸畾浣嶆寚浠ゅ埌璁惧
+        /// </summary>
+        /// <param name="device"></param>
+        public void SetFixedPositionCommand(CommonDevice device)
+        {
+            device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+        }
+
+        /// <summary>
+        /// 妫�娴嬭澶囨槸鍚︽嫢鏈夊畾浣嶇殑鍔熻兘
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public bool DeviceIsCanFixedPosition(CommonDevice device)
+        {
+            foreach (var data in device.InClusterList)
+            {
+                //鎷ユ湁on/off鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
+                if (data.InCluster == 3)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 妫�娴嬭澶囨槸鍚︽嫢鏈夊紑鍏崇殑鍔熻兘(杈撳嚭绨�)
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public bool OutDeviceIsCanOnOff(CommonDevice device)
+        {
+            foreach (var data in device.OutClusterList)
+            {
+                //鎷ユ湁on/off鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
+                if (data.OutCluster == 6)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 妫�娴嬭澶囨槸鍚︽嫢鏈夊紑鍏崇殑鍔熻兘(杈撳叆绨�)
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public bool InDeviceIsCanOnOff(CommonDevice device)
+        {
+            foreach (var data in device.InClusterList)
+            {
+                //鎷ユ湁on/off鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
+                if (data.InCluster == 6)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        #endregion
+
+        #region 鈻� 鑾峰彇璁惧___________________________
+
+        /// <summary>
+        /// 鏍规嵁缃戝叧ID鑾峰彇鎵�鏈夌殑璁惧
+        /// </summary>
+        /// <param name="gwId">缃戝叧ID</param>
+        /// <param name="getOtaDevice">鏄惁鑾峰彇ota璁惧</param>
+        /// <returns></returns>
+        public List<CommonDevice> GetDeviceByGatewayID(string gwId, bool getOtaDevice = false)
+        {
+            List<CommonDevice> list = new List<CommonDevice>();
+            lock (dicAllDevice)
+            {
+                //鍚勭綉鍏崇殑鎵�鏈夎澶�
+                foreach (CommonDevice device in this.dicAllDevice.Values)
+                {
+                    if (gwId == device.CurrentGateWayId)
+                    {
+                        list.Add(device);
+                    }
+                }
+                if (getOtaDevice == true)
+                {
+                    //鑾峰彇ota璁惧
+                    foreach (var ota in this.dicOTADevice.Values)
+                    {
+                        if (ota.CurrentGateWayId == gwId)
+                        {
+                            list.Add(ota);
+                        }
+                    }
+                }
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鎸囧畾璁惧(涓婚敭鏄細Mac鍦板潃+绔彛鍙�),涓嶅瓨鍦ㄦ椂锛岃繑鍥瀗ull
+        /// </summary>
+        /// <param name="mainKeys">Mac鍦板潃+绔彛鍙�</param>
+        /// <returns></returns>
+        public CommonDevice GetDevice(string mainKeys)
+        {
+            lock (dicAllDevice)
+            {
+                if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+                {
+                    return this.dicAllDevice[mainKeys];
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鎸囧畾璁惧,涓嶅瓨鍦ㄦ椂锛岃繑鍥瀗ull
+        /// </summary>
+        /// <param name="DeviceAddr">Mac鍦板潃</param>
+        /// <param name="DeviceEpoint">绔彛鍙�</param>
+        /// <returns></returns>
+        public CommonDevice GetDevice(string DeviceAddr, int DeviceEpoint)
+        {
+            string mainkeys = this.GetDeviceMainKeys(DeviceAddr, DeviceEpoint);
+            return this.GetDevice(mainkeys);
+        }
+
+        /// <summary>
+        /// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�
+        /// </summary>
+        /// <param name="DeviceAddr">Mac鍦板潃</param>
+        /// <param name="sort">鏄惁鎺掑簭</param>
+        /// <returns></returns>
+        public List<CommonDevice> GetDevicesByMac(string DeviceAddr, bool sort = true)
+        {
+            var list = new List<CommonDevice>();
+            if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
+            {
+                return list;
+            }
+            foreach (var point in dicDeviceEpoint[DeviceAddr])
+            {
+                var device = this.GetDevice(DeviceAddr, point);
+                if (device != null)
+                {
+                    list.Add(device);
+                }
+            }
+            if (sort == false)
+            {
+                return list;
+            }
+
+            //鎺掑簭
+            list.Sort((obj1, obj2) =>
+            {
+                if (obj1.DeviceEpoint > obj2.DeviceEpoint)
+                {
+                    return 1;
+                }
+                return -1;
+            });
+            return list;
+        }
+
+        /// <summary>
+        /// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勬暟閲�
+        /// </summary>
+        /// <param name="DeviceAddr">Mac鍦板潃</param>
+        /// <returns></returns>
+        public int GetDevicesCountByMac(string DeviceAddr)
+        {
+            if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
+            {
+                return 0;
+            }
+            return dicDeviceEpoint[DeviceAddr].Count;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GetAllDeviceFile()
+        {
+            List<string> listDeviceFile = new List<string>();
             List<string> listAllFile = Global.FileListByHomeId();
 
-            foreach (string file in listAllFile)
-            {
-                if (file.StartsWith("Device_") == false)
-                {
-                    //濡傛灉涓嶆槸璁惧鏂囦欢
-                    continue;
-                }
-                listDeviceFile.Add(file);
-            }
-            return listDeviceFile;
-        }
-
-        /// <summary>
-        /// 鑾峰彇OTA璁惧(200绔彛鐨�)
-        /// </summary>
-        /// <param name="macAdrr"></param>
-        /// <param name="ePoint"></param>
+            foreach (string file in listAllFile)
+            {
+                if (file.StartsWith("Device_") == false)
+                {
+                    //濡傛灉涓嶆槸璁惧鏂囦欢
+                    continue;
+                }
+                listDeviceFile.Add(file);
+            }
+            return listDeviceFile;
+        }
+
+        /// <summary>
+        /// 鑾峰彇OTA璁惧(200绔彛鐨�)
+        /// </summary>
+        /// <param name="macAdrr"></param>
+        /// <param name="ePoint"></param>
+        /// <returns></returns>
+        public OTADevice GetOTADevice(string macAdrr, int ePoint = 200)
+        {
+            string mainkeys = this.GetDeviceMainKeys(macAdrr, ePoint);
+            if (this.dicOTADevice.ContainsKey(mainkeys) == false)
+            {
+                return null;
+            }
+            return this.dicOTADevice[mainkeys];
+        }
+
+        /// <summary>
+        /// 鑾峰彇鐗规畩鐨�,娌℃湁鍏朵粬鍥炶矾,鍗曠函鍙湁200绔偣鐨凮TA璁惧
+        /// </summary>
+        /// <param name="gwId">缃戝叧ID</param>
+        /// <returns></returns>
+        public List<OTADevice> GetSpecialOtaDevice(string gwId)
+        {
+            var list = new List<OTADevice>();
+            foreach (var ota in this.dicOTADevice.Values)
+            {
+                if (ota.CurrentGateWayId != gwId)
+                {
+                    //涓嶆槸鍚屼竴涓綉鍏�
+                    continue;
+                }
+                if (dicDeviceEpoint.ContainsKey(ota.DeviceAddr) == false
+                    || dicDeviceEpoint[ota.DeviceAddr].Count == 0)
+                {
+                    list.Add(ota);
+                }
+            }
+            return list;
+        }
+
+        #endregion
+
+        #region 鈻� 鑾峰彇璁惧鍚嶇О_______________________
+
+        /// <summary>
+        /// 鑾峰彇璁惧绔偣鐨勫悕绉�(鏈夌壒鏁�)
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public string GetDeviceEpointName(CommonDevice device)
+        {
+            string dName = this.GetSimpleEpointName(device);
+            if (string.IsNullOrEmpty(dName) == false)
+            {
+                return dName;
+            }
+            //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
+            var tempValue = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
+            var arry = tempValue.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
+            dName = arry[0].Trim();
+
+            //濡傛灉鏄櫄鎷熻澶�
+            if (device.DriveCode > 0)
+            {
+                //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
+                dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
+                return dName;
+            }
+
+            //鑾峰彇璁惧绫诲瀷
+            var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+            if (deviceInfoType.BeloneType == Common.DeviceBeloneType.A鎸夐敭闈㈡澘 && device.Type == DeviceType.TemperatureSensor)
+            {
+                //闈㈡澘鐨勬渶鍚庝竴涓洖璺槸娓╁害浼犳劅鍣�
+                dName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId11);
+            }
+            else if (deviceInfoType.ConcreteType == Common.DeviceConcreteType.Sensor_Pir)
+            {
+                //pir浼犳劅鍣�,瀹冨張鎼炵壒娈婁笢瑗�,浼犳劅鍣ㄨ嚜韬敤鑷繁鐨勫悕瀛�,缁х數鍣ㄥ洖璺殑璇濃�︹��
+                if (device.Type == DeviceType.OnOffOutput)
+                {
+                    dName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2300);
+                }
+            }
+            else if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count > 1)
+            {
+                //XXXXX(N鍥炶矾)
+                dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
+            }
+
+            return dName;
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧MAC鍚嶇О
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public string GetDeviceMacName(CommonDevice device)
+        {
+            string dName = this.GetSimpleMacName(device);
+            if (string.IsNullOrEmpty(dName) == false)
+            {
+                return dName;
+            }
+
+            //鏄惁鎷ユ湁閰嶇疆鐨勬ā鍧桰D
+            if (this.dicDeviceModelIdEnum.ContainsKey(device.ModelIdentifier) == true)
+            {
+                //鑾峰彇妯″潡ID鍚嶅瓧
+                return this.GetNameByModelId(device);
+            }
+            else
+            {
+                //鑾峰彇绗笁鏂硅澶囩殑缈昏瘧鍚嶅瓧
+                var myDeviceType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                return Language.StringByID(myDeviceType.ConcreteTextId);
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁妯″潡ID锛岃幏鍙栫炕璇戝悕瀛�
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        private string GetNameByModelId(CommonDevice device)
+        {
+            if (device.ModelIdentifier == string.Empty)
+            {
+                //鏈煡璁惧
+                return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+            }
+
+            string modelKeys = device.ModelIdentifier;
+            if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
+            {
+                //鏈煡璁惧
+                return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+            }
+
+            string[] strValue = this.dicDeviceModelIdEnum[modelKeys].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
+            int ConcreteValue = Convert.ToInt32(strValue[0]);
+
+            string keyName = deviceModelIdName + ConcreteValue;
+            if (this.dicDeviceDefultNameID.ContainsKey(keyName) == true)
+            {
+                //R鏂囦欢閲岄潰璁剧疆鐨勫悕瀛�
+                return Language.StringByID(this.dicDeviceDefultNameID[keyName]);
+            }
+
+            //鏈煡璁惧
+            return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+        }
+
+        /// <summary>
+        /// 闈炲叕寮�,璁剧疆璁惧鐨凪ac鍚嶅瓧(姝ゆ柟娉曞彧鏄崟瀛樼殑鍙樻洿缂撳瓨)
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <param name="macName">Mac鍚嶅瓧</param>
+        /// <returns></returns>
+        private void SetMacName(CommonDevice device, string macName)
+        {
+            device.DeviceName = macName;
+        }
+
+        /// <summary>
+        /// 闈炲叕寮�,璁剧疆璁惧鐨勭鐐瑰悕瀛�(姝ゆ柟娉曞彧鏄崟瀛樼殑鍙樻洿缂撳瓨)
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <param name="epointName">绔偣鍚嶅瓧</param>
+        /// <returns></returns>
+        private void SetEpointName(CommonDevice device, string epointName)
+        {
+            device.DeviceEpointName = epointName;
+        }
+
+        /// <summary>
+        /// 鍗曠函鑾峰彇璁惧鐨凪ac鍚嶅瓧
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public string GetSimpleMacName(CommonDevice device)
+        {
+            return device.DeviceName;
+        }
+
+        /// <summary>
+        /// 鍗曠函鑾峰彇璁惧鐨勭鐐瑰悕瀛�
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public string GetSimpleEpointName(CommonDevice device)
+        {
+            return device.DeviceEpointName;
+        }
+
+        /// <summary>
+        /// 鍒濆鍖朢鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
+        /// </summary>
+        private void InitDeviceDefultNameIDList()
+        {
+            if (this.dicDeviceDefultNameID != null)
+            {
+                return;
+            }
+            this.dicDeviceDefultNameID = new Dictionary<string, int>();
+            Type type = typeof(R.MyInternationalizationString);
+
+            var PropertyList = type.GetFields();
+            foreach (var item in PropertyList)
+            {
+                if (item.Name.StartsWith(deviceModelIdName) == true
+                    || item.Name.StartsWith("uDeviceBelongId") == true)
+                {
+                    this.dicDeviceDefultNameID[item.Name] = Convert.ToInt32(item.GetValue(null));
+                }
+            }
+
+            //鍒濆鍖栬澶囨灇涓�
+            this.InitDeviceModelIdEnum();
+        }
+
+        #endregion
+
+        #region 鈻� 璁剧疆鍥炬爣___________________________
+
+        /// <summary>
+        /// 鍙樻洿璁惧鐨勫浘鏍�
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <param name="unSelPath">鍥剧墖鍦板潃(闈為�夋嫨)</param>
+        public void ChangedDeviceIcon(CommonDevice device, string unSelPath)
+        {
+            if (unSelPath == string.Empty)
+            {
+                return;
+            }
+            device.IconPath = unSelPath;
+            device.IsCustomizeImage = true;
+            device.ReSave();
+
+            HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+        }
+
+        /// <summary>
+        /// 璁剧疆璁惧銆愬浘鏍囥�戝埌鎸囧畾鐨勬帶浠�
+        /// </summary>
+        /// <param name="btnIcon">鎺т欢瀵硅薄</param>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public void SetDeviceIconToControl(Button btnIcon, CommonDevice device)
+        {
+            if (device == null)
+            {
+                btnIcon.UnSelectedImagePath = "Device/ThirdPartyDevice.png";
+                return;
+            }
+            string unSelectFilePath = string.Empty;
+            string selectFilePath = string.Empty;
+
+            //鑾峰彇璁惧銆愬浘鏍囥��
+            this.GetDeviceIcon(device, ref unSelectFilePath, ref selectFilePath);
+
+            btnIcon.UnSelectedImagePath = unSelectFilePath;
+            btnIcon.SelectedImagePath = selectFilePath;
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧銆愬浘鏍囥��
+        /// </summary>
+        /// <param name="listdevice">璁惧瀵硅薄</param>
+        /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
+        /// <param name="selectPath">鍥剧墖鍦板潃</param>
+        /// <returns></returns>
+        public void GetDeviceIcon(CommonDevice device, ref string unSelectPath, ref string selectPath)
+        {
+            if (string.IsNullOrEmpty(device.IconPath) == true)
+            {
+                return;
+            }
+            unSelectPath = device.IconPath;
+
+            string selPath = device.OnlineIconPath;
+            if (string.IsNullOrEmpty(selPath) == false)
+            {
+                selectPath = selPath;
+            }
+        }
+
+        /// <summary>
+        /// 璁剧疆璁惧鐨勭湡瀹炲浘鐗囧埌鎸囧畾鐨勬帶浠�
+        /// </summary>
+        /// <param name="btnIcon">鎺т欢瀵硅薄</param>
+        /// <param name="listdevice">璁惧瀵硅薄</param>
+        public void SetRealDeviceIconToControl(Button btnIcon, List<CommonDevice> listdevice)
+        {
+            //鑾峰彇璁惧鐨勭湡瀹炲浘鐗�
+            string imagePath = this.GetRealDeviceIcon(listdevice);
+            btnIcon.UnSelectedImagePath = imagePath;
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧鐨勭湡瀹炲浘鐗�
+        /// </summary>
+        /// <param name="listdevice">璁惧瀵硅薄</param>
+        public string GetRealDeviceIcon(List<CommonDevice> listdevice)
+        {
+            //鑾峰彇瀹冨睘浜庝粈涔堢被鍨嬬殑璁惧
+            var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
+            string strConcrete = Enum.GetName(typeof(DeviceConcreteType), myDeviceType.ConcreteType);
+
+            //鍥剧墖鍏辨湁
+            if (this.dicPictrueShard.ContainsKey(strConcrete) == true)
+            {
+                strConcrete = this.dicPictrueShard[strConcrete];
+            }
+
+            string strType = strConcrete.Replace("_", string.Empty);
+            //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
+            string imageFilePath = "RealDevice/" + strType + ".png";
+            //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
+            if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+            {
+                //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
+                string[] arry = strConcrete.Split(new string[] { "_" }, StringSplitOptions.None);
+                if (arry.Length == 1)
+                {
+                    //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
+                    return "RealDevice/CommonDevice.png";
+                }
+                imageFilePath = "RealDevice/" + arry[0] + ".png";
+                //濡傛灉瀹冭嚜宸辩殑鍏遍�氬浘鐗囪繕鏄笉瀛樺湪鐨勮瘽,鍒欑洿鎺ヤ娇鐢ㄦ墍鏈夎澶囩殑鍏遍�氬浘鐗�
+                if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+                {
+                    imageFilePath = "RealDevice/CommonDevice.png";
+                }
+            }
+            return imageFilePath;
+        }
+
+        /// <summary>
+        /// 璁剧疆銆愯澶囩被鍨嬨�戠殑鍥炬爣鍒版寚瀹氱殑鎺т欢
+        /// </summary>
+        /// <param name="btnIcon">鎺т欢瀵硅薄</param>
+        /// <param name="listdevice">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public void SetDeviceObjectIconToControl(Button btnIcon, List<CommonDevice> listdevice)
+        {
+            //鑾峰彇鑷畾涔夎澶囩被鍨�
+            var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
+
+            string imageUnSelectFilePath = string.Empty;
+            string imageSelectFilePath = string.Empty;
+
+            //鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+            this.GetDeviceObjectIcon(myDeviceType.ConcreteType, ref imageUnSelectFilePath, ref imageSelectFilePath);
+
+            //璁剧疆鍥剧墖
+            btnIcon.UnSelectedImagePath = imageUnSelectFilePath;
+            btnIcon.SelectedImagePath = imageSelectFilePath;
+        }
+
+        /// <summary>
+        /// 鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+        /// </summary>
+        /// <param name="listdevice">璁惧瀵硅薄</param>
+        /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
+        /// <param name="selectPath">鍥剧墖鍦板潃</param>
+        /// <returns></returns>
+        public void GetDeviceObjectIcon(List<CommonDevice> listdevice, ref string unSelectPath, ref string selectPath)
+        {
+            //鑾峰彇鑷畾涔夎澶囩被鍨�
+            var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
+
+            //鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+            this.GetDeviceObjectIcon(myDeviceType.ConcreteType, ref unSelectPath, ref selectPath);
+        }
+
+        /// <summary>
+        /// 鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+        /// </summary>
+        /// <param name="specificType">鑷畾涔夎澶囩被鍨�</param>
+        /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
+        /// <param name="selectPath">鍥剧墖鍦板潃</param>
+        /// <returns></returns>
+        public void GetDeviceObjectIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
+        {
+            //灏嗗叿浣撶被鍨嬭浆瀛楃涓�
+            string strSpecific = Enum.GetName(typeof(DeviceConcreteType), specificType);
+            //鍥剧墖鍏辨湁
+            if (this.dicPictrueShard.ContainsKey(strSpecific) == true)
+            {
+                strSpecific = this.dicPictrueShard[strSpecific];
+            }
+
+            string strType = strSpecific.Replace("_", string.Empty);
+            //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
+            string imageFilePath = "Device/" + strType + ".png";
+            string imageSelectFilePath = "Device/" + strType + "Selected.png";
+
+            //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
+            if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+            {
+                //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
+                string[] arry = strSpecific.Split(new string[] { "_" }, StringSplitOptions.None);
+                //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
+                if (arry.Length > 1)
+                {
+                    imageFilePath = "Device/" + arry[0] + ".png";
+                    imageSelectFilePath = "Device/" + arry[0] + "Selected.png";
+                }
+            }
+            //濡傛灉閭f璁惧杩炲叡閫氬浘鐗囬兘娌℃湁鐨勮瘽
+            if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+            {
+                imageFilePath = "Device/ThirdPartyDevice.png";
+                imageSelectFilePath = "Device/ThirdPartyDeviceSelected.png";
+            }
+            //璁剧疆鍥剧墖
+            unSelectPath = imageFilePath;
+            selectPath = imageSelectFilePath;
+        }
+
+        #endregion
+
+        #region 鈻� 璁惧UI鐩稿叧_________________________
+
+        /// <summary>
+        /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public DeviceUI GetDeviceUI(CommonDevice device)
+        {
+            //鍒涘缓涓�涓柊鐨勪笢瑗跨粰杩囧幓
+            var deviceUi = new DeviceUI();
+            deviceUi.DeviceAddr = device.DeviceAddr;
+            deviceUi.DeviceEpoint = device.DeviceEpoint;
+            return deviceUi;
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <returns></returns>
+        public DeviceUI GetDeviceUI(string filePath)
+        {
+            string[] arry = filePath.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
+            if (arry.Length != 4)
+            {
+                return null;
+            }
+            //鍒涘缓涓�涓柊鐨勪笢瑗跨粰杩囧幓
+            var deviceUi = new DeviceUI();
+            deviceUi.DeviceAddr = arry[2];
+            deviceUi.DeviceEpoint = Convert.ToInt32(arry[3]);
+            return deviceUi;
+        }
+
+        #endregion
+
+        #region 鈻� 鑾峰彇鑷畾涔夌殑璁惧绫诲瀷_______________
+
+        /// <summary>
+        /// 鑾峰彇銆愯嚜瀹氫箟鐨勮澶囩被鍨嬨��,涓ょ绫诲瀷閮借缃簡
+        /// </summary>
+        /// <param name="listdevice">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public DeviceEnumInfo GetMyDeviceEnumInfo(List<CommonDevice> listdevice)
+        {
+            CommonDevice checkDevice = listdevice[0];
+            foreach (var temp in listdevice)
+            {
+                //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
+                if (temp.ModelIdentifier != string.Empty)
+                {
+                    checkDevice = temp;
+                }
+            }
+
+            //鑾峰彇娌充笢璁惧鐨勮澶囩被鍨�
+            DeviceEnumInfo info = this.GetHdlMyDeviceEnumInfo(checkDevice);
+            if (info != null)
+            {
+                return info;
+            }
+            //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
+            return this.GetNotHdlMyDeviceEnumInfo(listdevice, false);
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧鐨勩�愯澶囩被鍨嬨�戠殑缈昏瘧鏂囨湰(浼樺厛闀滃儚)
+        /// </summary>
+        /// <param name="listDevice"></param>
+        /// <param name="ApendFalge">绗笁鏂规垨鑰呰櫄鎷熻澶囩殑鏃跺�欙紝鏄惁娣诲姞鏍囪瘑</param>
+        /// <returns></returns>
+        public string GetDeviceObjectText(List<CommonDevice> listDevice, bool ApendFalge = true)
+        {
+            CommonDevice checkDevice = listDevice[0];
+            foreach (var temp in listDevice)
+            {
+                //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
+                if (temp.ModelIdentifier != string.Empty)
+                {
+                    checkDevice = temp;
+                }
+            }
+
+            string strName = string.Empty;
+            if (this.dicDeviceModelIdEnum.ContainsKey(checkDevice.ModelIdentifier) == true)
+            {
+                //鏍规嵁妯″潡ID锛岃幏鍙栬澶囧悕瀛�
+                strName = this.GetNameByModelId(checkDevice);
+            }
+            else
+            {
+                //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
+                var myDeviceType = this.GetNotHdlMyDeviceEnumInfo(listDevice, false);
+                strName = Language.StringByID(myDeviceType.ConcreteTextId);
+            }
+            if (ApendFalge == true && listDevice[0].DriveCode > 0)
+            {
+                //铏氭嫙璁惧鍔犱釜鏍囪瘑
+                strName += "鉁�";
+            }
+            else if (ApendFalge == true && this.IsHdlDevice(checkDevice) == false)
+            {
+                //绗笁鏂硅澶囧姞涓爣璇�
+                strName += "鈽�";
+            }
+            return strName;
+        }
+
+        #endregion
+
+        #region 鈻� 鑾峰彇娌充笢璁惧鐨勮澶囩被鍨媉____________
+
+        /// <summary>
+        /// 鑾峰彇Hdl璁惧鐨勩�愯嚜瀹氫箟鐨勮澶囩被鍨嬨��
+        /// </summary>
+        /// <param name="device">闅忎究鏌愪竴鍥炶矾</param>
+        /// <returns></returns>
+        private DeviceEnumInfo GetHdlMyDeviceEnumInfo(CommonDevice device)
+        {
+            //璁惧鍏蜂綋绫诲瀷
+            var info = new DeviceEnumInfo();
+            info.IsHdlDevice = this.IsHdlDevice(device);
+            if (device.ModelIdentifier == string.Empty)
+            {
+                return null;
+            }
+            string modelKeys = device.ModelIdentifier;
+            if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
+            {
+                //娌℃湁鍖归厤鍒版ā鍧桰D锛屽垯鐩存帴璧扮涓夋柟璁惧鐨勫垽鏂�
+                return null;
+            }
+
+            string[] strValue = this.dicDeviceModelIdEnum[modelKeys].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
+            int ConcreteValue = Convert.ToInt32(strValue[0]);
+            int BeloneValue = Convert.ToInt32(strValue[1]);
+            //璁剧疆璁惧鐨勩�愯澶囨墍灞炵被鍨嬨��
+            info.BeloneType = (DeviceBeloneType)BeloneValue;
+            if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + BeloneValue) == true)
+            {
+                //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+                info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + BeloneValue];
+            }
+
+            //璁惧鍏蜂綋绫诲瀷
+            info.ConcreteType = (DeviceConcreteType)ConcreteValue;
+            if (info.ConcreteType.ToString() == ConcreteValue.ToString())
+            {
+                info.ConcreteType = DeviceConcreteType.UnKownDevice;
+            }
+            return info;
+        }
+
+        #endregion
+
+        #region 鈻� 鑾峰彇绗笁鏂硅澶囩殑璁惧绫诲瀷___________
+
+        /// <summary>
+        /// 鑾峰彇璁惧鐨勩�愭墍灞炵被鍨嬩俊鎭��,姝ゆ柟娉曚細鎶婃墍鏈夌殑浼犳劅鍣ㄩ兘褰掍负銆愪紶鎰熷櫒銆�(鍖呮嫭娓╂箍搴︿紶鎰熷櫒)
+        /// </summary>
+        /// <param name="device">璁惧鍥炶矾</param>
+        /// <returns></returns>
+        public DeviceEnumInfo GetDeviceBelongEnumInfo(CommonDevice device)
+        {
+            var info = this.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice>() { device });
+            if (info.BeloneType == DeviceBeloneType.A璋冨厜鍣�
+                || info.BeloneType == DeviceBeloneType.A褰╃伅)
+            {
+                //褰掍负鐏厜
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
+                info.BeloneType = DeviceBeloneType.A鐏厜;
+                info.ConcreteType = DeviceConcreteType.Light;
+
+                int value = (int)info.BeloneType;
+                if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
+                {
+                    //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+                    info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
+                }
+            }
+            else if (info.BeloneType == DeviceBeloneType.A浼犳劅鍣�
+                || device.Type == DeviceType.TemperatureSensor)
+            {
+                //浼犳劅鍣ㄥ悎骞�
+                info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
+                info.ConcreteType = DeviceConcreteType.Sensor;
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
+
+                int value = (int)info.BeloneType;
+                if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
+                {
+                    //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+                    info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
+                }
+            }
+
+            return info;
+        }
+
+        /// <summary>
+        /// 鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��(涓嶅缓璁娇鐢�)
+        /// </summary>
+        /// <param name="listdevice">Mac閮戒竴鏍风殑璁惧鍒楄〃</param>
+        /// <returns></returns>
+        public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(CommonDevice device, bool margeSensor = true)
+        {
+            return this.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice>() { device }, margeSensor);
+        }
+
+        /// <summary>
+        /// 鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��(涓嶅缓璁娇鐢�)
+        /// </summary>
+        /// <param name="listdevice">Mac閮戒竴鏍风殑璁惧鍒楄〃</param>
+        /// <param name="margeSensor">
+        /// <para>鏄惁灏嗘墍鏈夌被鍨嬬殑浼犳劅鍣ㄩ兘褰掍负銆愪紶鎰熷櫒銆�,</para>
+        /// <para>false鐨勬椂鍊欙細銆怌oncreteType銆戝拰銆怌oncreteTextId銆戝彲鑳戒細鏈変笉鍚岀殑鍊�</para>
+        /// <para>true鐨勬椂鍊欙細銆怌oncreteType銆戠粺涓�涓篠ensor,銆怌oncreteTextId銆戠粺涓�涓轰紶鎰熷櫒</para>
+        /// </param>
+        /// <returns></returns>
+        public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(List<CommonDevice> listdevice, bool margeSensor = true)
+        {
+            var dicType = new Dictionary<DeviceType, CommonDevice>();
+            foreach (CommonDevice device in listdevice)
+            {
+                if (dicType.ContainsKey(device.Type) == false)
+                {
+                    dicType[device.Type] = device;
+                }
+            }
+            var info = new DeviceEnumInfo();
+            info.IsHdlDevice = false;
+            //1鍖呭惈闈㈡澘鐨勮瘽,褰撻潰鏉垮鐞�
+            if (dicType.ContainsKey(DeviceType.OnOffSwitch) == true)
+            {
+                if (listdevice.Count > 1)
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId200;
+                    info.BeloneType = DeviceBeloneType.A鎸夐敭闈㈡澘;
+                    info.ConcreteType = DeviceConcreteType.ButtonPanel;
+                }
+                else
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId16;
+                    info.BeloneType = DeviceBeloneType.A骞叉帴鐐�;
+                    info.ConcreteType = DeviceConcreteType.DryContact;
+                }
+            }
+            //3鍖呭惈绐楀笜鐨勮瘽,褰撶獥甯樺鐞�
+            else if (dicType.ContainsKey(DeviceType.WindowCoveringDevice) == true)
+            {
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId100;
+                info.BeloneType = DeviceBeloneType.A绐楀笜;
+                info.ConcreteType = DeviceConcreteType.Curtain;
+            }
+            //4绌烘皵寮�鍏�
+            else if (dicType.ContainsKey(DeviceType.AirSwitch) == true)
+            {
+                //榛樿鍊�
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4100;
+                info.BeloneType = DeviceBeloneType.A鏅鸿兘绌哄紑;
+                info.ConcreteType = DeviceConcreteType.AirSwitch;
+
+                if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A寮�鍏�)
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId13;
+                    info.BeloneType = DeviceBeloneType.A寮�鍏�;
+                    info.ConcreteType = DeviceConcreteType.Switch;
+                }
+                else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A鎻掑骇)
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId14;
+                    info.BeloneType = DeviceBeloneType.A鎻掑骇;
+                    info.ConcreteType = DeviceConcreteType.Socket1;
+                }
+                else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A鐏厜)
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
+                    info.BeloneType = DeviceBeloneType.A鐏厜;
+                    info.ConcreteType = DeviceConcreteType.Light;
+                }
+            }
+            //5缁х數鍣�
+            else if (dicType.ContainsKey(DeviceType.OnOffOutput) == true)
+            {
+                //榛樿鍊�
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2300;
+                info.BeloneType = DeviceBeloneType.A缁х數鍣�;
+                info.ConcreteType = DeviceConcreteType.Relay;
+
+                if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A寮�鍏�)
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId13;
+                    info.BeloneType = DeviceBeloneType.A寮�鍏�;
+                    info.ConcreteType = DeviceConcreteType.Switch;
+                }
+                else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A鎻掑骇)
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId14;
+                    info.BeloneType = DeviceBeloneType.A鎻掑骇;
+                    info.ConcreteType = DeviceConcreteType.Socket1;
+                }
+                else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A鐏厜)
+                {
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
+                    info.BeloneType = DeviceBeloneType.A鐏厜;
+                    info.ConcreteType = DeviceConcreteType.Light;
+                }
+            }
+            //6璋冨厜鍣�
+            else if (dicType.ContainsKey(DeviceType.DimmableLight) == true)
+            {
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2500;
+                info.BeloneType = DeviceBeloneType.A璋冨厜鍣�;
+                info.ConcreteType = DeviceConcreteType.DimmableLight;
+            }
+            //7褰╃伅
+            else if (dicType.ContainsKey(DeviceType.ColorDimmableLight) == true)
+            {
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId9;
+                info.BeloneType = DeviceBeloneType.A褰╃伅;
+                info.ConcreteType = DeviceConcreteType.ColorLight;
+            }
+            //8绌鸿皟
+            else if (dicType.ContainsKey(DeviceType.Thermostat) == true)
+            {
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3600;
+                info.BeloneType = DeviceBeloneType.A绌鸿皟;
+                info.ConcreteType = DeviceConcreteType.AirConditioner;
+            }
+            //9涓户鍣�
+            else if (dicType.ContainsKey(DeviceType.Repeater) == true)
+            {
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3900;
+                info.BeloneType = DeviceBeloneType.A涓户鍣�;
+                info.ConcreteType = DeviceConcreteType.Repeater;
+            }
+            //10杞崲鍣�
+            else if (dicType.ContainsKey(DeviceType.Transverter) == true)
+            {
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4200;
+                info.BeloneType = DeviceBeloneType.A杞崲鍣�;
+                info.ConcreteType = DeviceConcreteType.Converter;
+            }
+            //11鏅鸿兘闂ㄩ攣
+            else if (dicType.ContainsKey(DeviceType.DoorLock) == true)
+            {
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2800;
+                info.BeloneType = DeviceBeloneType.A鏅鸿兘闂ㄩ攣;
+                info.ConcreteType = DeviceConcreteType.IntelligentLocks;
+            }
+            //12鍖呭惈浼犳劅鍣ㄧ殑璇�,褰撲紶鎰熷櫒澶勭悊
+            else if (dicType.ContainsKey(DeviceType.IASZone) == true)
+            {
+                info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
+                info.ConcreteType = DeviceConcreteType.Sensor;
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
+                //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+                this.SetSensorDeviceSpecificType(ref info, listdevice);
+            }
+            //13鍖呭惈娓╁害浼犳劅鍣ㄧ殑璇�
+            else if (dicType.ContainsKey(DeviceType.TemperatureSensor) == true)
+            {
+                bool temperatrue = false;
+                bool humidity = false;
+                //鑾峰彇鍏ㄩ儴鐨勫洖璺�
+                var listTemp = this.GetDevicesByMac(listdevice[0].DeviceAddr, false);
+                foreach (var device in listTemp)
+                {
+                    if (device is TemperatureSensor)
+                    {
+                        //娓╁害浼犳劅鍣�
+                        if (((TemperatureSensor)device).SensorDiv == 1)
+                        {
+                            temperatrue = true;
+                        }
+                        //婀垮害浼犳劅鍣�
+                        else if (((TemperatureSensor)device).SensorDiv == 2)
+                        {
+                            humidity = true;
+                        }
+                    }
+                }
+                if (temperatrue == true && humidity == true)
+                {
+                    //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+                    info.BeloneType = DeviceBeloneType.A娓╂箍搴︿紶鎰熷櫒;
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId10;
+                    info.ConcreteType = DeviceConcreteType.Sensor_TemperatureHumidity;
+                }
+                else if (temperatrue == true && humidity == false)
+                {
+                    //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+                    info.BeloneType = DeviceBeloneType.A娓╁害浼犳劅鍣�;
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId11;
+                    info.ConcreteType = DeviceConcreteType.Sensor_Temperature;
+                }
+                else if (temperatrue == false && humidity == true)
+                {
+                    //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+                    info.BeloneType = DeviceBeloneType.A婀垮害浼犳劅鍣�;
+                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId12;
+                    info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
+                }
+            }
+
+            int value = (int)info.BeloneType;
+            if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
+            {
+                //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+                info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
+            }
+
+            return info;
+        }
+
+        #endregion
+
+        #region 鈻� 浼犳劅鍣ㄥ叿浣撶殑绫诲瀷___________________
+
+        /// <summary>
+        /// 璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+        /// </summary>
+        /// <param name="info">鑷畾涔夎澶囨灇涓句俊鎭�</param>
+        /// <param name="listdevice">璁惧瀵硅薄</param>
+        private void SetSensorDeviceSpecificType(ref DeviceEnumInfo info, List<CommonDevice> listdevice)
+        {
+            //濡傛灉杩欎釜璁惧鎷ユ湁澶氫釜鍥炶矾鐨勮瘽,鎴戜篃涓嶇煡閬撴�庝箞鍛藉悕,鍙兘缁欎釜榛樿鍚嶅瓧
+            if (listdevice.Count > 1)
+            {
+                return;
+            }
+            var iasZone = (IASZone)listdevice[0];
+            if (iasZone.IasDeviceType == 13)
+            {
+                //杩愬姩浼犳劅鍣�
+                info.ConcreteType = DeviceConcreteType.Sensor_Motion;
+                info.ConcreteTextId = R.MyInternationalizationString.uMotionSensor;
+            }
+            else if (iasZone.IasDeviceType == 40)
+            {
+                //鐑熼浘浼犳劅鍣�
+                info.ConcreteType = DeviceConcreteType.Sensor_Fire;
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1302;
+            }
+            else if (iasZone.IasDeviceType == 42)
+            {
+                //姘翠镜浼犳劅鍣�
+                info.ConcreteType = DeviceConcreteType.Sensor_Water;
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1304;
+            }
+            else if (iasZone.IasDeviceType == 43)
+            {
+                //鐕冩皵浼犳劅鍣�
+                info.ConcreteType = DeviceConcreteType.Sensor_CarbonMonoxide;
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1300;
+            }
+            else if (iasZone.IasDeviceType == 44)
+            {
+                //绱ф�ユ寜閽�
+                info.ConcreteType = DeviceConcreteType.Sensor_EmergencyButton;
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1305;
+            }
+            else if (iasZone.IasDeviceType == 277)
+            {
+                //閽ュ寵鎵�
+                info.ConcreteType = DeviceConcreteType.Sensor_Keyfob;
+                info.ConcreteTextId = R.MyInternationalizationString.uKeyfob;
+            }
+            else if (iasZone.IasDeviceType == 21 || iasZone.IasDeviceType == 22)
+            {
+                //闂ㄧ獥浼犳劅鍣�
+                info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
+                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1301;
+            }
+        }
+
+        #endregion
+
+        #region 鈻� 鐗╃悊璁惧鎵�灞炴埧闂確__________________
+
+        /// <summary>
+        /// 鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
+        /// </summary>
+        private void InitRealDeviceRoomId()
+        {
+            this.dicDeviceRoomId = new Dictionary<string, string>();
+            string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
+            var strData = UserCenterLogic.LoadFileContent(fullName);
+            if (strData != null)
+            {
+                this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
+            }
+        }
+
+        /// <summary>
+        /// 淇濆瓨鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
+        /// </summary>
+        /// <param name="listDevice">闇�瑕佷繚瀛樼殑璁惧瀵硅薄</param>
+        /// <param name="roomId">闇�瑕佷繚瀛樼殑鍝釜璁惧鐨勬埧闂碔D</param>
+        /// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
+        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
+        {
+            if (listDevice != null)
+            {
+                this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+            }
+
+            //淇濆瓨璁板綍
+            string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
+            UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
+
+            //娣诲姞鑷姩澶囦唤
+            HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
+
+            //濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
+            if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
+            {
+                if (listDevice[0] is OTADevice)
+                {
+                    //鍗曠函鍙槸Ota璁惧鍒欎笉澶勭悊
+                    return;
+                }
+                Common.Room.CurrentRoom.ChangedRoom(listDevice[0], roomId, false);
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鐪熷疄鐗╃悊璁惧鐨勬埧闂村悕瀛�
+        /// </summary>
+        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
+        /// <returns></returns>
+        public string GeteRealDeviceRoomName(CommonDevice device)
+        {
+            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
+            {
+                //鏈垎閰嶅尯鍩�
+                return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+            }
+            var room = Room.CurrentRoom.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+            if (room != null)
+            {
+                return room.Name;
+            }
+            //鏈垎閰嶅尯鍩�
+            return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鐪熷疄鐗╃悊璁惧灞炰簬鍝釜鎴块棿
+        /// </summary>
+        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
+        /// <returns></returns>
+        public Room GeteRealDeviceRoom(CommonDevice device)
+        {
+            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
+            {
+                return null;
+            }
+            return Room.CurrentRoom.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+        }
+
+        #endregion
+
+        #region 鈻� 涓�鑸柟娉昣__________________________
+
+        /// <summary>
+        /// 鍒ゆ柇鏄笉鏄渤涓滅殑璁惧
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public bool IsHdlDevice(CommonDevice device)
+        {
+            return device.ManufacturerName == "HDL";
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧鐨勫敮涓�涓婚敭
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public string GetDeviceMainKeys(CommonDevice device)
+        {
+            return device.DeviceAddr + device.DeviceEpoint;
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁惧鐨勫敮涓�涓婚敭
+        /// </summary>
+        /// <param name="DeviceAddr">MAC鍦板潃</param>
+        /// <param name="DeviceEpoint">绔彛鍙�</param>
+        /// <returns></returns>
+        public string GetDeviceMainKeys(string DeviceAddr, int DeviceEpoint)
+        {
+            return DeviceAddr + DeviceEpoint;
+        }
+
+        /// <summary>
+        /// 浜ゆ崲璁惧鐨勬ā鍧桰D
+        /// </summary>
+        /// <param name="modeId">妯″潡ID</param>
+        /// <returns></returns>
+        public bool ChangedDeviceModeId(ref string modeId)
+        {
+            if (this.dicDeviceModelIdChanged.ContainsKey(modeId) == false)
+            {
+                return false;
+            }
+            modeId = this.dicDeviceModelIdChanged[modeId];
+
+            return true;
+        }
+
+        /// <summary>
+        /// 闄勫姞璁惧鐨勭増鏈唬鍙�(杩斿洖Ver.XXX)
+        /// </summary>
+        /// <param name="versionValue">鐗堟湰鍙�</param>
+        /// <returns></returns>
+        public string AppendVersion(int versionValue)
+        {
+            //鐩存帴鏄�10杩涘埗
+            string txt10 = Convert.ToString(versionValue).PadLeft(4, '0');
+            //杩欎釜鏄皬鏁扮偣鍓嶉潰鐨勫��
+            int value1 = Convert.ToInt32(txt10.Substring(0, txt10.Length - 2));
+            //杩欎釜鏄皬鏁扮偣鍚庨潰鐨勫��
+            int value2 = Convert.ToInt32(txt10.Substring(txt10.Length - 2, 2));
+
+            //Ver.
+            string ver = Language.StringByID(R.MyInternationalizationString.uVersionAbbreviation);
+            return ver + value1 + "." + value2.ToString().PadLeft(2, '0');
+        }
+
+        /// <summary>
+        /// 鏄剧ず閿欒淇℃伅绐楀彛
+        /// </summary>
+        /// <param name="msg"></param>
+        private void ShowErrorMsg(string msg)
+        {
+            Application.RunOnMainThread(() =>
+            {
+                var contr = new ShowMsgControl(ShowMsgType.Error, msg);
+                contr.Show();
+            });
+        }
+
+        /// <summary>
+        /// 鏄剧ずTip淇℃伅绐楀彛
+        /// </summary>
+        /// <param name="msg"></param>
+        private void ShowTipMsg(string msg)
+        {
+            Application.RunOnMainThread(() =>
+            {
+                var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+                contr.Show();
+            });
+        }
+
+        #endregion
+
+        //----------------------------------鍒嗗壊绾�(鑷畾涔夋帴鍙�)---------------------------------------------
+
+        #region 鈻� 鑾峰彇璁惧鍒楄〃鐨勬帴鍙________________
+
+        /// <summary>
+        /// <para>浠庣綉鍏抽噸鏂拌幏鍙栬澶囧垪琛�(杩斿洖鐨勮澶囦负铏氭嫙鍑烘潵鐨�)</para>
+        /// <para>statu鐘舵�� -1:寮傚父,浼氳繑鍥瀗ull, 1锛氭病鏈夊紓甯�, 2:鏁版嵁鎺ユ敹涓嶅叏</para>
+        /// </summary>
+        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+        /// <param name="statu">鐘舵��-> -1:寮傚父,浼氳繑鍥瀗ull, 1锛氭病鏈夊紓甯�, 2:鏁版嵁鎺ユ敹涓嶅叏</param>
+        /// <param name="ignoreTime">鏄惁鏃犺鏃堕棿(姝ゅ彉閲忔槸缁欒幏鍙栧湪绾跨姸鎬佺敤鐨�),true:姣忔璋冪敤閮藉幓缃戝叧鑾峰彇,false:3鍒嗛挓鍐呰繑鍥炵殑鏄湰鍦扮殑璁惧</param>
+        /// <param name="mode">鏄惁鏄剧ず閿欒</param>
         /// <returns></returns>
-        public OTADevice GetOTADevice(string macAdrr, int ePoint = 200)
-        {
-            string mainkeys = this.GetDeviceMainKeys(macAdrr, ePoint);
-            if (this.dicOTADevice.ContainsKey(mainkeys) == false)
-            {
-                return null;
+        public List<CommonDevice> GetDeviceListFromGateway(ZbGateway zbGateway, ref int statu, bool ignoreTime, ShowErrorMode mode = ShowErrorMode.YES)
+        {
+            if (ignoreTime == false)
+            {
+                if ((DateTime.Now - zbGateway.LastDateTime).TotalMilliseconds < 3 * 60 * 1000)
+                {
+                    //涓嶆棤瑙嗘椂闂�,杩斿洖鏈湴璁惧鍒楄〃
+                    statu = 1;
+                    return this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));
+                }
+            }
+            zbGateway.LastDateTime = DateTime.Now;
+
+            //濡傛灉鍒囨崲鍒颁簡鍒殑鐣岄潰锛屽垯涓嶆樉绀洪敊璇俊鎭�
+            string nowFormId = UserCenterResourse.NowActionFormID;
+
+            ZbGateway realWay = null;
+            if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, zbGateway) == false)
+            {
+                if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
+                {
+                    //閿欒:缃戝叧瀵硅薄涓㈠け
+                    string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
+                    this.ShowTipMsg(msg);
+                }
+                statu = -1;
+                return null;
+            }
+
+            //鏄惁杈炬垚涓柇鐨勬椂鏈�
+            bool canBreak = false;
+            //缃戝叧ID
+            string gatewayID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
+            //瓒呮椂鏃堕棿
+            int TimeOut = 0;
+            //璁惧鎬绘暟
+            int deviceCount = -1;
+            //鎺ユ敹鏁�
+            int receiveCount = 0;
+            //璁惧鍒楄〃
+            var listDevice = new List<CommonDevice>();
+            //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+            var listCheck = new HashSet<string>();
+            Action<string, string> getDeviceAction = (topic, message) =>
+            {
+                if (topic == gatewayID + "/" + "DeviceInfoRespon")
+                {
+                    try
+                    {
+                        lock (listDevice)
+                        {
+                            //璁惧鎺ユ敹鏁�
+                            receiveCount++;
+
+                            TimeOut = 0;
+                            var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
+                            var totalNum = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["TotalNum"].ToString());
+                            if (totalNum == 0)
+                            {
+                                //杩欎釜缃戝叧娌℃湁璁惧
+                                canBreak = true;
+                                return;
+                            }
+                            if (deviceCount == -1)
+                            {
+                                //璁剧疆闇�瑕佹帴鏀跺灏戜釜璁惧
+                                deviceCount = totalNum;
+                            }
+
+                            var deviceID = (DeviceType)jobject.Value<int>("Device_ID");
+                            //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+                            var device = this.NewDeviceObjectByDeviceId(deviceID, jobject, zbGateway);
+                            if (device != null)
+                            {
+                                string mainkeys = this.GetDeviceMainKeys(device);
+                                //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+                                if (listCheck.Contains(mainkeys) == false)
+                                {
+                                    listDevice.Add(device);
+
+                                    listCheck.Add(mainkeys);
+                                }
+                            }
+                        }
+                    }
+                    //Log鍑哄姏
+                    catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
+
+                    if (receiveCount == deviceCount && deviceCount != -1)
+                    {
+                        //璁惧鍏ㄩ儴鎺ユ敹瀹屾垚
+                        canBreak = true;
+                    }
+                }
+            };
+
+            realWay.Actions += getDeviceAction;
+            try
+            {
+                var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 93 } };
+                realWay.Send("GetDeviceInfo", jObject.ToString());
+            }
+            catch { canBreak = true; }
+
+            while (canBreak == false && TimeOut < 60)
+            {
+                System.Threading.Thread.Sleep(100);
+                TimeOut++;
+            }
+
+            realWay.Actions -= getDeviceAction;
+            getDeviceAction = null;
+
+            if (TimeOut >= 60)
+            {
+                if (listDevice.Count == 0)
+                {
+                    if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
+                    {
+                        //鑾峰彇璁惧鍒楄〃澶辫触
+                        //[XXXX]缃戝叧鍥炲瓒呮椂,璇风◢鍚庡啀璇�
+                        string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceListFail);
+                        msg += "\r\n[" + HdlGatewayLogic.Current.GetGatewayName(zbGateway).ToString() + "]";
+                        msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂", false);
+                        this.ShowTipMsg(msg);
+                    }
+                    statu = -1;
+                    return null;
+                }
+                else
+                {
+                    if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
+                    {
+                        //缃戠粶涓嶇ǔ瀹氾紝璁惧鍒楄〃淇℃伅缂烘崯
+                        string msg = Language.StringByID(R.MyInternationalizationString.uNetworkUnStableAndDeviceInfoIsNotFull);
+                        this.ShowTipMsg(msg);
+                    }
+                    statu = 2;
+                }
             }
-            return this.dicOTADevice[mainkeys];
-        }
-
-        #endregion
-
-        #region 鈻� 鑾峰彇璁惧鍚嶇О_______________________
-
-        /// <summary>
-        /// 鑾峰彇璁惧绔偣鐨勫悕绉�(鏈夌壒鏁�)
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public string GetDeviceEpointName(CommonDevice device)
-        {
-            string dName = this.GetSimpleEpointName(device);
-            if (string.IsNullOrEmpty(dName) == false)
-            {
-                return dName;
-            }
-            //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
-            dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
-            //濡傛灉鏄櫄鎷熻澶�
-            if (device.DriveCode > 0
-                || (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count > 1))
-            {
-                var arry = dName.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
-                dName = arry[0].Trim();
-                //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
-                dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
-            }
-            return dName;
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧MAC鍚嶇О
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public string GetDeviceMacName(CommonDevice device)
-        {
-            string dName = this.GetSimpleMacName(device);
-            if (string.IsNullOrEmpty(dName) == false)
-            {
-                return dName;
-            }
-
-            //鏄惁鎷ユ湁閰嶇疆鐨勬ā鍧桰D
-            if (this.dicDeviceModelIdEnum.ContainsKey(device.ModelIdentifier) == true)
-            {
-                //鑾峰彇妯″潡ID鍚嶅瓧
-                return this.GetNameByModelId(device);
-            }
-            else
-            {
-                //鑾峰彇绗笁鏂硅澶囩殑缈昏瘧鍚嶅瓧
-                var myDeviceType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                return Language.StringByID(myDeviceType.ConcreteTextId);
-            }
-        }
-
-        /// <summary>
-        /// 鏍规嵁妯″潡ID锛岃幏鍙栫炕璇戝悕瀛�
-        /// </summary>
-        /// <param name="device"></param>
-        /// <returns></returns>
-        private string GetNameByModelId(CommonDevice device)
-        {
-            if (device.ModelIdentifier == string.Empty)
-            {
-                //鏈煡璁惧
-                return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
-            }
-
-            string modelKeys = device.ModelIdentifier;
-            if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
-            {
-                //鏈煡璁惧
-                return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
-            }
-
-            string[] strValue = this.dicDeviceModelIdEnum[modelKeys].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
-            int ConcreteValue = Convert.ToInt32(strValue[0]);
-
-            string keyName = deviceModelIdName + ConcreteValue;
-            if (this.dicDeviceDefultNameID.ContainsKey(keyName) == true)
-            {
-                //R鏂囦欢閲岄潰璁剧疆鐨勫悕瀛�
-                return Language.StringByID(this.dicDeviceDefultNameID[keyName]);
-            }
-
-            //鏈煡璁惧
-            return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
-        }
-
-        /// <summary>
-        /// 闈炲叕寮�,璁剧疆璁惧鐨凪ac鍚嶅瓧(姝ゆ柟娉曞彧鏄崟瀛樼殑鍙樻洿缂撳瓨)
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <param name="macName">Mac鍚嶅瓧</param>
-        /// <returns></returns>
-        private void SetMacName(CommonDevice device, string macName)
-        {
-            device.DeviceName = macName;
-        }
-
-        /// <summary>
-        /// 闈炲叕寮�,璁剧疆璁惧鐨勭鐐瑰悕瀛�(姝ゆ柟娉曞彧鏄崟瀛樼殑鍙樻洿缂撳瓨)
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <param name="epointName">绔偣鍚嶅瓧</param>
-        /// <returns></returns>
-        private void SetEpointName(CommonDevice device, string epointName)
-        {
-            device.DeviceEpointName = epointName;
-        }
-
-        /// <summary>
-        /// 鍗曠函鑾峰彇璁惧鐨凪ac鍚嶅瓧
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public string GetSimpleMacName(CommonDevice device)
-        {
-            return device.DeviceName;
-        }
-
-        /// <summary>
-        /// 鍗曠函鑾峰彇璁惧鐨勭鐐瑰悕瀛�
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public string GetSimpleEpointName(CommonDevice device)
-        {
-            return device.DeviceEpointName;
-        }
-
-        /// <summary>
-        /// 鍒濆鍖朢鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
-        /// </summary>
-        private void InitDeviceDefultNameIDList()
-        {
-            if (this.dicDeviceDefultNameID != null)
-            {
-                return;
-            }
-            this.dicDeviceDefultNameID = new Dictionary<string, int>();
-            Type type = typeof(R.MyInternationalizationString);
-
-            var PropertyList = type.GetFields();
-            foreach (var item in PropertyList)
-            {
-                if (item.Name.StartsWith(deviceModelIdName) == true
-                    || item.Name.StartsWith("uDeviceBelongId") == true)
-                {
-                    this.dicDeviceDefultNameID[item.Name] = Convert.ToInt32(item.GetValue(null));
-                }
-            }
-
-            //鍒濆鍖栬澶囨灇涓�
-            this.InitDeviceModelIdEnum();
-        }
-
-        #endregion
-
-        #region 鈻� 璁剧疆鍥炬爣___________________________
-
-        /// <summary>
-        /// 鍙樻洿璁惧鐨勫浘鏍�
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <param name="unSelPath">鍥剧墖鍦板潃(闈為�夋嫨)</param>
-        public void ChangedDeviceIcon(CommonDevice device, string unSelPath)
-        {
-            if (unSelPath == string.Empty)
-            {
-                return;
-            }
-            device.IconPath = unSelPath;
-            device.IsCustomizeImage = true;
-            device.ReSave();
-
-            HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
-        }
-
-        /// <summary>
-        /// 璁剧疆璁惧銆愬浘鏍囥�戝埌鎸囧畾鐨勬帶浠�
-        /// </summary>
-        /// <param name="btnIcon">鎺т欢瀵硅薄</param>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public void SetDeviceIconToControl(Button btnIcon, CommonDevice device)
-        {
-            if (device == null)
-            {
-                btnIcon.UnSelectedImagePath = "Device/ThirdPartyDevice.png";
-                return;
-            }
-            string unSelectFilePath = string.Empty;
-            string selectFilePath = string.Empty;
-
-            //鑾峰彇璁惧銆愬浘鏍囥��
-            this.GetDeviceIcon(device, ref unSelectFilePath, ref selectFilePath);
-
-            btnIcon.UnSelectedImagePath = unSelectFilePath;
-            btnIcon.SelectedImagePath = selectFilePath;
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧銆愬浘鏍囥��
-        /// </summary>
-        /// <param name="listdevice">璁惧瀵硅薄</param>
-        /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
-        /// <param name="selectPath">鍥剧墖鍦板潃</param>
-        /// <returns></returns>
-        public void GetDeviceIcon(CommonDevice device, ref string unSelectPath, ref string selectPath)
-        {
-            if (string.IsNullOrEmpty(device.IconPath) == true)
-            {
-                return;
-            }
-            unSelectPath = device.IconPath;
-
-            string selPath = device.OnlineIconPath;
-            if (string.IsNullOrEmpty(selPath) == false)
-            {
-                selectPath = selPath;
-            }
-        }
-
-        /// <summary>
-        /// 璁剧疆璁惧鐨勭湡瀹炲浘鐗囧埌鎸囧畾鐨勬帶浠�
-        /// </summary>
-        /// <param name="btnIcon">鎺т欢瀵硅薄</param>
-        /// <param name="listdevice">璁惧瀵硅薄</param>
-        public void SetRealDeviceIconToControl(Button btnIcon, List<CommonDevice> listdevice)
-        {
-            //鑾峰彇瀹冨睘浜庝粈涔堢被鍨嬬殑璁惧
-            var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
-            string strConcrete = Enum.GetName(typeof(DeviceConcreteType), myDeviceType.ConcreteType);
-            string strType = strConcrete.Replace("_", string.Empty);
-            //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
-            string imageFilePath = "RealDevice/" + strType + ".png";
-            //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
-            if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
-            {
-                //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
-                string[] arry = strConcrete.Split(new string[] { "_" }, StringSplitOptions.None);
-                if (arry.Length == 1)
-                {
-                    //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
-                    return;
-                }
-                imageFilePath = "RealDevice/" + arry[0] + ".png";
-                //濡傛灉瀹冭嚜宸辩殑鍏遍�氬浘鐗囪繕鏄笉瀛樺湪鐨勮瘽,鍒欑洿鎺ヤ娇鐢ㄦ墍鏈夎澶囩殑鍏遍�氬浘鐗�
-                if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
-                {
-                    imageFilePath = "RealDevice/CommonDevice.png";
-                }
-            }
-            btnIcon.UnSelectedImagePath = imageFilePath;
-        }
-
-        /// <summary>
-        /// 璁剧疆銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣鍒版寚瀹氱殑鎺т欢
-        /// </summary>
-        /// <param name="btnIcon">鎺т欢瀵硅薄</param>
-        /// <param name="listdevice">璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public void SetDeviceBeloneIconToControl(Button btnIcon, List<CommonDevice> listdevice)
-        {
-            //鑾峰彇鑷畾涔夎澶囩被鍨�
-            var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
-
-            string imageUnSelectFilePath = string.Empty;
-            string imageSelectFilePath = string.Empty;
-
-            //鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
-            this.GetDeviceBeloneIcon(myDeviceType.ConcreteType, ref imageUnSelectFilePath, ref imageSelectFilePath);
-
-            //璁剧疆鍥剧墖
-            btnIcon.UnSelectedImagePath = imageUnSelectFilePath;
-            btnIcon.SelectedImagePath = imageSelectFilePath;
-        }
-
-        /// <summary>
-        /// 鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
-        /// </summary>
-        /// <param name="listdevice">璁惧瀵硅薄</param>
-        /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
-        /// <param name="selectPath">鍥剧墖鍦板潃</param>
-        /// <returns></returns>
-        public void GetDeviceBeloneIcon(List<CommonDevice> listdevice, ref string unSelectPath, ref string selectPath)
-        {
-            //鑾峰彇鑷畾涔夎澶囩被鍨�
-            var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
-
-            //鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
-            this.GetDeviceBeloneIcon(myDeviceType.ConcreteType, ref unSelectPath, ref selectPath);
-        }
-
-        /// <summary>
-        /// 鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
-        /// </summary>
-        /// <param name="specificType">鑷畾涔夎澶囩被鍨�</param>
-        /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
-        /// <param name="selectPath">鍥剧墖鍦板潃</param>
-        /// <returns></returns>
-        public void GetDeviceBeloneIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
-        {
-            //灏嗗叿浣撶被鍨嬭浆瀛楃涓�
-            string strSpecific = Enum.GetName(typeof(DeviceConcreteType), specificType);
-            string strType = strSpecific.Replace("_", string.Empty);
-            //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
-            string imageFilePath = "Device/" + strType + ".png";
-            string imageSelectFilePath = "Device/" + strType + "Selected.png";
-
-            //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
-            if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
-            {
-                //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
-                string[] arry = strSpecific.Split(new string[] { "_" }, StringSplitOptions.None);
-                if (arry.Length == 1)
-                {
-                    //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
-                    return;
-                }
-                imageFilePath = "Device/" + arry[0] + ".png";
-                imageSelectFilePath = "Device/" + arry[0] + "Selected.png";
-            }
-            //璁剧疆鍥剧墖
-            unSelectPath = imageFilePath;
-            selectPath = imageSelectFilePath;
-        }
-
-        #endregion
-
-        #region 鈻� 璁惧UI鐩稿叧_________________________
-
-        /// <summary>
-        /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
-        /// </summary>
-        /// <param name="device"></param>
-        /// <returns></returns>
-        public DeviceUI GetDeviceUI(CommonDevice device)
-        {
-            //鍒涘缓涓�涓柊鐨勪笢瑗跨粰杩囧幓
-            var deviceUi = new DeviceUI();
-            deviceUi.DeviceAddr = device.DeviceAddr;
-            deviceUi.DeviceEpoint = device.DeviceEpoint;
-            return deviceUi;
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <returns></returns>
-        public DeviceUI GetDeviceUI(string filePath)
-        {
-            string[] arry = filePath.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
-            if (arry.Length != 4)
-            {
-                return null;
-            }
-            //鍒涘缓涓�涓柊鐨勪笢瑗跨粰杩囧幓
-            var deviceUi = new DeviceUI();
-            deviceUi.DeviceAddr = arry[2];
-            deviceUi.DeviceEpoint = Convert.ToInt32(arry[3]);
-            return deviceUi;
-        }
-
-        #endregion
-
-        #region 鈻� 鑾峰彇鑷畾涔夌殑璁惧绫诲瀷_______________
-
-        /// <summary>
-        /// 鑾峰彇銆愯嚜瀹氫箟鐨勮澶囩被鍨嬨��,涓ょ绫诲瀷閮借缃簡
-        /// </summary>
-        /// <param name="listdevice">璁惧瀵硅薄</param>
-        /// <returns></returns>
-        public DeviceEnumInfo GetMyDeviceEnumInfo(List<CommonDevice> listdevice)
-        {
-            CommonDevice checkDevice = listdevice[0];
-            foreach (var temp in listdevice)
-            {
-                //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
-                if (temp.ModelIdentifier != string.Empty)
-                {
-                    checkDevice = temp;
-                }
-            }
-
-            //鑾峰彇娌充笢璁惧鐨勮澶囩被鍨�
-            DeviceEnumInfo info = this.GetHdlMyDeviceEnumInfo(checkDevice);
-            if (info != null)
-            {
-                return info;
-            }
-            //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
-            return this.GetNotHdlMyDeviceEnumInfo(listdevice);
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧鐨勩�愯澶囩被鍨嬨�戠殑缈昏瘧鏂囨湰(浼樺厛闀滃儚)
-        /// </summary>
-        /// <param name="listDevice"></param>
-        /// <param name="ApendFalge">绗笁鏂规垨鑰呰櫄鎷熻澶囩殑鏃跺�欙紝鏄惁娣诲姞鏍囪瘑</param>
-        /// <returns></returns>
-        public string GetDeviceObjectText(List<CommonDevice> listDevice, bool ApendFalge = true)
-        {
-            CommonDevice checkDevice = listDevice[0];
-            foreach (var temp in listDevice)
-            {
-                //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
-                if (temp.ModelIdentifier != string.Empty)
-                {
-                    checkDevice = temp;
-                }
-            }
-
-            string strName = string.Empty;
-            if (this.dicDeviceModelIdEnum.ContainsKey(checkDevice.ModelIdentifier) == true)
-            {
-                //鏍规嵁妯″潡ID锛岃幏鍙栬澶囧悕瀛�
-                strName = this.GetNameByModelId(checkDevice);
-            }
-            else
-            {
-                //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
-                var myDeviceType = this.GetNotHdlMyDeviceEnumInfo(listDevice);
-                strName = Language.StringByID(myDeviceType.ConcreteTextId);
-            }
-            if (ApendFalge == true && listDevice[0].DriveCode > 0)
-            {
-                //铏氭嫙璁惧鍔犱釜鏍囪瘑
-                strName += "鉁�";
-            }
-            else if (ApendFalge == true && this.IsHdlDevice(checkDevice) == false)
-            {
-                //绗笁鏂硅澶囧姞涓爣璇�
-                strName += "鈽�";
-            }
-            return strName;
-        }
-
-        #endregion
-
-        #region 鈻� 鑾峰彇娌充笢璁惧鐨勮澶囩被鍨媉____________
-
-        /// <summary>
-        /// 鑾峰彇Hdl璁惧鐨勩�愯嚜瀹氫箟鐨勮澶囩被鍨嬨��
-        /// </summary>
-        /// <param name="device">闅忎究鏌愪竴鍥炶矾</param>
-        /// <returns></returns>
-        private DeviceEnumInfo GetHdlMyDeviceEnumInfo(CommonDevice device)
-        {
-            //璁惧鍏蜂綋绫诲瀷
-            var info = new DeviceEnumInfo();
-            info.IsHdlDevice = this.IsHdlDevice(device);
-            if (device.ModelIdentifier == string.Empty)
-            {
-                return null;
-            }
-            string modelKeys = device.ModelIdentifier;
-            if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
-            {
-                //娌℃湁鍖归厤鍒版ā鍧桰D锛屽垯鐩存帴璧扮涓夋柟璁惧鐨勫垽鏂�
-                return null;
-            }
-
-            string[] strValue = this.dicDeviceModelIdEnum[modelKeys].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
-            int ConcreteValue = Convert.ToInt32(strValue[0]);
-            int BeloneValue = Convert.ToInt32(strValue[1]);
-            //璁剧疆璁惧鐨勩�愯澶囨墍灞炵被鍨嬨��
-            info.BeloneType = (DeviceBeloneType)BeloneValue;
-            if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + BeloneValue) == true)
-            {
-                //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
-                info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + BeloneValue];
-            }
-
-            //璁惧鍏蜂綋绫诲瀷
-            info.ConcreteType = (DeviceConcreteType)ConcreteValue;
-            if (info.ConcreteType.ToString() == ConcreteValue.ToString())
-            {
-                info.ConcreteType = DeviceConcreteType.UnKownDevice;
-            }
-            return info;
-        }
-
-        #endregion
-
-        #region 鈻� 鑾峰彇绗笁鏂硅澶囩殑璁惧绫诲瀷___________
-
-        /// <summary>
-        /// 鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
-        /// </summary>
-        /// <param name="listdevice"></param>
-        /// <returns></returns>
-        public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(List<CommonDevice> listdevice)
-        {
-            var dicType = new Dictionary<DeviceType, CommonDevice>();
-            foreach (CommonDevice device in listdevice)
-            {
-                if (dicType.ContainsKey(device.Type) == false)
-                {
-                    dicType[device.Type] = device;
-                }
-            }
-            var info = new DeviceEnumInfo();
-            info.IsHdlDevice = false;
-            //1鍖呭惈闈㈡澘鐨勮瘽,褰撻潰鏉垮鐞�
-            if (dicType.ContainsKey(DeviceType.OnOffSwitch) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId200;
-                info.BeloneType = DeviceBeloneType.A鎸夐敭闈㈡澘;
-                info.ConcreteType = DeviceConcreteType.ButtonPanel;
-            }
-            //3鍖呭惈绐楀笜鐨勮瘽,褰撶獥甯樺鐞�
-            else if (dicType.ContainsKey(DeviceType.WindowCoveringDevice) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId100;
-                info.BeloneType = DeviceBeloneType.A绐楀笜;
-                info.ConcreteType = DeviceConcreteType.Curtain;
-            }
-            //4绌烘皵寮�鍏�
-            else if (dicType.ContainsKey(DeviceType.AirSwitch) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4100;
-                info.BeloneType = DeviceBeloneType.A绌烘皵寮�鍏�;
-                info.ConcreteType = DeviceConcreteType.AirSwitch;
-            }
-            //5缁х數鍣�
-            else if (dicType.ContainsKey(DeviceType.OnOffOutput) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2300;
-                info.BeloneType = DeviceBeloneType.A缁х數鍣�;
-                info.ConcreteType = DeviceConcreteType.Relay;
-            }
-            //6璋冨厜鍣�
-            else if (dicType.ContainsKey(DeviceType.DimmableLight) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2500;
-                info.BeloneType = DeviceBeloneType.A璋冨厜鍣�;
-                info.ConcreteType = DeviceConcreteType.DimmableLight;
-            }
-            //7褰╃伅
-            else if (dicType.ContainsKey(DeviceType.ColorDimmableLight) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId9;
-                info.BeloneType = DeviceBeloneType.A褰╃伅;
-                info.ConcreteType = DeviceConcreteType.ColorLight;
-            }
-            //8绌鸿皟
-            else if (dicType.ContainsKey(DeviceType.Thermostat) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3600;
-                info.BeloneType = DeviceBeloneType.A绌鸿皟;
-                info.ConcreteType = DeviceConcreteType.AirConditioner;
-            }
-            //9涓户鍣�
-            else if (dicType.ContainsKey(DeviceType.Repeater) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3900;
-                info.BeloneType = DeviceBeloneType.A涓户鍣�;
-                info.ConcreteType = DeviceConcreteType.Repeater;
-            }
-            //10杞崲鍣�
-            else if (dicType.ContainsKey(DeviceType.Transverter) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4200;
-                info.BeloneType = DeviceBeloneType.A杞崲鍣�;
-                info.ConcreteType = DeviceConcreteType.Converter;
-            }
-            //11鏅鸿兘闂ㄩ攣
-            else if (dicType.ContainsKey(DeviceType.DoorLock) == true)
-            {
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2800;
-                info.BeloneType = DeviceBeloneType.A鏅鸿兘闂ㄩ攣;
-                info.ConcreteType = DeviceConcreteType.IntelligentLocks;
-            }
-            //12鍖呭惈浼犳劅鍣ㄧ殑璇�,褰撲紶鎰熷櫒澶勭悊
-            else if (dicType.ContainsKey(DeviceType.IASZone) == true)
-            {
-                //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
-                info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
-                this.SetSensorDeviceSpecificType(ref info, listdevice);
-            }
-            //13鍖呭惈娓╁害浼犳劅鍣ㄧ殑璇�
-            else if (dicType.ContainsKey(DeviceType.TemperatureSensor) == true)
-            {
-                bool temperatrue = false;
-                bool humidity = false;
-                foreach (var device in listdevice)
-                {
-                    if (device is TemperatureSensor)
-                    {
-                        //娓╁害浼犳劅鍣�
-                        if (((TemperatureSensor)device).SensorDiv == 1)
-                        {
-                            temperatrue = true;
-                        }
-                        //婀垮害浼犳劅鍣�
-                        else if (((TemperatureSensor)device).SensorDiv == 2)
-                        {
-                            humidity = true;
-                        }
-                    }
-                }
-                if (temperatrue == true && humidity == true)
-                {
-                    //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
-                    info.BeloneType = DeviceBeloneType.A娓╂箍搴︿紶鎰熷櫒;
-                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId10;
-                    info.ConcreteType = DeviceConcreteType.Sensor_TemperatrueHumidity;
-                }
-                else if (temperatrue == true && humidity == false)
-                {
-                    //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
-                    info.BeloneType = DeviceBeloneType.A娓╁害浼犳劅鍣�;
-                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId11;
-                    info.ConcreteType = DeviceConcreteType.Sensor_Temperatrue;
-                }
-                else if (temperatrue == false && humidity == true)
-                {
-                    //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
-                    info.BeloneType = DeviceBeloneType.A婀垮害浼犳劅鍣�;
-                    info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId12;
-                    info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
-                }
-            }
-
-            int value = (int)info.BeloneType;
-            if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
-            {
-                //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
-                info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
-            }
-
-            return info;
-        }
-
-        #endregion
-
-        #region 鈻� 浼犳劅鍣ㄥ叿浣撶殑绫诲瀷___________________
-
-        /// <summary>
-        /// 璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
-        /// </summary>
-        /// <param name="info">鑷畾涔夎澶囨灇涓句俊鎭�</param>
-        /// <param name="listdevice">璁惧瀵硅薄</param>
-        private void SetSensorDeviceSpecificType(ref DeviceEnumInfo info, List<CommonDevice> listdevice)
-        {
-            //榛樿鍚嶅瓧:浼犳劅鍣�
-            info.ConcreteType = DeviceConcreteType.Sensor;
-            info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
-
-            //濡傛灉杩欎釜璁惧鎷ユ湁澶氫釜鍥炶矾鐨勮瘽,鎴戜篃涓嶇煡閬撴�庝箞鍛藉悕,鍙兘缁欎釜榛樿鍚嶅瓧
-            if (listdevice.Count > 1)
-            {
-                return;
-            }
-            var iasZone = (IASZone)listdevice[0];
-            if (iasZone.IasDeviceType == 13)
-            {
-                //杩愬姩浼犳劅鍣�
-                info.ConcreteType = DeviceConcreteType.Sensor_Motion;
-                info.ConcreteTextId = R.MyInternationalizationString.uMotionSensor;
-            }
-            else if (iasZone.IasDeviceType == 40)
-            {
-                //鐑熼浘浼犳劅鍣�
-                info.ConcreteType = DeviceConcreteType.Sensor_Fire;
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1302;
-            }
-            else if (iasZone.IasDeviceType == 42)
-            {
-                //姘翠镜浼犳劅鍣�
-                info.ConcreteType = DeviceConcreteType.Sensor_Water;
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1304;
-            }
-            else if (iasZone.IasDeviceType == 43)
-            {
-                //鐕冩皵浼犳劅鍣�
-                info.ConcreteType = DeviceConcreteType.Sensor_CarbonMonoxide;
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1300;
-            }
-            else if (iasZone.IasDeviceType == 44)
-            {
-                //绱ф�ユ寜閽�
-                info.ConcreteType = DeviceConcreteType.Sensor_EmergencyButton;
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1305;
-            }
-            else if (iasZone.IasDeviceType == 277)
-            {
-                //閽ュ寵鎵�
-                info.ConcreteType = DeviceConcreteType.Sensor_Keyfob;
-                info.ConcreteTextId = R.MyInternationalizationString.uKeyfob;
-            }
-            else if (iasZone.IasDeviceType == 21 || iasZone.IasDeviceType == 22)
-            {
-                //闂ㄧ獥浼犳劅鍣�
-                info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
-                info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1301;
-            }
-        }
-
-        #endregion
-
-        #region 鈻� 鐗╃悊璁惧鎵�灞炴埧闂確__________________
-
-        /// <summary>
-        /// 鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
-        /// </summary>
-        private void InitRealDeviceRoomId()
-        {
-            this.dicDeviceRoomId = new Dictionary<string, string>();
-            string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
-            var strData = UserCenterLogic.LoadFileContent(fullName);
-            if (strData != null)
-            {
-                this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
-            }
-        }
-
-        /// <summary>
-        /// 淇濆瓨鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
-        /// </summary>
-        /// <param name="listDevice">闇�瑕佷繚瀛樼殑璁惧瀵硅薄</param>
-        /// <param name="roomId">闇�瑕佷繚瀛樼殑鍝釜璁惧鐨勬埧闂碔D</param>
-        public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId)
-        {
-            if (listDevice != null)
-            {
-                this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
-            }
-
-            //淇濆瓨璁板綍
-            string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
-            UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
-
-            //濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
-            if (listDevice != null && listDevice.Count == 1)
-            {
-                Common.Room.CurrentRoom.ChangedRoom(listDevice[0], roomId);
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇鐪熷疄鐗╃悊璁惧鐨勬埧闂村悕瀛�
-        /// </summary>
-        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
-        /// <returns></returns>
-        public string GeteRealDeviceRoomName(CommonDevice device)
-        {
-            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
-            {
-                //鏈垎閰嶅尯鍩�
-                return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
-            }
-            var room = Room.CurrentRoom.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
-            if (room != null)
-            {
-                return room.Name;
-            }
-            //鏈垎閰嶅尯鍩�
-            return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
-        }
-
-        /// <summary>
-        /// 鑾峰彇鐪熷疄鐗╃悊璁惧灞炰簬鍝釜鎴块棿
-        /// </summary>
-        /// <param name="device">璁惧鐨勬煇涓�涓洖璺�</param>
-        /// <returns></returns>
-        public Room GeteRealDeviceRoom(CommonDevice device)
-        {
-            if (this.dicDeviceRoomId.ContainsKey(device.DeviceAddr) == false)
-            {
-                return null;
-            }
-            return Room.CurrentRoom.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
-        }
-
-        #endregion
-
-        #region 鈻� 涓�鑸柟娉昣__________________________
-
-        /// <summary>
-        /// 鍒ゆ柇鏄笉鏄渤涓滅殑璁惧
-        /// </summary>
-        /// <param name="device"></param>
-        /// <returns></returns>
-        public bool IsHdlDevice(CommonDevice device)
-        {
-            return device.ManufacturerName == "HDL";
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧鐨勫敮涓�涓婚敭
-        /// </summary>
-        /// <param name="device"></param>
-        /// <returns></returns>
-        public string GetDeviceMainKeys(CommonDevice device)
-        {
-            return device.DeviceAddr + device.DeviceEpoint;
-        }
-
-        /// <summary>
-        /// 鑾峰彇璁惧鐨勫敮涓�涓婚敭
-        /// </summary>
-        /// <param name="DeviceAddr">MAC鍦板潃</param>
-        /// <param name="DeviceEpoint">绔彛鍙�</param>
-        /// <returns></returns>
-        public string GetDeviceMainKeys(string DeviceAddr, int DeviceEpoint)
-        {
-            return DeviceAddr + DeviceEpoint;
-        }
-
-        /// <summary>
-        /// 浜ゆ崲璁惧鐨勬ā鍧桰D
-        /// </summary>
-        /// <param name="modeId">妯″潡ID</param>
-        /// <returns></returns>
-        public bool ChangedDeviceModeId(ref string modeId)
-        {
-            if (this.dicDeviceModelIdChanged.ContainsKey(modeId) == false)
-            {
-                return false;
-            }
-            modeId = this.dicDeviceModelIdChanged[modeId];
-
-            return true;
-        }
-
-        /// <summary>
-        /// 闄勫姞璁惧鐨勭増鏈唬鍙�(杩斿洖Ver.XXX)
-        /// </summary>
-        /// <param name="versionValue">鐗堟湰鍙�</param>
-        /// <returns></returns>
-        public string AppendVersion(int versionValue)
-        {
-            //杞负16杩涘埗
-            string txt64 = Convert.ToString(versionValue, 16).PadLeft(4, '0');
-            //杩欎釜鏄皬鏁扮偣鍓嶉潰鐨勫��
-            int value1 = Convert.ToInt32(txt64.Substring(0, 2), 16);
-            //杩欎釜鏄皬鏁扮偣鍚庨潰鐨勫��
-            int value2 = Convert.ToInt32(txt64.Substring(2, 2), 16);
-
-            //Ver.
-            string ver = Language.StringByID(R.MyInternationalizationString.uVersionAbbreviation);
-            return ver + value1 + "." + value2.ToString().PadLeft(3, '0');
-        }
-
-        /// <summary>
-        /// 鏄剧ず閿欒淇℃伅绐楀彛
-        /// </summary>
-        /// <param name="msg"></param>
-        private void ShowErrorMsg(string msg)
-        {
-            Application.RunOnMainThread(() =>
-            {
-                var contr = new ShowMsgControl(ShowMsgType.Error, msg);
-                contr.Show();
-            });
-        }
-
-        /// <summary>
-        /// 鏄剧ずTip淇℃伅绐楀彛
-        /// </summary>
-        /// <param name="msg"></param>
-        private void ShowTipMsg(string msg)
-        {
-            Application.RunOnMainThread(() =>
-            {
-                var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
-                contr.Show();
-            });
-        }
-
-        #endregion
-
-        //----------------------------------鍒嗗壊绾�(鑷畾涔夋帴鍙�)---------------------------------------------
-
-        #region 鈻� 鑾峰彇璁惧鍒楄〃鐨勬帴鍙________________
-
-        /// <summary>
-        /// 浠庣綉鍏抽噸鏂拌幏鍙栬澶囧垪琛�(鈽呪槄鈽呪槄鈽呪槄鈽呮帴鏀跺埌璁惧鏃剁殑浜嬩欢鈽呪槄鈽呪槄鈽呪槄鈽�)
-        /// </summary>
-        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
-        /// <param name="ignoreTime">鏄惁鏃犺鏃堕棿,true:姣忔璋冪敤閮藉幓缃戝叧鑾峰彇,false:3鍒嗛挓鍐呰繑鍥炵殑鏄湰鍦扮殑璁惧</param>
-        /// <param name="deviceComingAction">鎺ユ敹鍒拌澶囨椂鐨勪簨浠�</param>
-        /// <param name="mode">鏄惁鏄剧ず閿欒</param>
-        /// <returns></returns>
-        public List<CommonDevice> GetDeviceListFromGateway(ZbGateway zbGateway, bool ignoreTime, Action<CommonDevice> deviceComingAction = null, ShowErrorMode mode = ShowErrorMode.YES)
-        {
-            if (ignoreTime == false)
-            {
-                if ((DateTime.Now - zbGateway.LastDateTime).TotalMilliseconds < 3 * 60 * 1000)
-                {
-                    //涓嶆棤瑙嗘椂闂�,杩斿洖鏈湴璁惧鍒楄〃
-                    var listTemp = this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));
-                    if (deviceComingAction != null)
-                    {
-                        for (int i = 0; i < listTemp.Count; i++)
-                        {
-                            try
-                            {
-                                //鍥炶皟鍑芥暟
-                                deviceComingAction.Invoke(listTemp[i]);
-                            }
-                            //Log鍑哄姏
-                            catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
-                        }
-                    }
-                    deviceComingAction = null;
-                    return listTemp;
-                }
-            }
-            zbGateway.LastDateTime = DateTime.Now;
-
-            //濡傛灉鍒囨崲鍒颁簡鍒殑鐣岄潰锛屽垯涓嶆樉绀洪敊璇俊鎭�
-            string nowFormId = UserCenterResourse.NowActionFormID;
-
-            ZbGateway realWay = null;
-            if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, zbGateway) == false)
-            {
-                if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
-                {
-                    //閿欒:缃戝叧瀵硅薄涓㈠け
-                    string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
-                    this.ShowTipMsg(msg);
-                }
-                return null;
-            }
-
-            //鏄惁杈炬垚涓柇鐨勬椂鏈�
-            bool canBreak = false;
-            //缃戝叧ID
-            string gatewayID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
-            //瓒呮椂鏃堕棿
-            int TimeOut = 0;
-            //璁惧鎬绘暟
-            int deviceCount = -1;
-            //鎺ユ敹鏁�
-            int receiveCount = 0;
-            //璁惧鍒楄〃
-            var listDevice = new List<CommonDevice>();
-
-            Action<string, string> getDeviceAction = (topic, message) =>
-            {
-                try
-                {
-                    if (topic == gatewayID + "/" + "DeviceInfoRespon")
-                    {
-                        TimeOut = 0;
-                        var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
-                        var totalNum = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["TotalNum"].ToString());
-                        if (totalNum == 0)
-                        {
-                            //杩欎釜缃戝叧娌℃湁璁惧
-                            canBreak = true;
-                            return;
-                        }
-                        if (deviceCount == -1)
-                        {
-                            //璁剧疆闇�瑕佹帴鏀跺灏戜釜璁惧
-                            deviceCount = totalNum;
-                        }
-                        //璁惧鎺ユ敹鏁�
-                        receiveCount++;
-
-                        var deviceID = (DeviceType)jobject.Value<int>("Device_ID");
-                        //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
-                        var device = this.NewDeviceObjectByDeviceId(deviceID, jobject, zbGateway);
-                        if (device != null)
-                        {
-                            try
-                            {
-                                //鍥炶皟鍑芥暟
-                                deviceComingAction?.Invoke(device);
-                            }
-                            //Log鍑哄姏
-                            catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
-
-                            listDevice.Add(device);
-                        }
-                        if (deviceCount == receiveCount)
-                        {
-                            //璁惧鍏ㄩ儴鎺ユ敹瀹屾垚
-                            canBreak = true;
-                        }
-                    }
-                }
-                catch { }
-            };
-
-            realWay.Actions += getDeviceAction;
-            try
-            {
-                var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 93 } };
-                realWay.Send("GetDeviceInfo", jObject.ToString());
-            }
-            catch { canBreak = true; }
-
-            while (canBreak == false && TimeOut < 60)
-            {
-                System.Threading.Thread.Sleep(100);
-                TimeOut++;
-            }
-
-            realWay.Actions -= getDeviceAction;
-            getDeviceAction = null;
-
-            if (TimeOut >= 60)
-            {
-                if (listDevice.Count == 0)
-                {
-                    if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
-                    {
-                        //鑾峰彇璁惧鍒楄〃澶辫触
-                        //[XXXX]缃戝叧鍥炲瓒呮椂,璇风◢鍚庡啀璇�
-                        string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceListFail);
-                        msg += "\r\n[" + HdlGatewayLogic.Current.GetGatewayName(zbGateway).ToString() + "]";
-                        msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂", false);
-                        this.ShowTipMsg(msg);
-                    }
-                    return null;
-                }
-                else
-                {
-                    if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
-                    {
-                        //缃戠粶涓嶇ǔ瀹氾紝璁惧鍒楄〃淇℃伅缂烘崯
-                        string msg = Language.StringByID(R.MyInternationalizationString.uNetworkUnStableAndDeviceInfoIsNotFull);
-                        this.ShowTipMsg(msg);
-                    }
-                }
-            }
-
-            //鍥炶皟鍑芥暟(鎺ユ敹瀹屾垚)
-            deviceComingAction = null;
-
             return listDevice;
-        }
-
-        #endregion
-
-        #region 鈻� 鍒涘缓鏂拌澶囧璞$浉鍏砡________________
-
-        /// <summary>
-        /// 鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
-        /// </summary>
-        /// <param name="deviceType">璁惧绫诲瀷</param>
-        /// <param name="jobject">涓婚Data</param>
-        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
-        /// <returns></returns>
-        private CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, Newtonsoft.Json.Linq.JObject jobject, ZbGateway zbGateway)
-        {
-            string gwId = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
-
-            //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
-            CommonDevice device = this.NewDeviceObjectByDeviceId(deviceType);
-            if (device == null)
-            {
-                return null;
-            }
-
-            //璁剧疆璁惧灞炴�х被
-            device.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceInfoData>(jobject["Data"].ToString());
-            if (device.DeviceInfo == null)
-            {
-                return null;
-            }
-            this.SetMacName(device, string.Empty);
-            this.SetEpointName(device, string.Empty);
-
-            //璁剧疆璁惧涓婚敭绫�
-            this.SetNewDeviceMainKeys(device, jobject);
-            device.CurrentGateWayId = gwId;
-
-            //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
-            this.SetDeviceInfoToMain(device, device);
-
-            return device;
-        }
-
-        /// <summary>
-        /// 灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
-        /// </summary>
-        /// <param name="mainDevice">涓昏澶囧璞�</param>
-        /// <param name="device">璁剧疆婧愯澶囧璞�</param>
-        public void SetDeviceInfoToMain(CommonDevice mainDevice, CommonDevice device)
-        {
-            if (string.IsNullOrEmpty(device.DeviceInfo.MacName) == false)
-            {
-                mainDevice.DeviceName = device.DeviceInfo.MacName;
-            }
-            if (string.IsNullOrEmpty(device.DeviceInfo.DeviceName) == false)
-            {
-                mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
-            }
-            mainDevice.CurrentGateWayId = device.CurrentGateWayId;
-            mainDevice.IsOnline = device.DeviceInfo.IsOnline;
-            mainDevice.DriveCode = device.DeviceInfo.DriveCode;
-            mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
-            mainDevice.Profile = device.DeviceInfo.Profile;
-            mainDevice.Type = device.Type;
-
-            //鍥轰欢鐗堟湰
-            mainDevice.ImgVersion = device.DeviceInfo.ImgVersion;
-            //纭欢鐗堟湰
-            mainDevice.HwVersion = device.DeviceInfo.HwVersion;
-            //闀滃儚ID
-            mainDevice.ImgTypeId = device.DeviceInfo.ImgTypeId;
-            //鍘傚晢鍚嶇О
-            mainDevice.ManufacturerName = device.DeviceInfo.ManufacturerName;
-            //妯″潡ID
-            mainDevice.ModelIdentifier = device.DeviceInfo.ModelIdentifier;
-            //搴忓垪鍙�
-            mainDevice.SerialNumber = device.DeviceInfo.ProductCode;
-
-            mainDevice.InClusterList.Clear();
-            mainDevice.InClusterList.AddRange(device.DeviceInfo.InClusterList);
-            mainDevice.OutClusterList.Clear();
-            mainDevice.OutClusterList.AddRange(device.DeviceInfo.OutClusterList);
-            mainDevice.AttributeStatus.Clear();
-            mainDevice.AttributeStatus.AddRange(device.DeviceInfo.AttributeStatus);
-
-            //濡傛灉鏄俯搴︿紶鎰熷櫒
-            if (mainDevice.Type == DeviceType.TemperatureSensor)
-            {
-                //杈撳嚭鏃� 1026:娓╁害浼犳劅鍣� 1029:婀垮害浼犳劅鍣�
-                foreach (var data in mainDevice.OutClusterList)
-                {
-                    if (data.OutCluster == 1029)
-                    {
-                        ((TemperatureSensor)mainDevice).SensorDiv = 2;
-                    }
-                    else if (data.OutCluster == 1026)
-                    {
-                        ((TemperatureSensor)mainDevice).SensorDiv = 1;
-                    }
-                }
-            }
-            //濡傛灉鏄皟鍏夊櫒
-            else if (mainDevice.Type == DeviceType.DimmableLight)
-            {
-                mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
-                if (mainDevice.IsCustomizeImage == false)
-                {
-                    mainDevice.IconPath = "Device/Light.png";
-                }
-            }
-            //濡傛灉鏄僵鐏殑璇�
-            else if (mainDevice.Type == DeviceType.ColorDimmableLight)
-            {
-                mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
-                if (mainDevice.IsCustomizeImage == false)
-                {
-                    mainDevice.IconPath = "Device/ColorLight.png";
-                }
-            }
-        }
-
-        /// <summary>
-        /// 鏍规嵁璁惧Type鍒涘缓瀵瑰簲鐨勮澶囧璞�
-        /// </summary>
-        /// <param name="deviceType">璁惧Type</param>
-        /// <returns></returns>
-        public CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType)
-        {
-            CommonDevice device = null;
-
-            //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
-            if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); }
-            else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); }
-            else if (deviceType == DeviceType.OnOffSwitch) { device = new Panel(); }
-            else if (deviceType == DeviceType.OnOffOutput) { device = new ToggleLight(); }
-            else if (deviceType == DeviceType.AirSwitch) { device = new AirSwitch(); }
-            else if (deviceType == DeviceType.WindowCoveringDevice) { device = new Rollershade(); }
-            else if (deviceType == DeviceType.IASZone) { device = new IASZone(); }
-            else if (deviceType == DeviceType.Repeater) { device = new Repeater(); }
-            else if (deviceType == DeviceType.Thermostat) { device = new AC(); }
-            else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); }
-            else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }
-            else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
-            else { return null; }
-
-            device.DeviceEpointName = string.Empty;
-            device.DeviceName = string.Empty;
-
-            return device;
-        }
-
-        /// <summary>
-        /// 缁欐柊璁惧璁剧疆涓婚敭灞炴��
-        /// </summary>
-        /// <param name="device">璁惧瀵硅薄</param>
-        /// <param name="jobject">涓婚Data</param>
-        public void SetNewDeviceMainKeys(CommonDevice device, Newtonsoft.Json.Linq.JObject jobject)
-        {
-            //璁剧疆璁惧涓婚敭绫�
-            device.Time = jobject.Value<int>("Time");
-            device.DeviceID = jobject.Value<int>("Device_ID");
-            device.DeviceAddr = jobject.Value<string>("DeviceAddr");
-            device.DeviceEpoint = jobject.Value<int>("Epoint");
-            device.DataID = jobject.Value<int>("Data_ID");
-        }
-
-        #endregion
-
-        //----------------------------------鍒嗗壊绾�(璁惧妯″潡ID)---------------------------------------------
-
-        #region 鈻� 鑷畾涔夎澶囨ā鍧桰D___________________
-
-        /// <summary>
-        /// 鍒濆鍖栬澶囩殑妯″潡ID鐨勬灇涓�
-        /// </summary>
-        private void InitDeviceModelIdEnum()
-        {
-            if (this.dicDeviceModelIdEnum != null)
-            {
-                return;
-            }
-            this.dicDeviceModelIdEnum = new Dictionary<string, string>();
-
-            //瀹氫箟瑙勫垯锛氭ā鍧桰D(宸茬炕璇�)=璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
-            //绗竴涓�兼槸:DeviceConcreteType  绗簩涓�兼槸:DeviceBeloneType
-
-            //=========鈽呪槄寮�鍚堝笜绫�(100-199)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100";//鏅鸿兘寮�鍚堝笜鐢垫満
-            this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100";//鏅鸿兘绠$姸鐢垫満
-
-            //=========鈽呪槄鎸夐敭闈㈡澘绫�(200-1199)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MPT4/R4-ZB.18"] = "200-200";//4鎸夐敭瑙︽懜闈㈡澘(甯�4璺户鐢靛櫒搴曞骇)
-            this.dicDeviceModelIdEnum["MPT3/R3-ZB.18"] = "201-200";//3鎸夐敭瑙︽懜闈㈡澘
-            this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200";//2鎸夐敭瑙︽懜闈㈡澘
-            this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200";//12鎸夐敭瑙︽懜闈㈡澘
-            this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200";//4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
-
-            //=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir浼犳劅鍣�220
-
-            //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1300";//鐕冩皵浼犳劅鍣�
-            this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1300";//闂ㄧ獥纾佷紶鎰熷櫒
-            this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1300";//鐑熼浘浼犳劅鍣�
-            this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1300";//绾㈠浼犳劅鍣�
-            this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1300";//姘存蹈浼犳劅鍣�
-            this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1300";//绱ф�ユ寜閿�
-
-            //=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300";//3璺户鐢靛櫒灏忔ā鍧�
-
-            //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MPD0101-ZB.10"] = "2500-2500";//1璺皟鍏夊櫒灏忔ā鍧�
-
-            //=========鈽呪槄鏅鸿兘闂ㄩ攣绫�(2800-????)鈽呪槄=========
-            this.dicDeviceModelIdEnum["H06C"] = "2800-2800";//鏅鸿兘闂ㄩ攣(H06C)
-
-            //=========鈽呪槄绌鸿皟绫�(3600-3899)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MAC/GW-ZB.10"] = "3600-3600";//zigbee绌鸿皟缃戝叧妯″潡
-
-            //=========鈽呪槄涓户鍣ㄧ被(3900-3999)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MSR-ZB.10"] = "3900-3900"; //zigbee涓户鍣�
-
-            //=========鈽呪槄绌烘皵寮�鍏崇被(4100-4199)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MBCI01-ZB.10"] = "4100-4100";//zigbee寰柇浜戞帶鍒跺櫒
-
-            //=========鈽呪槄杞崲鍣ㄧ被(4200-4699)鈽呪槄=========
-            this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200";//zigbee杞琤uspro鍗忚杞崲鍣�
-            this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee杞�485鍗忚杞崲鍣�
-
-            //闇�瑕佷氦鎹㈢殑妯″潡ID
-            this.dicDeviceModelIdChanged = new Dictionary<string, string>();
-            //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫烩槄鈽�=========
-            this.dicDeviceModelIdChanged["MULTI-GASE--EA07"] = "MSG01/M-ZB.10";//鐕冩皵浼犳劅鍣�
-            this.dicDeviceModelIdChanged["MULTI-MECI--EA01"] = "MSDC01/M-ZB.10";//闂ㄧ獥纾佷紶鎰熷櫒
-            this.dicDeviceModelIdChanged["MULTI-FIRE--EA05"] = "MSS01/M-ZB.10";//鐑熼浘浼犳劅鍣�
-            this.dicDeviceModelIdChanged["MULTI-MOTI--EA04"] = "MSPIR01/M-ZB.10";//绾㈠浼犳劅鍣�
-            this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//姘存蹈浼犳劅鍣�
-            this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//绱ф�ユ寜閿�
-        }
-
-        #endregion
-    }
-
-    #region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
-
-    /// <summary>
-    /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囩殑鍏蜂綋銆愯澶囩被鍨嬨��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
-    /// <para>鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
-    /// </summary>
-    public enum DeviceConcreteType
-    {
-        //瀹氫箟瑙勫垯锛氥�愯澶囩被鍨嬨�戝浘鐗囧悕瀛�=LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��
-
-        /// <summary>
-        /// 鏈煡璁惧
-        /// </summary>
-        UnKownDevice = -1,
-
-        //=========鈽呪槄绐楀笜绫�(100-199)鈽呪槄=========
-        /// <summary>
-        /// 绐楀笜
-        /// </summary>
-        Curtain = -100,
-        /// <summary>
-        /// 鏅鸿兘寮�鍚堝笜鐢垫満 闀滃儚id锛�100
-        /// </summary>
-        Curtain_AutoOpen = 100,
-        /// <summary>
-        /// 鏅鸿兘绠$姸鐢垫満 闀滃儚id锛�101
-        /// </summary>
-        Curtain_Siphonate = 101,
-
-        //=========鈽呪槄鎸夐敭闈㈡澘绫�(200-1199)鈽呪槄=========
-        /// <summary>
-        /// 鎸夐敭闈㈡澘
-        /// </summary>
-        ButtonPanel = -200,
-        /// <summary>
-        /// 4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇) 闀滃儚id锛�200
-        /// </summary>
-        ButtonPanel_Four = 200,
-        /// <summary>
-        /// 3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇) 闀滃儚id锛�201
-        /// </summary>
-        ButtonPanel_Three = 201,
-        /// <summary>
-        /// 2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇) 闀滃儚id锛�202
-        /// </summary>
-        ButtonPanel_Two = 202,
-        /// <summary>
-        /// 12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇) 闀滃儚id锛�203
-        /// </summary>
-        ButtonPanel_Twelve = 203,
-        /// <summary>
-        /// 4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉匡紙鍙甫鐢垫簮搴曞骇锛� 闀滃儚id锛�210
-        /// </summary>
-        ButtonPanel_FourNotPower = 210,
-
-        //=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
-        /// <summary>
-        /// 浼犳劅鍣�
-        /// </summary>
-        Sensor = -1200,
-        /// <summary>
-        /// pir浼犳劅鍣�220 闀滃儚id锛�1200
-        /// </summary>
-        Sensor_Pir = 1200,
-
-        //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
-        /// <summary>
-        /// 鐕冩皵浼犳劅鍣�
-        /// </summary>
-        Sensor_CarbonMonoxide = 1300,
-        /// <summary>
-        /// 闂ㄧ獥浼犳劅鍣�
-        /// </summary>
-        Sensor_DoorWindow = 1301,
-        /// <summary>
-        /// 鐑熼浘浼犳劅鍣�
-        /// </summary>
-        Sensor_Fire = 1302,
-        /// <summary>
-        /// 绾㈠浼犳劅鍣�
-        /// </summary>
-        Sensor_Infrared = 1303,
-        /// <summary>
-        /// 姘翠镜浼犳劅鍣�
-        /// </summary>
-        Sensor_Water = 1304,
-        /// <summary>
-        /// 绱ф�ユ寜閽�
-        /// </summary>
-        Sensor_EmergencyButton = 1305,
-        /// <summary>
-        /// 杩愬姩浼犳劅鍣�
-        /// </summary>
-        Sensor_Motion = -1306,
-        /// <summary>
-        /// 閽ュ寵鎵�
-        /// </summary>
-        Sensor_Keyfob = -1307,
-        /// <summary>
-        /// 娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        Sensor_TemperatrueHumidity = -1308,
-        /// <summary>
-        /// 娓╁害浼犳劅鍣�
-        /// </summary>
-        Sensor_Temperatrue = -1309,
-        /// <summary>
-        /// 婀垮害浼犳劅鍣�
-        /// </summary>
-        Sensor_Humidity = -1310,
-
-        //=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
-        /// <summary>
-        /// 缁х數鍣�
-        /// </summary>
-        Relay = -2300,
-        /// <summary>
-        /// 涓夎矾缁х數鍣� 闀滃儚id锛�2300
-        /// </summary>
-        Relay_ThreeLoad = 2300,
-
-        //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
-        /// <summary>
-        /// 璋冨厜鍣�
-        /// </summary>
-        DimmableLight = -2500,
-        /// <summary>
-        /// 1璺皟鍏夊櫒灏忔ā鍧�
-        /// </summary>
-        DimmableLight_OneLoad = 2500,
-
-        //=========鈽呪槄鏅鸿兘闂ㄩ攣绫�(2800-????)鈽呪槄=========
-        /// <summary>
-        /// 鏅鸿兘闂ㄩ攣
-        /// </summary>
-        IntelligentLocks = -2800,
-        /// <summary>
-        /// H06C
-        /// </summary>
-        IntelligentLocks_H06C = 2800,
-
-        //=========鈽呪槄褰╃伅绫�(????-????)鈽呪槄=========
-        /// <summary>
-        /// 褰╃伅
-        /// </summary>
-        ColorLight = -10,
-
-        //=========鈽呪槄绌鸿皟(3600-3899)鈽呪槄=========
-        /// <summary>
-        /// 绌鸿皟
-        /// </summary>
-        AirConditioner = -3600,
-        /// <summary>
-        /// zigbee绌鸿皟缃戝叧妯″潡
-        /// </summary>
-        AirConditioner_ZbGateway = 3600,
-
-        //=========鈽呪槄涓户鍣�(3900-3999)鈽呪槄=========
-        /// <summary>
-        /// 涓户鍣�
-        /// </summary>
-        Repeater = -3900,
-        /// <summary>
-        /// zigbee涓户鍣� 闀滃儚id锛�3900
-        /// </summary>
-        Repeater_Zigbee = 3900,
-
-        //=========鈽呪槄绌烘皵寮�鍏崇被(4100-????)鈽呪槄=========
-        /// <summary>
-        /// 鏅鸿兘绌烘皵寮�鍏�
-        /// </summary>
-        AirSwitch = -4100,
-        /// <summary>
-        /// 寰柇浜戞帶鍒跺櫒 闀滃儚id锛�4100
-        /// </summary>
-        AirSwitch_CloudContr = 4100,
-
-        //=========鈽呪槄杞崲鍣ㄧ被(4200-4699)鈽呪槄=========
-        /// <summary>
-        /// 杞崲鍣�
-        /// </summary>
-        Converter = -4200,
-        /// <summary>
-        /// zigbee杞�485鍗忚杞崲鍣�
-        /// </summary>
-        Converter_Zb485 = 4200,
-        /// <summary>
-        /// zigbee杞琤uspro鍗忚杞崲鍣�
-        /// </summary>
-        Converter_ZbBuspro = 4201,
-    }
-
-    /// <summary>
-    /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囨墍灞炵殑銆愯澶囩绫汇��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
-    /// <para>杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
-    /// </summary>
-    public enum DeviceBeloneType
-    {
-        /// <summary>
-        /// 鏈煡璁惧
-        /// </summary>
-        A鏈煡璁惧 = 0,
-        /// <summary>
-        /// 绐楀笜(100-199)
-        /// </summary>
-        A绐楀笜 = 100,
-        /// <summary>
-        /// 鎸夐敭闈㈡澘(200-1199)
-        /// </summary>
-        A鎸夐敭闈㈡澘 = 200,
-        /// <summary>
-        /// 浼犳劅鍣�(1200-2299)
-        /// </summary>
-        A浼犳劅鍣� = 1200,
-        /// <summary>
-        /// 缁х數鍣�(2300-2499)
-        /// </summary>
-        A缁х數鍣� = 2300,
-        /// <summary>
-        /// 璋冨厜鍣�(2500-2799)
-        /// </summary>
-        A璋冨厜鍣� = 2500,
-        /// <summary>
-        /// 鏅鸿兘闂ㄩ攣(2800-????)
-        /// </summary>
-        A鏅鸿兘闂ㄩ攣 = 2800,
-        /// <summary>
-        /// 绌鸿皟(3600-3899)
-        /// </summary>
-        A绌鸿皟 = 3600,
-        /// <summary>
-        /// 涓户鍣�(3900-3999)
-        /// </summary>
-        A涓户鍣� = 3900,
-        /// <summary>
-        /// 绌烘皵寮�鍏�(4100-4199)
-        /// </summary>
-        A绌烘皵寮�鍏� = 4100,
-        /// <summary>
-        /// 杞崲鍣�(4200-4699)
-        /// </summary>
-        A杞崲鍣� = 4200,
-        /// <summary>
-        /// 褰╃伅
-        /// </summary>
-        A褰╃伅 = 9,
-        /// <summary>
-        /// 娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        A娓╂箍搴︿紶鎰熷櫒 = 10,
-        /// <summary>
-        /// 娓╁害浼犳劅鍣�
-        /// </summary>
-        A娓╁害浼犳劅鍣� = 11,
-        /// <summary>
-        /// 婀垮害浼犳劅鍣�
-        /// </summary>
-        A婀垮害浼犳劅鍣� = 12
-    }
-
-    #endregion
-}
\ No newline at end of file
+        }
+
+        #endregion
+
+        #region 鈻� 鍒涘缓鏂拌澶囧璞$浉鍏砡________________
+
+        /// <summary>
+        /// 鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+        /// </summary>
+        /// <param name="deviceType">璁惧绫诲瀷</param>
+        /// <param name="jobject">涓婚Data</param>
+        /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+        /// <returns></returns>
+        private CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, Newtonsoft.Json.Linq.JObject jobject, ZbGateway zbGateway)
+        {
+            string gwId = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
+
+            //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+            CommonDevice device = this.NewDeviceObjectByDeviceId(deviceType);
+            if (device == null)
+            {
+                return null;
+            }
+
+            //璁剧疆璁惧灞炴�х被
+            device.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceInfoData>(jobject["Data"].ToString());
+            if (device.DeviceInfo == null)
+            {
+                return null;
+            }
+            this.SetMacName(device, string.Empty);
+            this.SetEpointName(device, string.Empty);
+
+            //璁剧疆璁惧涓婚敭绫�
+            this.SetNewDeviceMainKeys(device, jobject);
+            device.CurrentGateWayId = gwId;
+
+            //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
+            this.SetDeviceInfoToMain(device, device);
+
+            return device;
+        }
+
+        /// <summary>
+        /// 灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
+        /// </summary>
+        /// <param name="mainDevice">涓昏澶囧璞�</param>
+        /// <param name="device">璁剧疆婧愯澶囧璞�</param>
+        public void SetDeviceInfoToMain(CommonDevice mainDevice, CommonDevice device)
+        {
+            if (string.IsNullOrEmpty(device.DeviceInfo.MacName) == false)
+            {
+                mainDevice.DeviceName = device.DeviceInfo.MacName;
+            }
+            if (string.IsNullOrEmpty(device.DeviceInfo.DeviceName) == false)
+            {
+                mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
+            }
+            mainDevice.CurrentGateWayId = device.CurrentGateWayId;
+            mainDevice.IsOnline = device.DeviceInfo.IsOnline;
+            mainDevice.DriveCode = device.DeviceInfo.DriveCode;
+            mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
+            mainDevice.Profile = device.DeviceInfo.Profile;
+            mainDevice.Type = device.Type;
+
+            //鍥轰欢鐗堟湰
+            mainDevice.ImgVersion = device.DeviceInfo.ImgVersion;
+            //纭欢鐗堟湰
+            mainDevice.HwVersion = device.DeviceInfo.HwVersion;
+            //闀滃儚ID
+            mainDevice.ImgTypeId = device.DeviceInfo.ImgTypeId;
+            //鍘傚晢鍚嶇О
+            mainDevice.ManufacturerName = device.DeviceInfo.ManufacturerName;
+            //妯″潡ID
+            mainDevice.ModelIdentifier = device.DeviceInfo.ModelIdentifier;
+            //搴忓垪鍙�
+            mainDevice.SerialNumber = device.DeviceInfo.ProductCode;
+
+            mainDevice.InClusterList.Clear();
+            mainDevice.InClusterList.AddRange(device.DeviceInfo.InClusterList);
+            mainDevice.OutClusterList.Clear();
+            mainDevice.OutClusterList.AddRange(device.DeviceInfo.OutClusterList);
+            mainDevice.AttributeStatus.Clear();
+            mainDevice.AttributeStatus.AddRange(device.DeviceInfo.AttributeStatus);
+
+            //濡傛灉鏄俯搴︿紶鎰熷櫒
+            if (mainDevice.Type == DeviceType.TemperatureSensor)
+            {
+                //杈撳嚭鏃� 1026:娓╁害浼犳劅鍣� 1029:婀垮害浼犳劅鍣�
+                foreach (var data in mainDevice.OutClusterList)
+                {
+                    if (data.OutCluster == 1029)
+                    {
+                        ((TemperatureSensor)mainDevice).SensorDiv = 2;
+                    }
+                    else if (data.OutCluster == 1026)
+                    {
+                        ((TemperatureSensor)mainDevice).SensorDiv = 1;
+                    }
+                }
+            }
+            //濡傛灉鏄皟鍏夊櫒
+            else if (mainDevice.Type == DeviceType.DimmableLight)
+            {
+                mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+                if (mainDevice.IsCustomizeImage == false)
+                {
+                    mainDevice.IconPath = "Device/Light.png";
+                }
+            }
+            //濡傛灉鏄僵鐏殑璇�
+            else if (mainDevice.Type == DeviceType.ColorDimmableLight)
+            {
+                mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+                if (mainDevice.IsCustomizeImage == false)
+                {
+                    mainDevice.IconPath = "Device/ColorLight.png";
+                }
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁璁惧Type鍒涘缓瀵瑰簲鐨勮澶囧璞�
+        /// </summary>
+        /// <param name="deviceType">璁惧Type</param>
+        /// <returns></returns>
+        public CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType)
+        {
+            CommonDevice device = null;
+
+            //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+            if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); }
+            else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); }
+            else if (deviceType == DeviceType.OnOffSwitch) { device = new Panel(); }
+            else if (deviceType == DeviceType.OnOffOutput) { device = new ToggleLight(); }
+            else if (deviceType == DeviceType.AirSwitch) { device = new AirSwitch(); }
+            else if (deviceType == DeviceType.WindowCoveringDevice) { device = new Rollershade(); }
+            else if (deviceType == DeviceType.IASZone) { device = new IASZone(); }
+            else if (deviceType == DeviceType.Repeater) { device = new Repeater(); }
+            else if (deviceType == DeviceType.Thermostat) { device = new AC(); }
+            else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); }
+            else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }
+            else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
+            else { return null; }
+
+            device.DeviceEpointName = string.Empty;
+            device.DeviceName = string.Empty;
+
+            return device;
+        }
+
+        /// <summary>
+        /// 缁欐柊璁惧璁剧疆涓婚敭灞炴��
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <param name="jobject">涓婚Data</param>
+        public void SetNewDeviceMainKeys(CommonDevice device, Newtonsoft.Json.Linq.JObject jobject)
+        {
+            //璁剧疆璁惧涓婚敭绫�
+            device.Time = jobject.Value<int>("Time");
+            device.DeviceID = jobject.Value<int>("Device_ID");
+            device.DeviceAddr = jobject.Value<string>("DeviceAddr");
+            device.DeviceEpoint = jobject.Value<int>("Epoint");
+            device.DataID = jobject.Value<int>("Data_ID");
+        }
+
+        #endregion
+
+        //----------------------------------鍒嗗壊绾�(璁惧妯″潡ID)---------------------------------------------
+
+        #region 鈻� 鑷畾涔夎澶囨ā鍧桰D___________________
+
+        /// <summary>
+        /// 鍒濆鍖栬澶囩殑妯″潡ID鐨勬灇涓�
+        /// </summary>
+        private void InitDeviceModelIdEnum()
+        {
+            if (this.dicDeviceModelIdEnum != null)
+            {
+                return;
+            }
+            this.dicDeviceModelIdEnum = new Dictionary<string, string>();
+
+            //瀹氫箟瑙勫垯锛氭ā鍧桰D(宸茬炕璇�)=璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
+            //绗竴涓�兼槸:DeviceConcreteType  绗簩涓�兼槸:DeviceBeloneType
+
+            //*********************************************************************
+            //鏂拌澶囨坊鍔犳柟娉曪細
+            //1銆佸湪杩欓噷濉啓涓婃ā鍧桰D锛岀劧鍚庢槸 DeviceConcreteType 锛岀劧鍚庢槸 DeviceBeloneType
+            //2銆佺劧鍚庡湪鏈�涓嬮潰娣诲姞銆愯澶囩殑鍏蜂綋绫诲瀷銆戯紝銆愯澶囩殑鎵�灞炵被鍨嬨��
+            //3銆佸凡璁惧鐨勫叿浣撶被鍨嬩负鍚嶅瓧(鍘绘帀銆�-銆�)娣诲姞璁惧鐨勩�愭墍灞炲浘鐗囥�戯紝銆愮湡瀹炵墿鐞嗗浘鐗囥�戙�傚洖璺浘鐗囬渶瑕佺壒娈婂鐞�
+            //4銆佹坊鍔燫鏂囦欢,娣诲姞Language鏂囦欢
+            //*********************************************************************
+
+            //=========鈽呪槄寮�鍚堝笜绫�(100-199)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100";//鏅鸿兘寮�鍚堝笜鐢垫満
+            this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100";//鏅鸿兘绠$姸鐢垫満
+
+            //=========鈽呪槄鎸夐敭闈㈡澘绫�(200-1199)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MPT4/R4-ZB.18"] = "200-200";//4鎸夐敭瑙︽懜闈㈡澘(甯�4璺户鐢靛櫒搴曞骇)
+            this.dicDeviceModelIdEnum["MPT3/R3-ZB.18"] = "201-200";//3鎸夐敭瑙︽懜闈㈡澘
+            this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200";//2鎸夐敭瑙︽懜闈㈡澘
+            this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200";//12鎸夐敭瑙︽懜闈㈡澘
+            this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200";//4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
+            this.dicDeviceModelIdEnum["MPT4R4L/S-ZB.18"] = "220-200";//绠�绾�4鎸夐敭闈㈡澘
+            this.dicDeviceModelIdEnum["MPT3R3L/S-ZB.18"] = "221-200";//绠�绾�3鎸夐敭闈㈡澘
+            this.dicDeviceModelIdEnum["MPT2R2L/S-ZB.18"] = "222-200";//绠�绾�2鎸夐敭闈㈡澘
+
+            //=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir浼犳劅鍣�220
+
+            //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1300";//鐕冩皵浼犳劅鍣�
+            this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1300";//闂ㄧ獥纾佷紶鎰熷櫒
+            this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1300";//鐑熼浘浼犳劅鍣�
+            this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1300";//绾㈠浼犳劅鍣�
+            this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1300";//姘存蹈浼犳劅鍣�
+            this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1300";//绱ф�ユ寜閿�
+
+            //=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300";//3璺户鐢靛櫒灏忔ā鍧�
+
+            //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MPD0101-ZB.10"] = "2500-2500";//1璺皟鍏夊櫒灏忔ā鍧�
+
+            //=========鈽呪槄鏅鸿兘闂ㄩ攣绫�(2800-????)鈽呪槄=========
+            this.dicDeviceModelIdEnum["H06C"] = "2800-2800";//鏅鸿兘闂ㄩ攣(H06C)
+
+            //=========鈽呪槄绌鸿皟绫�(3600-3899)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MAC/GW-ZB.10"] = "3600-3600";//zigbee绌鸿皟缃戝叧妯″潡
+
+            //=========鈽呪槄涓户鍣ㄧ被(3900-3999)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MSR-ZB.10"] = "3900-3900"; //zigbee涓户鍣�
+
+            //=========鈽呪槄绌烘皵寮�鍏崇被(4100-4199)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MBCI01-ZB.10"] = "4100-4100";//zigbee寰柇浜戞帶鍒跺櫒
+
+            //=========鈽呪槄杞崲鍣ㄧ被(4200-4699)鈽呪槄=========
+            this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200";//zigbee杞琤uspro鍗忚杞崲鍣�
+            this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee杞�485鍗忚杞崲鍣�
+
+
+
+            //鉁┾湬鉁┾湬鉁╅渶瑕佷氦鎹㈢殑妯″潡ID鉁┾湬鉁┾湬鉁�
+            this.dicDeviceModelIdChanged = new Dictionary<string, string>();
+            //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫烩槄鈽�=========
+            this.dicDeviceModelIdChanged["MULTI-GASE--EA07"] = "MSG01/M-ZB.10";//鐕冩皵浼犳劅鍣�
+            this.dicDeviceModelIdChanged["MULTI-MECI--EA01"] = "MSDC01/M-ZB.10";//闂ㄧ獥纾佷紶鎰熷櫒
+            this.dicDeviceModelIdChanged["MULTI-FIRE--EA05"] = "MSS01/M-ZB.10";//鐑熼浘浼犳劅鍣�
+            this.dicDeviceModelIdChanged["MULTI-MOTI--EA04"] = "MSPIR01/M-ZB.10";//绾㈠浼犳劅鍣�
+            this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//姘存蹈浼犳劅鍣�
+            this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//绱ф�ユ寜閿�
+
+
+
+            //鉁┾湬鉁┾湬鉁╅渶瑕佸叡鏈夌殑鍥剧墖瀵硅薄鉁┾湬鉁┾湬鉁�
+            this.dicPictrueShard = new Dictionary<string, string>();
+            this.dicPictrueShard["ButtonPanel_SimpleFour"] = "ButtonPanel_Four";//绠�绾�4鎸夐敭闈㈡澘 娌跨敤 4鎸夐敭鐨勫浘鏍�
+            this.dicPictrueShard["ButtonPanel_SimpleThree"] = "ButtonPanel_Three";//绠�绾�3鎸夐敭闈㈡澘 娌跨敤 3鎸夐敭鐨勫浘鏍�
+            this.dicPictrueShard["ButtonPanel_SimpleTwo"] = "ButtonPanel_Two";//绠�绾�2鎸夐敭闈㈡澘 娌跨敤 2鎸夐敭鐨勫浘鏍�
+        }
+
+        #endregion
+    }
+
+    #region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
+
+    /// <summary>
+    /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囩殑鍏蜂綋銆愯澶囩被鍨嬨��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
+    /// <para>鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
+    /// </summary>
+    public enum DeviceConcreteType
+    {
+        //瀹氫箟瑙勫垯锛氥�愯澶囩被鍨嬨�戝浘鐗囧悕瀛�=LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��
+
+        /// <summary>
+        /// 鏈煡璁惧
+        /// </summary>
+        UnKownDevice = -1,
+
+        //=========鈽呪槄绐楀笜绫�(100-199)鈽呪槄=========
+        /// <summary>
+        /// 绐楀笜
+        /// </summary>
+        Curtain = -100,
+        /// <summary>
+        /// 鏅鸿兘寮�鍚堝笜鐢垫満 闀滃儚id锛�100
+        /// </summary>
+        Curtain_AutoOpen = 100,
+        /// <summary>
+        /// 鏅鸿兘绠$姸鐢垫満 闀滃儚id锛�101
+        /// </summary>
+        Curtain_Siphonate = 101,
+
+        //=========鈽呪槄鎸夐敭闈㈡澘绫�(200-1199)鈽呪槄=========
+        /// <summary>
+        /// 鎸夐敭闈㈡澘
+        /// </summary>
+        ButtonPanel = -200,
+        /// <summary>
+        /// 4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇) 闀滃儚id锛�200
+        /// </summary>
+        ButtonPanel_Four = 200,
+        /// <summary>
+        /// 3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇) 闀滃儚id锛�201
+        /// </summary>
+        ButtonPanel_Three = 201,
+        /// <summary>
+        /// 2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇) 闀滃儚id锛�202
+        /// </summary>
+        ButtonPanel_Two = 202,
+        /// <summary>
+        /// 12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇) 闀滃儚id锛�203
+        /// </summary>
+        ButtonPanel_Twelve = 203,
+        /// <summary>
+        /// 4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉匡紙鍙甫鐢垫簮搴曞骇锛� 闀滃儚id锛�210
+        /// </summary>
+        ButtonPanel_FourNotPower = 210,
+        /// <summary>
+        /// 绠�绾�4鎸夐敭闈㈡澘 闀滃儚id锛�220
+        /// </summary>
+        ButtonPanel_SimpleFour = 220,
+        /// <summary>
+        /// 绠�绾�3鎸夐敭闈㈡澘 闀滃儚id锛�221
+        /// </summary>
+        ButtonPanel_SimpleThree = 221,
+        /// <summary>
+        /// 绠�绾�2鎸夐敭闈㈡澘 闀滃儚id锛�222
+        /// </summary>
+        ButtonPanel_SimpleTwo = 222,
+
+        //=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
+        /// <summary>
+        /// 浼犳劅鍣�
+        /// </summary>
+        Sensor = -1200,
+        /// <summary>
+        /// pir浼犳劅鍣�220 闀滃儚id锛�1200
+        /// </summary>
+        Sensor_Pir = 1200,
+
+        //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
+        /// <summary>
+        /// 鐕冩皵浼犳劅鍣�
+        /// </summary>
+        Sensor_CarbonMonoxide = 1300,
+        /// <summary>
+        /// 闂ㄧ獥浼犳劅鍣�
+        /// </summary>
+        Sensor_DoorWindow = 1301,
+        /// <summary>
+        /// 鐑熼浘浼犳劅鍣�
+        /// </summary>
+        Sensor_Fire = 1302,
+        /// <summary>
+        /// 绾㈠浼犳劅鍣�
+        /// </summary>
+        Sensor_Infrared = 1303,
+        /// <summary>
+        /// 姘翠镜浼犳劅鍣�
+        /// </summary>
+        Sensor_Water = 1304,
+        /// <summary>
+        /// 绱ф�ユ寜閽�
+        /// </summary>
+        Sensor_EmergencyButton = 1305,
+        /// <summary>
+        /// 杩愬姩浼犳劅鍣�
+        /// </summary>
+        Sensor_Motion = -1306,
+        /// <summary>
+        /// 閽ュ寵鎵�
+        /// </summary>
+        Sensor_Keyfob = -1307,
+        /// <summary>
+        /// 娓╂箍搴︿紶鎰熷櫒
+        /// </summary>
+        Sensor_TemperatureHumidity = -1308,
+        /// <summary>
+        /// 娓╁害浼犳劅鍣�
+        /// </summary>
+        Sensor_Temperature = -1309,
+        /// <summary>
+        /// 婀垮害浼犳劅鍣�
+        /// </summary>
+        Sensor_Humidity = -1310,
+
+        //=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
+        /// <summary>
+        /// 缁х數鍣�
+        /// </summary>
+        Relay = -2300,
+        /// <summary>
+        /// 涓夎矾缁х數鍣� 闀滃儚id锛�2300
+        /// </summary>
+        Relay_ThreeLoad = 2300,
+
+        //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
+        /// <summary>
+        /// 璋冨厜鍣�
+        /// </summary>
+        DimmableLight = -2500,
+        /// <summary>
+        /// 1璺皟鍏夊櫒灏忔ā鍧�
+        /// </summary>
+        DimmableLight_OneLoad = 2500,
+
+        //=========鈽呪槄鏅鸿兘闂ㄩ攣绫�(2800-????)鈽呪槄=========
+        /// <summary>
+        /// 鏅鸿兘闂ㄩ攣
+        /// </summary>
+        IntelligentLocks = -2800,
+        /// <summary>
+        /// H06C
+        /// </summary>
+        IntelligentLocks_H06C = 2800,
+
+        //=========鈽呪槄褰╃伅绫�(????-????)鈽呪槄=========
+        /// <summary>
+        /// 褰╃伅
+        /// </summary>
+        ColorLight = -10,
+
+        //=========鈽呪槄绌鸿皟(3600-3899)鈽呪槄=========
+        /// <summary>
+        /// 绌鸿皟
+        /// </summary>
+        AirConditioner = -3600,
+        /// <summary>
+        /// zigbee绌鸿皟缃戝叧妯″潡
+        /// </summary>
+        AirConditioner_ZbGateway = 3600,
+
+        //=========鈽呪槄涓户鍣�(3900-3999)鈽呪槄=========
+        /// <summary>
+        /// 涓户鍣�
+        /// </summary>
+        Repeater = -3900,
+        /// <summary>
+        /// zigbee涓户鍣� 闀滃儚id锛�3900
+        /// </summary>
+        Repeater_Zigbee = 3900,
+
+        //=========鈽呪槄绌烘皵寮�鍏崇被(4100-????)鈽呪槄=========
+        /// <summary>
+        /// 鏅鸿兘绌哄紑
+        /// </summary>
+        AirSwitch = -4100,
+        /// <summary>
+        /// 鏅鸿兘绌哄紑 闀滃儚id锛�4100
+        /// </summary>
+        AirSwitch_CloudContr = 4100,
+
+        //=========鈽呪槄杞崲鍣ㄧ被(4200-4699)鈽呪槄=========
+        /// <summary>
+        /// 杞崲鍣�
+        /// </summary>
+        Converter = -4200,
+        /// <summary>
+        /// zigbee杞�485鍗忚杞崲鍣�
+        /// </summary>
+        Converter_Zb485 = 4200,
+        /// <summary>
+        /// zigbee杞琤uspro鍗忚杞崲鍣�
+        /// </summary>
+        Converter_ZbBuspro = 4201,
+
+        //=========鈽呪槄鍏朵粬绫�(????-????)鈽呪槄=========
+        /// <summary>
+        /// 骞叉帴鐐�(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+        /// </summary>
+        DryContact = -10000,
+        /// <summary>
+        /// 鐏厜(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+        /// </summary>
+        Light = -10001,
+        /// <summary>
+        /// 鎻掑骇(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+        /// </summary>
+        Socket1 = -10002,
+        /// <summary>
+        /// 寮�鍏�(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+        /// </summary>
+        Switch = -10003,
+    }
+
+    /// <summary>
+    /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囨墍灞炵殑銆愯澶囩绫汇��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
+    /// <para>杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
+    /// </summary>
+    public enum DeviceBeloneType
+    {
+        /// <summary>
+        /// 鏈煡璁惧
+        /// </summary>
+        A鏈煡璁惧 = 0,
+        /// <summary>
+        /// 绐楀笜(100-199)
+        /// </summary>
+        A绐楀笜 = 100,
+        /// <summary>
+        /// 鎸夐敭闈㈡澘(200-1199)
+        /// </summary>
+        A鎸夐敭闈㈡澘 = 200,
+        /// <summary>
+        /// 浼犳劅鍣�(1200-2299)
+        /// </summary>
+        A浼犳劅鍣� = 1200,
+        /// <summary>
+        /// 缁х數鍣�(2300-2499)
+        /// </summary>
+        A缁х數鍣� = 2300,
+        /// <summary>
+        /// 璋冨厜鍣�(2500-2799)
+        /// </summary>
+        A璋冨厜鍣� = 2500,
+        /// <summary>
+        /// 鏅鸿兘闂ㄩ攣(2800-????)
+        /// </summary>
+        A鏅鸿兘闂ㄩ攣 = 2800,
+        /// <summary>
+        /// 绌鸿皟(3600-3899)
+        /// </summary>
+        A绌鸿皟 = 3600,
+        /// <summary>
+        /// 涓户鍣�(3900-3999)
+        /// </summary>
+        A涓户鍣� = 3900,
+        /// <summary>
+        /// 鏅鸿兘绌哄紑(4100-4199)
+        /// </summary>
+        A鏅鸿兘绌哄紑 = 4100,
+        /// <summary>
+        /// 杞崲鍣�(4200-4699)
+        /// </summary>
+        A杞崲鍣� = 4200,
+        /// <summary>
+        /// 褰╃伅
+        /// </summary>
+        A褰╃伅 = 9,
+        /// <summary>
+        /// 娓╂箍搴︿紶鎰熷櫒
+        /// </summary>
+        A娓╂箍搴︿紶鎰熷櫒 = 10,
+        /// <summary>
+        /// 娓╁害浼犳劅鍣�
+        /// </summary>
+        A娓╁害浼犳劅鍣� = 11,
+        /// <summary>
+        /// 婀垮害浼犳劅鍣�
+        /// </summary>
+        A婀垮害浼犳劅鍣� = 12,
+        /// <summary>
+        /// 寮�鍏�
+        /// </summary>
+        A寮�鍏� = 13,
+        /// <summary>
+        /// 鎻掑骇
+        /// </summary>
+        A鎻掑骇 = 14,
+        /// <summary>
+        /// 鐏厜
+        /// </summary>
+        A鐏厜 = 15,
+        /// <summary>
+        /// 骞叉帴鐐�
+        /// </summary>
+        A骞叉帴鐐� = 16
+    }
+
+    #endregion
+}

--
Gitblit v1.8.0