From dd3fecc3a8b92b377febfcf92d32ec22a07724f6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 26 九月 2021 15:21:57 +0800
Subject: [PATCH] 主从网关属性,防挤下线账号删除

---
 HDL_ON/DAL/Mqtt/MqttClient.cs |   51 ++++++++++++++++++++++-----------------------------
 1 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 559725c..94a7cae 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -408,7 +408,7 @@
                                             for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
                                             {
                                                 var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
-                                                if (localFunction.Spk_Prefix == FunctionCategory.Music || string.IsNullOrEmpty(localFunction.Spk_Prefix))
+                                                if (SPK.MusicSpkList().Contains(localFunction.spk))
                                                 {
                                                     i++;
                                                     continue;
@@ -448,25 +448,31 @@
                                 {
                                     if (!string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.aesKey))
                                     {
-                                        var securityBytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);
-                                        var securityString = Encoding.UTF8.GetString(securityBytes);
-                                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(securityString);
-                                        MainPage.Log($"瀹夐槻鐘舵�佸彉鍖栵細{securityString}");
-
-                                        if (temp != null)
+                                        try
                                         {
-                                            Control_Udp.ReceiveRepeatManager(temp.id, null);
-                                            foreach (var updataSecurity in temp.objects)
+                                            var securityBytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);
+                                            var securityString = Encoding.UTF8.GetString(securityBytes);
+                                            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(securityString);
+                                            MainPage.Log($"瀹夐槻鐘舵�佸彉鍖栵細{securityString}");
+
+                                            if (temp != null)
                                             {
-                                                var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
-                                                if (updataLocalSecurity != null)
+                                                Control_Udp.ReceiveRepeatManager(temp.id, null);
+                                                foreach (var updataSecurity in temp.objects)
                                                 {
-                                                    updataLocalSecurity.status = updataSecurity.status;
-                                                    updataLocalSecurity.alarm = updataSecurity.alarm;
+                                                    var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
+                                                    if (updataLocalSecurity != null)
+                                                    {
+                                                        updataLocalSecurity.status = updataSecurity.status;
+                                                        updataLocalSecurity.alarm = updataSecurity.alarm;
+                                                        ArmCenterPage.LoadEvent_RefreshSecurityStatus(updataLocalSecurity);
+                                                    }
                                                 }
+                                                HomePage.LoadEvent_RefreshSecurityStatus();
                                             }
-                                            HomePage.LoadEvent_RefreshSecurityStatus();
-                                            ArmCenterPage.LoadEvent_RefreshSecurityStatus();
+                                        }catch(Exception ex)
+                                        {
+                                            MainPage.Log($"瀹夐槻杩滅▼淇℃伅寮傚父:{ex.Message}");
                                         }
                                     }
                                 }
@@ -749,21 +755,8 @@
             //娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
             switch (UserInfo.Current.userMobileInfo)
             {
-                case "13415629083":
-                case "18316120654":
-                case "15622703419":
-                case "18824864143":
-                case "464027401@qq.com":
-                case "2791308028@qq.com":
-                case "13697499568":
-                case "18666455392":
-                case "13375012446":
-                case "13602944661":
-                case "18778381374":
-                case "18316672920":
-                case "15971583093":
                 case "15626203746":
-                case "551775569@qq.com":
+                case "464027401@qq.com":
                     return;
             }
 

--
Gitblit v1.8.0