1120-3

wxr

2020-11-20 716d1b3b705e7d37e6edebd7f60b7613ab5aee87

 HDL_ON/DAL/Net/Mqtt_Cloud.cs

@@ -116,7 +116,7 @@
        {
            //追加：没有远程连接的权限
            if (remoteMqttIsConnecting
               || remoteIsConnected || !MainPage.LoginUser.IsLogin)
               || remoteIsConnected || ! UserInfo.Current.IsLogin)
            {
                return;
            }
@@ -221,7 +221,7 @@
                    var mqttInfoRequestPar = new RemoteRequestParameters()
                    {
                        PlatformStr = "ON",
                        LoginAccessToken = MainPage.LoginUser.loginTokenString,
                        LoginAccessToken =  UserInfo.Current.loginTokenString,
                        RequestVersion = MainPage.VersionString,
                        RequestProtocolType = 0,
                        RequestSource = 1,
@@ -257,7 +257,7 @@
                                    }
                                    if (CurRemoteMACInfo != null)
                                    {
                                        CurRemoteMACInfo.LoginAccessToken = MainPage.LoginUser.loginTokenString;
                                        CurRemoteMACInfo.LoginAccessToken =  UserInfo.Current.loginTokenString;
                                        CurRemoteMACInfo.clientId = clientId;
                                        mqttEncryptKey = CurRemoteMACInfo.isNewBusproGateway ? CurRemoteMACInfo.aesKey : "";

@@ -304,7 +304,7 @@
        //static void ReceiveNotifyBusGateWayInfoChange()
        //{
        //    var gatewayListUrl = @"https://developer.hdlcontrol.com/Center/Center/GetGatewayPagger"; //App、Buspro软件登录后获取网关列表 http 请求
        //    var gatewayListRequestPar = new RemoteRequestParameters() { Mac = CurRemoteMACInfo.mac, LoginAccessToken = MainPage.LoginUser.loginTokenString, RequestVersion = "RequestVersion1", RequestProtocolType = 0, RequestSource = 1 };
        //    var gatewayListRequestPar = new RemoteRequestParameters() { Mac = CurRemoteMACInfo.mac, LoginAccessToken =  UserInfo.Current.loginTokenString, 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());
        //    if (gatewayListRequestResult_Obj != null && gatewayListRequestResult_Obj.pageData.Count > 0)
@@ -322,12 +322,12 @@
            if (mMes == PushSignStr) return;//是自己的登录推送不处理
            //断开远程连接
            MainPage.IsRemote = false;
            if (!MainPage.LoginUser.IsLogin)
            if (! UserInfo.Current.IsLogin)
            {
                return;
            }
            MainPage.LoginUser.lastTime = DateTime.MinValue;
            MainPage.LoginUser.SaveUserInfo();
             UserInfo.Current.lastTime = DateTime.MinValue;
             UserInfo.Current.SaveUserInfo();

            string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
            new System.Threading.Thread(() =>
@@ -375,7 +375,7 @@
            DisConnectRemoteMqttClient("挤下线");
            Application.RunOnMainThread(() =>
            {
                MainPage.GoLoginPage(MainPage.LoginUser);
                MainPage.GoLoginPage( UserInfo.Current);
            });
        }