From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index ada9751..7baafdd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -285,7 +285,7 @@
//濡傛灉鐢ㄦ埛宸茬粡閫�鍑轰簡鐧婚檰,鍒欎笉澶勭悊
return;
}
- string msg = IMessageCommon.Current.GetMsgByRequestName(RequestName, revertObj.StateCode, pra);
+ string msg = IMessageCommon.Current.GetMsgByRequestName(RequestName, revertObj, pra);
if (msg != null)
{
var control = new ShowMsgControl(ShowMsgType.Tip, msg);
@@ -520,7 +520,7 @@
Config.Instance.Home.IsOthreShare = isOthreShare;
Config.Instance.Home.AccountType = accountType;
Config.Instance.Home.MainUserDistributedMark = mainMark;
- Config.Instance.Home.Save();
+ Config.Instance.Home.Save(false);
//鍒锋柊鏈湴缃戝叧鏂囦欢
HdlGatewayLogic.Current.ReFreshByLocal();
@@ -601,7 +601,7 @@
{
UserCenterResourse.Option.OldAccountId = string.Empty;
//鍏抽棴鎵�鏈夋帴鏀�
- HdlDeviceAttributeLogic.Current.RemoveAllEvent();
+ HdlGatewayReceiveLogic.Current.RemoveAllEvent();
//娓呴櫎鍗囩骇鍒楄〃
FirmwareUpdateResourse.dicDeviceUpdateList.Clear();
FirmwareUpdateResourse.dicGatewayUpdateList.Clear();
@@ -622,7 +622,8 @@
HdlGatewayLogic.Current.ClearAllRealGateway();
try
{
- ZigBee.Device.ZbGateway.RemoteMqttClient?.DisconnectAsync();
+ //鏂紑杩滅▼Mqtt杩炴帴
+ ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
}
catch { }
@@ -790,6 +791,15 @@
if (Common.Config.Instance.HomeId != UserCenterResourse.Option.OldHomeStringId
|| Common.Config.Instance.Account != UserCenterResourse.Option.OldAccountId)
{
+ try
+ {
+ //鏂紑杩滅▼Mqtt杩炴帴
+ ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+ }
+ catch { }
+
+ //娑堟伅璁板綍閲嶆柊璇诲彇鍙婃娴�
+ ControlCommonResourse.ReadMessageAgain = true;
//鍔犺浇璐﹀彿閰嶇疆淇℃伅
var optionInfo = UserCenterResourse.Option.Load();
UserCenterResourse.Option = optionInfo;
@@ -811,11 +821,9 @@
CreatAllUserCenterDirectory();
//鍏抽棴鎵�鏈夋帴鏀�
- HdlDeviceAttributeLogic.Current.RemoveAllEvent();
+ HdlGatewayReceiveLogic.Current.RemoveAllEvent();
//鍒锋柊瀹夐槻涓婃姤淇℃伅
HdlAlarmsLogic.Current.RefreshAlarmInfo();
- //娣诲姞淇濆瓨瀹夐槻璁惧鎶ヨ鐨勪簨浠�(涓嶉渶瑕佸啀鎵ц浠讳綍鎿嶄綔,骞朵笖姘镐箙瀛樺湪)
- HdlAlarmsLogic.Current.AddAlarmInfoEvent();
//淇濆瓨鐢ㄦ埛鐨勭櫥闄嗕俊鎭埌鏈湴
SaveUserInformationToLocation();
@@ -844,11 +852,11 @@
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
//0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
- //if (result == 0)
- //{
- // //寮�鍚嚜鍔ㄥ浠芥彁绀�
- // HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
- //}
+ if (result == 0)
+ {
+ //寮�鍚嚜鍔ㄥ浠芥彁绀�
+ HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
+ }
}
//APP缂撳瓨鍔犺浇瀹屾垚
UserCenterResourse.Option.AppCanSignout = true;
@@ -929,7 +937,7 @@
newHouse.IsOthreShare = house.IsOthreShare;
newHouse.AccountType = house.AccountType;
newHouse.MainUserDistributedMark = house.MainUserDistributedMark;
- newHouse.Save();
+ newHouse.Save(false);
}
}
if (string.IsNullOrEmpty(userInfo.UserName) == true)
--
Gitblit v1.8.0