CrabtreeOn
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
陈嘉乐
2020-01-03 60fea1a35f8bfd2eb1399cae05d853b93b3674f9 
 Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs


@@ -105,7 +105,7 @@




                                        if (aesDecryptTopic == $"NotifyBusGateWayInfoChagne/{CurRemoteMACInfo.md5_mac_string}") {//网关上线，需要更新aeskey


                                                                                                                                 //----第二步：读取账号下面的网关列表


                                            var gatewayListUrl = @"https://developer.hdlcontrol.com/Center/Center/GetGatewayPagger"; //App、Buspro软件登录后获取网关列表 http 请求


                                            var gatewayListUrl = $"{MainPage.RequestHttpsHost}/Center/Center/GetGatewayPagger"; //App、Buspro软件登录后获取网关列表 http 请求


                                            var gatewayListRequestPar = new RemoteRequestParameters () { Mac = CurRemoteMACInfo.mac, LoginAccessToken = mqttRequestParToken, RequestVersion = "RequestVersion1", RequestProtocolType = 0, RequestSource = 1 };


                                            var gatewayListRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (gatewayListRequestPar), false, false, gatewayListUrl);


                                            var gatewayListRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttRemoteInfo> (gatewayListRequestResult.ResponseData.ToString ());


@@ -154,12 +154,9 @@


                                            });


                                        } else {


                                            if (!string.IsNullOrEmpty (mqttEncryptKey)) {


                                                aesDecryptTopic = Shared.Securitys.EncryptionService.AesDecryptTopic (e.ApplicationMessage.Topic, mqttEncryptKey);


                                                aesDecryptPayload = Shared.Securitys.EncryptionService.AesDecryptPayload (e.ApplicationMessage.Payload, mqttEncryptKey);


                                            } else {


                                                aesDecryptTopic = e.ApplicationMessage.Topic;


                                                aesDecryptPayload = e.ApplicationMessage.Payload;


                                            }


                                           


                                        }


                                        var packet = new Packet ();


                                        packet.Bytes = aesDecryptPayload;


@@ -267,7 +264,7 @@


                                }


                                try {


                                    //--第一步：获取mqtt链接参数


                                    var mqttInfoUrl = @"https://developer.hdlcontrol.com/Center/Center/GetConnMqttInfo";//获取连接远程云端Emq Mqtt 服务器连接信息


                                    var mqttInfoUrl = $"{MainPage.RequestHttpsHost}/Center/Center/GetConnMqttInfo";//获取连接远程云端Emq Mqtt 服务器连接信息


                                    var mqttInfoRequestPar = new RemoteRequestParameters () { LoginAccessToken = mqttRequestParToken, RequestVersion = MainPage.CodeIDString, RequestProtocolType = 0, RequestSource = 1 };


                                    var mqttInfoRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (mqttInfoRequestPar), false, false, mqttInfoUrl);


                                    if (mqttInfoRequestResult != null && mqttInfoRequestResult.ResponseData != null) {


@@ -278,7 +275,7 @@


                                            username = mqttInfoRequestResult_Obj.connEmqUserName;


                                            passwordRemote = mqttInfoRequestResult_Obj.connEmqPwd;


                                            //----第二步：读取账号下面的网关列表


                                            var gatewayListUrl = @"https://developer.hdlcontrol.com/Center/Center/GetGatewayPagger"; //App、Buspro软件登录后获取网关列表 http 请求


                                            var gatewayListUrl = $"{MainPage.RequestHttpsHost}/Center/Center/GetGatewayPagger"; //App、Buspro软件登录后获取网关列表 http 请求


                                            var gatewayListRequestPar = new RemoteRequestParameters () { LoginAccessToken = mqttRequestParToken, RequestVersion = "RequestVersion1", RequestProtocolType = 0, RequestSource = 1 };


                                            var gatewayListRequestResult = MainPage.RequestHttps ("", Newtonsoft.Json.JsonConvert.SerializeObject (gatewayListRequestPar), false, false, gatewayListUrl);


                                            var gatewayListRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttRemoteInfo> (gatewayListRequestResult.ResponseData.ToString ());