20210630

wei

2021-07-01 2835fe50d3e194c21b16fec1c53ff905dd3a3ceb

 HDL_ON/DAL/Mqtt/MqttClient.cs

@@ -206,10 +206,16 @@
                    };

                    #region 数据更新推送主题
                    //appHomeRefresh：住宅数据刷新通知
                    //appHomeRefresh：住宅数据刷新通知--杨涛
                    var appHomeRefresh = new MqttTopicFilter()
                    {
                        Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up",
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
                    };
                    //住宅消息变更推送--豆豆
                    var residenceChange = new MqttTopicFilter()
                    {
                        Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
                    };
                    //appRoomRefresh：房间数据刷新通知
@@ -221,13 +227,13 @@
                    //appDeviceRefresh：设备数据刷新通知
                    var appDeviceRefresh = new MqttTopicFilter()
                    {
                        Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up",
                        Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/app/thing/event/appHomeRefresh/up",
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
                    };
                    //网关密钥更新通知
                    //一端口密钥更新通知
                    var mqttkeyChange = new MqttTopicFilter()
                    {
                        Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/custom/mqtt/secret/change",
                        Topic = $"/user/{MqttInfoConfig.Current.HomeGatewayInfo.gatewayId}/custom/mqtt/secret/change",
                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
                    };

@@ -237,7 +243,7 @@
                    Utlis.WriteLine("开始订阅！");
                    var result = await RemoteMqttClient.SubscribeAsync(new MqttTopicFilter[] {
                        pirStatus,pirStudy,
                        appDeviceRefresh,appHomeRefresh,appRoomRefresh,
                        appDeviceRefresh,appHomeRefresh,appRoomRefresh,residenceChange,
                        topicFilterPush2, topicAlinkStatus ,mqttkeyChange});
                    if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
                    {
@@ -349,7 +355,8 @@
                                }
                                #region 数据更新推送主题
                                //appHomeRefresh：住宅数据刷新通知
                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up"
                                        || topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
                                {
                                    MainPage.Log("住宅数据刷新通知");
                                    new HttpServerRequest().GetHomePager();
@@ -488,6 +495,25 @@
                    #endregion

                    //(4)===========开始连接过程==========

                    ////一端口每次都要刷新密钥
                    //if (DB_ResidenceData.Instance.HomeGateway != null && DB_ResidenceData.Instance.HomeGateway.gatewayType == "BUSUDPGATEWAY") {
                    //    var pm = new HttpServerRequest();
                    //    var result = pm.GetHomeGatewayList();
                    //    if(result == StateCode.SUCCESS)
                    //    {
                    //        MainPage.Log($"刷新一端口密钥");
                    //        MainPage.Log($"旧密钥：{mqttEncryptKey}");
                    //        mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey;
                    //        MainPage.Log($"新密钥：{mqttEncryptKey}");
                    //    }else
                    //    {
                    //        return;
                    //    }
                    //}
                    


                    //之前已经获取参数成功过
                    if (MqttInfoConfig.Current.IfGetMqttInfoSuccess)
                    {
@@ -710,6 +736,7 @@
                case "18316672920":
                case "15971583093":
                case "15626203746":
                case "551775569@qq.com":
                    return;
            }