wei
2021-08-21 ec1d7cb35b99f01be0151c5b6f0c0fc2fa30ab95
HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -237,6 +237,14 @@
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
                    };
                    //安防状态变化
                    var securityStatusChange = new MqttTopicFilter()
                    {
                        Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/custom/security/status/up",
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
                    };
                    #endregion
@@ -244,7 +252,8 @@
                    var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
                        pirStatus,pirStudy,
                        appDeviceRefresh,appHomeRefresh,appRoomRefresh,residenceChange,
                        topicFilterPush2, topicAlinkStatus ,mqttkeyChange});
                        topicFilterPush2, topicAlinkStatus ,mqttkeyChange,
                        securityStatusChange});
                    if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
                    {
                        isSubscribeSuccess = true;
@@ -434,7 +443,32 @@
                                    pm.GetHomeGatewayList();
                                    MainPage.Log($"网关密钥变更.新密钥:{DB_ResidenceData.Instance.HomeGateway.aesKey}");
                                }
                                //安防状态变化
                                else if (topic == $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/custom/security/status/up")
                                {
                                    MainPage.Log($"安防状态变化");
                                    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);
                                        if (temp != null)
                                        {
                                            Control_Udp.ReceiveRepeatManager(temp.id, null);
                                            foreach (var updataSecurity in temp.objects)
                                            {
                                                var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
                                                if (updataLocalSecurity != null)
                                                {
                                                    updataLocalSecurity.status = updataSecurity.status;
                                                }
                                            }
                                            HomePage.LoadEvent_RefreshSecurityStatus();
                                            ArmCenterPage.LoadEvent_RefreshSecurityStatus();
                                        }
                                    }
                                }
                                #endregion
                                //A网关设备状态-包含涂鸦设备
                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")