From 8c1bf42c5fca66625b59728006bd47bae0b6a3ad Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:18:16 +0800
Subject: [PATCH] Revert "Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL"
---
HDL_ON/DAL/Net/Mqtt_Cloud.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/DAL/Net/Mqtt_Cloud.cs b/HDL_ON/DAL/Net/Mqtt_Cloud.cs
index ea35f24..9e7f3a7 100644
--- a/HDL_ON/DAL/Net/Mqtt_Cloud.cs
+++ b/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銆丅uspro杞欢鐧诲綍鍚庤幏鍙栫綉鍏冲垪琛� 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);
});
}
--
Gitblit v1.8.0