2020-01-03 1.增加信mqtt网关设备类型支持。 2.住宅ID改为string类型。

陈嘉乐

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 ());
@@ -116,6 +116,7 @@
                                        }

                                        if (aesDecryptTopic == $"/BusGateWayToClient/{CurRemoteMACInfo.macMark}/Common/CheckGateway") {
                                            MainPage.WiFiStatus = "CrabtreeAdd/CloudUnlink.png";
                                            // = $"/ClientToBusGateWay/{CurRemoteMACInfo.macMark}/Common/OldON";
                                            var ss = CommonPage.MyEncodingUTF8.GetString (aesDecryptPayload);
                                            var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack> (ss);
@@ -127,34 +128,35 @@
                                            case "NoOnline":
                                            case "NetworkAnomaly"://不在线
                                                MainPage.AddTip ("Gateway offline");
                                                Application.RunOnMainThread (() => {
                                                    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                });
                                                //Application.RunOnMainThread (() => {
                                                //    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                //});
                                                break;
                                            case "NoRecord"://MAC不正确
                                                MainPage.AddTip (Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.MACError));
                                                Application.RunOnMainThread (() => {
                                                    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                });
                                                //Application.RunOnMainThread (() => {
                                                //    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                //});
                                                break;
                                            case "Success":
                                                MainPage.AddTip (UserConfig.Instance.CurrentRegion.RegionName + ":" + Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.LinkSuccess));
                                                MainPage.WiFiStatus = "CrabtreeAdd/CloudLink.png";
                                                break;
                                            default:
                                                MainPage.AddTip (Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.LinkLoser));
                                                Application.RunOnMainThread (() => {
                                                    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                });
                                                //Application.RunOnMainThread (() => {
                                                //    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                //});
                                                break;
                                            }
                                            Application.RunOnMainThread (() => {
                                                UserMiddle.btnLinkStatus.UnSelectedImagePath = MainPage.WiFiStatus;
                                            });
                                        } 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;
@@ -172,7 +174,7 @@
                                        if (CommonPage.IsRemote) {
                                            Application.RunOnMainThread (() => {
                                                MainPage.Loading.Hide ();
                                                Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                //Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                            });
                                        }
                                    } else {
@@ -182,9 +184,9 @@
                            }
                            if (RemoteMqttClient.ConnectedHandler == null) {
                                RemoteMqttClient.UseConnectedHandler (async (e) => {
                                    Shared.Application.RunOnMainThread (() => {
                                        Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = 0xAA69E64A;
                                    });
                                    //Shared.Application.RunOnMainThread (() => {
                                    //    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = 0xAA69E64A;
                                    //});
                                    Shared.SimpleControl.Phone.UserMiddle.ReadAllDeviceStatus ();
                                    System.Console.WriteLine ($"远程连接成功");
                                    MainPage.WiFiStatus = "CrabtreeAdd/CloudLink.png";
@@ -194,7 +196,7 @@
                                            MainPage.AddTip ("Remote failed,gateway offline");
                                            Application.RunOnMainThread (() => {
                                                MainPage.Loading.Hide ();
                                                Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                                //Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                            });
                                        } else {
                                            MqttRemoteSend (new byte [] { 0 }, 3);
@@ -221,7 +223,7 @@
                                if (tempResult == null) {
                                    Application.RunOnMainThread (() => {
                                        MainPage.Loading.Hide ();
                                        Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                        //Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                    });
                                    return;
                                }
@@ -256,17 +258,16 @@
                                if (tempResult == null) {
                                    Application.RunOnMainThread (() => {
                                        MainPage.Loading.Hide ();
                                        Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                        //Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                    });
                                    return;
                                }
                                //--第一步：获取mqtt链接参数
                                var mqttInfoUrl = @"https://developer.hdlcontrol.com/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) {
                                    try {
                                try {
                                    //--第一步：获取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) {
                                        var mqttInfoRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo> (mqttInfoRequestResult.ResponseData.ToString ());
                                        if (mqttInfoRequestResult_Obj != null) {
                                            url = mqttInfoRequestResult_Obj.connEmqDomainPort;
@@ -274,12 +275,13 @@
                                            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 ());
                                            //--找出是否存在匹配当前住宅的mac，存在再进行远程。
                                            CurRemoteMACInfo = gatewayListRequestResult_Obj.pageData.Find ((obj) => obj.mac == UserConfig.Instance.CurrentRegion.MAC);
                                            CurRemoteMACInfo = gatewayListRequestResult_Obj.pageData [0];
                                            if (CurRemoteMACInfo != null) {
                                                CurRemoteMACInfo.LoginAccessToken = mqttRequestPar.Token;
                                                mqttEncryptKey = CurRemoteMACInfo.aesKey;
@@ -298,7 +300,10 @@
                                                await MqttRemoteSend (new byte [] { 0 }, 2);
                                            }
                                        }
                                    } catch { }

                                    }
                                } catch (Exception ex) {
                                    Console.WriteLine (ex.Message);
                                }
                            } catch (Exception ex) {
                                System.Console.WriteLine ("============>" + ex.Message);
@@ -306,7 +311,7 @@
                                    //MainPage.Loading.Hide ();
                                    //isConnecting = false.ToString ();

                                    Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                    //Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
#if DEBUG
                                Alert a = new Alert (remoteMqttIsConnecting.ToString (), ex.Message, "Close");
                                a.Show ();