From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs |  357 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 275 insertions(+), 82 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 9b7d7bf..48f59b9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -93,6 +93,32 @@
                 });
                 return;
             }
+            else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Home.Id + "_" + Common.Config.Instance.Guid + "/PrimaryUserDelYou")
+            {
+                HdlThreadLogic.Current.RunMain(() =>
+                {
+                    //鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
+                    string msg = Language.StringByID(R.MyInternationalizationString.uShardResidenceHadDeletePleaseTakeToAdmin);
+                    var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+                    contr.Show();
+
+                    UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
+                });
+                return;
+            }
+            else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/Update")
+            {
+                HdlThreadLogic.Current.RunMain(() =>
+                {
+                    //鎮ㄧ殑鏉冮檺宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
+                    string msg = Language.StringByID(R.MyInternationalizationString.uYouAccessHadChangedPleaseTakeToAdmin);
+                    var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+                    contr.Show();
+
+                    UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
+                });
+                return;
+            }
             else if (UserCenterResourse.UserInfo.AuthorityNo == 3)
             {
                 if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/Deleted"
@@ -102,19 +128,6 @@
                     {
                         //鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄�
                         string msg = Language.StringByID(R.MyInternationalizationString.uShardDataIsChangedPleaseLoginAgain);
-                        var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
-                        contr.Show();
-
-                        UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
-                    });
-                    return;
-                }
-                else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Home.Id + "_" + Common.Config.Instance.Guid + "/PrimaryUserDelYou")
-                {
-                    HdlThreadLogic.Current.RunMain(() =>
-                    {
-                        //鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
-                        string msg = Language.StringByID(R.MyInternationalizationString.uShardResidenceHadDeletePleaseTakeToAdmin);
                         var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
                         contr.Show();
 
@@ -160,7 +173,7 @@
                 //璁惧鎺у埗鐘舵�佸弽棣�
                 else if (reportTopic == "DeviceDefaultAck")
                 {
-                    this.DeviceControlResponePush(JObject.Parse(msgData));
+                    //this.DeviceControlResponePush(JObject.Parse(msgData));
                 }
                 //鎾ら槻
                 else if (topic == gatewayId + "/Security/WithdrawMode_Respon")
@@ -175,7 +188,7 @@
                 //閫昏緫瑙﹀彂涓婃姤
                 else if (topic == gatewayId + "/Logic/Execute_Respon")
                 {
-                    this.LogicExecutePush(null);
+                    this.LogicExecutePush(JObject.Parse(msgData));
                 }
                 //鍦烘櫙瑙﹀彂涓婃姤
                 else if (topic == gatewayId + "/Scene/Exec_Respon")
@@ -261,7 +274,7 @@
                 }
                 #endregion
 
-                #region 鈻� 绌鸿皟鏁版嵁
+                #region 鈻� 绌鸿皟鍜屾柊椋庢暟鎹�
                 //绌鸿皟鏁版嵁
                 else if (report.DeviceStatusReport.CluterID == 513)
                 {
@@ -330,29 +343,59 @@
                     locadevice.DeviceStatusReport = report.DeviceStatusReport;
                     foreach (var attData in report.DeviceStatusReport.AttriBute)
                     {
-                        if (attData.AttributeId == 0)
+                        //鍖哄垎鏄┖璋冭繕鏄柊椋�
+                        var device = Shared.Common.LocalDevice.Current.GetDevice(report.DeviceAddr, report.DeviceEpoint);
+
+                        if (device.Type == DeviceType.FreshAir)
                         {
-                            //椋庢墖妯″紡
-                            ((AC)locadevice).currentFanMode = attData.AttriButeData;
-                            //宸茬粡鎺ユ敹鍒扮姸鎬�
-                            locadevice.HadReadDeviceStatu = true;
+                            if (attData.AttributeId == 0)
+                            {
+                                switch (attData.AttriButeData)
+                                {
+                                    case 0:
+                                    case 4:
+                                        ((FreshAir)locadevice).currentFanStatus = attData.AttriButeData;
+                                        break;
+                                    case 1:
+                                    case 2:
+                                    case 3:
+                                        ((FreshAir)locadevice).currentFanSpeed = attData.AttriButeData;
+                                        break;
+                                    case 5:
+                                    case 15:
+                                        ((FreshAir)locadevice).currentFanMode = attData.AttriButeData;
+                                        break;
+                                }
+                                //宸茬粡鎺ユ敹鍒扮姸鎬�
+                                locadevice.HadReadDeviceStatu = true;
+                            }
                         }
-                        else if (attData.AttributeId == 4096)
+                        else
                         {
-                            //椋庢墖鎵
-                            ((AC)locadevice).currentFanSwingMode = attData.AttriButeData;
-                            //宸茬粡鎺ユ敹鍒扮姸鎬�
-                            locadevice.HadReadDeviceStatu = true;
-                        }
-                        else if (attData.AttributeId == 4097)
-                        {
-                            //杞崲涓轰簩杩涘埗
-                            var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
-                            //杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
-                            value = value.Substring(value.Length - 1, 1);
-                            //鍚敤鎽嗛鍔熻兘
-                            ((AC)locadevice).UseSwingFunction = value == "1";
-                            locadevice.ReSave();
+                            if (attData.AttributeId == 0)
+                            {
+                                //椋庢墖妯″紡
+                                ((AC)locadevice).currentFanMode = attData.AttriButeData;
+                                //宸茬粡鎺ユ敹鍒扮姸鎬�
+                                locadevice.HadReadDeviceStatu = true;
+                            }
+                            else if (attData.AttributeId == 4096)
+                            {
+                                //椋庢墖鎵
+                                ((AC)locadevice).currentFanSwingMode = attData.AttriButeData;
+                                //宸茬粡鎺ユ敹鍒扮姸鎬�
+                                locadevice.HadReadDeviceStatu = true;
+                            }
+                            else if (attData.AttributeId == 4097)
+                            {
+                                //杞崲涓轰簩杩涘埗
+                                var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
+                                //杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
+                                value = value.Substring(value.Length - 1, 1);
+                                //鍚敤鎽嗛鍔熻兘
+                                ((AC)locadevice).UseSwingFunction = value == "1";
+                                locadevice.ReSave();
+                            }
                         }
                     }
                 }
@@ -363,10 +406,36 @@
                 else if (report.DeviceStatusReport.CluterID == 8)
                 {
                     locadevice.DeviceStatusReport = report.DeviceStatusReport;
-                    if (locadevice.Type == DeviceType.DimmableLight && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
+                    if (report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
                     {
-                        //姝ゅ睘鎬ц〃鏄庡綋鍓嶄寒搴︾▼搴�
-                        ((DimmableLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+                        if (locadevice.Type == DeviceType.DimmableLight)
+                        {
+                            //姝ゅ睘鎬ц〃鏄庡綋鍓嶄寒搴︾▼搴�
+                            ((DimmableLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+                        }
+                        else if (locadevice.Type == DeviceType.ColorTemperatureLight)
+                        {
+                            //姝ゅ睘鎬ц〃鏄庡綋鍓嶄寒搴︾▼搴�
+                            ((ColorTemperatureLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+                        }
+                        //宸茬粡鎺ユ敹鍒扮姸鎬�
+                        locadevice.HadReadDeviceStatu = true;
+                    }
+                }
+                #endregion
+
+                #region 鈻� 鑹叉俯鏁版嵁
+                //鑹叉俯鏁版嵁
+                else if (report.DeviceStatusReport.CluterID == 768)
+                {
+                    locadevice.DeviceStatusReport = report.DeviceStatusReport;
+                    if (report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
+                    {
+                        if (locadevice.Type == DeviceType.ColorTemperatureLight)
+                        {
+                            //姝ゅ睘鎬ц〃鏄庡綋鍓嶈壊娓�
+                            ((ColorTemperatureLight)locadevice).ColorTemperature = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+                        }
                         //宸茬粡鎺ユ敹鍒扮姸鎬�
                         locadevice.HadReadDeviceStatu = true;
                     }
@@ -382,24 +451,51 @@
                         //娓╁害
                         if (attData.AttributeId == (int)AttriButeId.MeasuredValue)
                         {
-                            if (attData.AttriButeData == 0)
+                            decimal temperatrue = 0;
+                            string receiptData = string.Empty;
+                            //涓や釜涓や釜浣嶇疆鏇挎崲
+                            for (int i = attData.AttriButeDataHex.Length - 1; i >= 0; i = i - 2)
                             {
-                                ((TemperatureSensor)locadevice).Temperatrue = 0;
+                                receiptData += attData.AttriButeDataHex[i - 1].ToString() + attData.AttriButeDataHex[i].ToString();
                             }
-                            else if (attData.AttriButeData > 32767)
-                            {
-                                //璐熸暟(鐗规畩澶勭悊)
-                                string strValue = (attData.AttriButeData - 65536).ToString();
-                                //灏忔暟鐐归渶瑕佷竴浣�
-                                strValue = strValue.Substring(0, strValue.Length - 1);
-                                ((TemperatureSensor)locadevice).Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
-                            }
-                            else
+                            //鏈夌鍙�(浼氬嚭鐜拌礋鏁�)
+                            if (attData.AttriButeDataType == 40 || attData.AttriButeDataType == 41)
                             {
                                 //灏忔暟鐐归渶瑕佷竴浣�
-                                string strValue = attData.AttriButeData.ToString();
+                                string strValue = Convert.ToInt16(receiptData, 16).ToString();
                                 strValue = strValue.Substring(0, strValue.Length - 1);
-                                ((TemperatureSensor)locadevice).Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                                temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                            }
+                            //鏃犵鍙�(涓嶄細鍑虹幇璐熸暟)
+                            else if (attData.AttriButeDataType == 32 || attData.AttriButeDataType == 33)
+                            {
+                                ushort shortData = Convert.ToUInt16(receiptData, 16);
+                                if (shortData > 32767)
+                                {
+                                    //璐熸暟(鐗规畩澶勭悊)
+                                    string strValue = (shortData - 65536).ToString();
+                                    //灏忔暟鐐归渶瑕佷竴浣�
+                                    strValue = strValue.Substring(0, strValue.Length - 1);
+                                    temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                                }
+                                else
+                                {
+                                    //灏忔暟鐐归渶瑕佷竴浣�
+                                    string strValue = shortData.ToString();
+                                    strValue = strValue.Substring(0, strValue.Length - 1);
+                                    temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                                }
+                            }
+
+                            //娓╁害浼犳劅鍣�
+                            if (locadevice is TemperatureSensor)
+                            {
+                                ((TemperatureSensor)locadevice).Temperatrue = temperatrue;
+                            }
+                            //PM2.5浼犳劅鍣�
+                            else if (locadevice is PMSensor)
+                            {
+                                ((PMSensor)locadevice).currentTemperature = (int)temperatrue;
                             }
                             //宸茬粡鎺ユ敹鍒扮姸鎬�
                             locadevice.HadReadDeviceStatu = true;
@@ -417,22 +513,71 @@
                         //婀垮害
                         if (attData.AttributeId == (int)AttriButeId.MeasuredValue)
                         {
-                            if (attData.AttriButeData == 0)
+                            decimal humidity = 0;
+                            string receiptData = string.Empty;
+                            //涓や釜涓や釜浣嶇疆鏇挎崲
+                            for (int i = attData.AttriButeDataHex.Length - 1; i >= 0; i = i - 2)
                             {
-                                ((TemperatureSensor)locadevice).Humidity = 0;
+                                receiptData += attData.AttriButeDataHex[i - 1].ToString() + attData.AttriButeDataHex[i].ToString();
                             }
-                            else
+                            //鏈夌鍙�(浼氬嚭鐜拌礋鏁�)
+                            if (attData.AttriButeDataType == 40 || attData.AttriButeDataType == 41)
                             {
-                                //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
-                                string strValue = attData.AttriButeData.ToString();
+                                //灏忔暟鐐归渶瑕佷竴浣�
+                                string strValue = Convert.ToInt16(receiptData, 16).ToString();
                                 strValue = strValue.Substring(0, strValue.Length - 1);
-                                ((TemperatureSensor)locadevice).Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                                humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                            }
+                            //鏃犵鍙�(涓嶄細鍑虹幇璐熸暟)
+                            else if (attData.AttriButeDataType == 32 || attData.AttriButeDataType == 33)
+                            {
+                                //灏忔暟鐐归渶瑕佷竴浣� 婀垮害涓嶄細鍑虹幇璐熸暟
+                                string strValue = Convert.ToUInt16(receiptData, 16).ToString();
+                                strValue = strValue.Substring(0, strValue.Length - 1);
+                                humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+                            }
+                            //婀垮害浼犳劅鍣�
+                            if (locadevice is TemperatureSensor)
+                            {
+                                ((TemperatureSensor)locadevice).Humidity = humidity;
+                            }
+                            //鏂伴鐨勬箍搴︿紶鎰熷櫒
+                            else if (locadevice is HumiditySensor)
+                            {
+                                ((HumiditySensor)locadevice).Humidity = humidity;
+                            }
+                            //PM2.5浼犳劅鍣�
+                            else if (locadevice is PMSensor)
+                            {
+                                ((PMSensor)locadevice).currentHumidity = (int)humidity;
                             }
                         }
                         //宸茬粡鎺ユ敹鍒扮姸鎬�
                         locadevice.HadReadDeviceStatu = true;
                     }
                 }
+                #endregion
+
+                #region 鈻� PM2.5鏁版嵁
+                //PM2.5鏁版嵁
+                else if (report.DeviceStatusReport.CluterID == 1066)
+                {
+                    foreach (var attData in report.DeviceStatusReport.AttriBute)
+                    {
+                        //PM2.5
+                        if (attData.AttributeId == (int)AttriButeId.MeasuredValue)
+                        {
+
+                            if (attData.AttriButeDataType == 57)
+                            {
+                                ((PMSensor)locadevice).currentPmData = attData.AttriButeData;
+                            }
+                        }
+                        //宸茬粡鎺ユ敹鍒扮姸鎬�
+                        locadevice.HadReadDeviceStatu = true;
+                    }
+                }
+
                 #endregion
             }
 
@@ -464,6 +609,8 @@
             if (locadevice != null)
             {
                 ((IASZone)locadevice).iASInfo = ias.iASInfo;
+                //濡傛灉鎺ユ敹鍒颁笂鎶�,鍗宠鏄庤繖涓紶鎰熷櫒鏄湪绾跨殑
+                locadevice.IsOnline = 1;
                 //璁板綍鍥炲鏃堕棿
                 locadevice.LastDateTime = DateTime.Now;
             }
@@ -484,29 +631,35 @@
         /// <param name="receiveData"></param>
         private void DoorLockDeviceReportPush(JObject receiveData)
         {
-            //鍙湁寰愭鐨勯棬閿佺晫闈㈡病鏈夋墦寮�鐨勬儏鍐典笅,鎵嶄細澶勭悊杩欎釜涓滆タ
-            if (ControlCommonResourse.IsDoorLockPageOpen == false)
+            if (UserCenterResourse.UserInfo.AuthorityNo == 1)
             {
                 var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
-                if ((device is ZigBee.Device.DoorLock) == false)
+                if (device.Type != DeviceType.DoorLock)
                 {
                     //瀹冧笉鏄棬閿�
                     return;
                 }
+
                 var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());
                 if (info.Clusterid == 257)
                 {
-                    //甯稿紑妯″紡寮�鍚�
+                    //216锛氶攣涓婅缃殑甯稿紑
                     if (info.AlarmCode == 216)
                     {
-                        DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            //鏇存柊闂ㄩ攣娑夊強鐨勫父寮�/甯稿叧鐨勭晫闈�
+                            if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
+                            {
+                                UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr, true);
+                            }
+                        });
                     }
                 }
+                //鏄剧ず鏈夋柊娑堟伅鐨勭壒鏁�
+                this.ShowHadNewMessageAppeal();
             }
-            //鏄剧ず鏈夋柊娑堟伅鐨勭壒鏁�
-            this.ShowHadNewMessageAppeal();
         }
-
         #endregion
 
         #region 鈻� 璁惧鍦ㄧ嚎鐘舵�佹洿鏂板弽棣坃______________
@@ -515,7 +668,7 @@
         /// 璁惧鍦ㄧ嚎鐘舵�佹洿鏂板弽棣�
         /// </summary>
         /// <param name="receiveData"></param>
-        private void DeviceOnlineChangePush (JObject receiveData)
+        private void DeviceOnlineChangePush(JObject receiveData)
         {
             if (this.dicDeviceEvent.Count == 0)
             {
@@ -526,13 +679,18 @@
             tempDevice.IsOnline = Convert.ToInt32(receiveData["Data"]["IsOnline"].ToString());
 
             //澶勭悊缃戝叧涓婃姤鐨勬暟鎹�,鐒跺悗鍙樻洿鏈湴缂撳瓨
-            var locadevice = Common.LocalDevice.Current.GetDevice(tempDevice.DeviceAddr, tempDevice.DeviceEpoint);
-            if (locadevice != null)
+            var locadevice = Common.LocalDevice.Current.GetDevicesByMac(tempDevice.DeviceAddr);
+            for (int i = 0; i < locadevice.Count; i++)
             {
-                locadevice.IsOnline = tempDevice.IsOnline;
+                bool onlineChanged = locadevice[i].IsOnline != tempDevice.IsOnline;
+                locadevice[i].IsOnline = tempDevice.IsOnline;
                 //璁板綍鍥炲鏃堕棿
-                locadevice.LastDateTime = DateTime.Now;
-                locadevice.ReSave();
+                locadevice[i].LastDateTime = DateTime.Now;
+                if (onlineChanged == true)
+                {
+                    //鍦ㄧ嚎鐘舵�佸彉鏇翠簡,鎵嶄繚瀛�
+                    locadevice[i].ReSave();
+                }
             }
 
             this.DeviceReportPush(tempDevice, ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤);
@@ -692,12 +850,43 @@
         /// <param name="receiveData"></param>
         private void LogicExecutePush(JObject receiveData)
         {
-            //鐩墠涓嶅鐞嗛�昏緫涓婃姤鍐呭
-
             //鏄剧ず鏈夋柊娑堟伅鐨勭壒鏁�
             this.ShowHadNewMessageAppeal();
-        }
 
+            // 閫昏緫鎵ц甯稿紑妯″紡澶辨晥鐨勬儏鍐�
+            if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+            {
+                //鑷姩鍖栨墽琛� 甯稿紑鍏抽棴
+                var data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
+                if (data != null && data.ActionData != null)
+                {
+                    if (data.ActionData.Actiontype == 8 && data.ActionData.PassDataString == "055704010113")
+                    {
+                        var deviceAddr = data.ActionData.MacStr;
+                        var device = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr, false);
+                        if (device.Count > 0 && device[0].Type != DeviceType.DoorLock)
+                        {
+                            return;
+                        }
+
+                        HdlThreadLogic.Current.RunThread(async () =>
+                        {
+                            HdlThreadLogic.Current.RunMain(() =>
+                            {
+                                //鎻愮ず闂ㄩ攣宸茬粡澶辨晥
+                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NormallyClosed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+
+                                //鏇存柊闂ㄩ攣娑夊強鐨勫父寮�/甯稿叧鐨勭晫闈�
+                                if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
+                                {
+                                    UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(deviceAddr, false);
+                                }
+                            });
+                        });
+                    }
+                }
+            }
+        }
         #endregion
 
         #region 鈻� 鍦烘櫙瑙﹀彂涓婃姤_______________________
@@ -802,19 +991,23 @@
                 //娌℃湁娣诲姞鐩戝惉
                 return;
             }
-            lock (this.dicDeviceEvent)
+            //lock (this.dicDeviceEvent)
             {
                 var list = new List<Action<CommonDevice>>();
-                foreach (string keys in this.dicDeviceEvent.Keys)
+                try
                 {
-                    if (this.dicCommandDiv[keys] != comand)
+                    foreach (string keys in this.dicDeviceEvent.Keys)
                     {
-                        //鍛戒护鍖哄垎涓嶄竴鑷达紝鍒欎笉璋冪敤鍥炶皟鍑芥暟
-                        continue;
+                        if (this.dicCommandDiv[keys] != comand)
+                        {
+                            //鍛戒护鍖哄垎涓嶄竴鑷达紝鍒欎笉璋冪敤鍥炶皟鍑芥暟
+                            continue;
+                        }
+                        //鍛戒护鍖哄垎涓�鑷存椂锛屽垯璋冪敤鍥炶皟鍑芥暟
+                        list.Add(this.dicDeviceEvent[keys]);
                     }
-                    //鍛戒护鍖哄垎涓�鑷存椂锛屽垯璋冪敤鍥炶皟鍑芥暟
-                    list.Add(this.dicDeviceEvent[keys]);
                 }
+                catch { return; }
                 //鏈夊彲鑳藉湪鍥炶皟鍑芥暟涓Щ闄や簡浜嬩欢锛屽鑷存姤閿欙紝鎵�浠ュ厛鏀堕泦锛屽啀璋冪敤
                 foreach (var action in list)
                 {

--
Gitblit v1.8.0