JLChen
2021-01-06 f60ce72c3c29c7d31a046795c88ec39a69e73d45
Crabtree/SmartHome/UI/SimpleControl/MqttCommon.cs
@@ -397,7 +397,7 @@
                LoginAccessToken = mqttRequestParToken,
                PlatformStr = "L1",
                PublishPayloadJsonStr = PushSignStr,
                MainUserDistributedMark = UserConfig.Instance.CurrentRegion.MainUserDistributedMark,
                //MainUserDistributedMark = UserConfig.Instance.CurrentRegion.MainUserDistributedMark,
                HomeId = UserConfig.Instance.CurrentRegion.Id
            };
            var mqttInfoRequestResult = MainPage.RequestHttps (API.ShareMemberConnMqttInfo, Newtonsoft.Json.JsonConvert.SerializeObject (mqttInfoRequestPar));
@@ -587,7 +587,7 @@
            var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
            var revertObj3 = MainPage.RequestHttps (API.GetSingleHomeGatewayPagger, requestJson3, urlHead);
            if (revertObj3.StateCode.ToUpper () == "SUCCESS") {
            if (revertObj3.StateCode.ToUpper () == StateCode.SUCCESS) {
                var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGatewayResult> (revertObj3.ResponseData.ToString ());
                if (bNeedConnect) {
                    //2020-01-11
@@ -596,7 +596,7 @@
                    //var gatewayListRequestResult_Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<MqttRemoteInfo> (revertObj3.ResponseData.ToString ());
                    //--找出是否存在匹配当前住宅的mac,存在再进行远程。
                    if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
                        var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId);
                        var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.HomeGateway.mac);
                        if (mGatewayRes != null) {
                            CurRemoteMACInfo = new RemoteMACInfo ();
                            CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
@@ -612,7 +612,7 @@
                        Utlis.WriteLine ("============>Mqtt 取消连接,当前住宅没绑定网关");
                    }
                } else {
                    var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId);
                    var mGatewayRes = infoResult.PageData.Find ((obj) => obj.GatewayUniqueId == UserConfig.Instance.HomeGateway.mac);
                    if (mGatewayRes != null) {
                        CurRemoteMACInfo.aesKey = mGatewayRes.AesKey;
                        mqttEncryptKey = CurRemoteMACInfo.aesKey;
@@ -1083,7 +1083,7 @@
                        var requestObj3 = new GatewayByRegionListObj () { RegionID = UserConfig.Instance.CurrentRegion.RegionID };
                        var requestJson3 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj3);
                        var revertObj3 = MainPage.RequestHttps ("GatewayByRegionList", requestJson3, true, false);
                        if (revertObj3.StateCode.ToUpper() == "SUCCESS") {
                        if (revertObj3.StateCode.ToUpper() == StateCode.SUCCESS) {
                            var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GatewayRes>> (revertObj3.ResponseData.ToString ());
                            var gatewayList = responseDataObj;
                            if (gatewayList != null && gatewayList.Count > 0) {
@@ -1162,7 +1162,7 @@
                                        Shared.SimpleControl.Phone.UserMiddle.LinkStatusTip.BackgroundColor = SkinStyle.Current.DelColor;
                                    });
                                    break;
                                case "Success":
                                case StateCode.SUCCESS:
                                    CommonPage.IsRemote = true;
                                    Application.RunOnMainThread (() => {
                                        MainPage.Loading.Hide ();