From ec34983e291d1c85284472a27109d55891f9a6b5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 07 八月 2020 16:20:16 +0800
Subject: [PATCH] 不是新代码，别 合并
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 93 ++++++++++++++++++++++------------------------
1 files changed, 44 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index b841920..dc6b01c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -22,24 +22,19 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
- public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
+ public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
{
- if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
- {
- //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
- ShowNotNetMsg(listNotShowError);
- return false;
- }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
var byteData = GettByteResponsePack(RequestName, connectMode, obj);
- if (byteData == null && setAgain == true)
+ if (byteData == null)
{
if (setAgain == false)
{
- //涓嶆寚瀹氶噸鍙�
+ //褰撳墠鏃犳硶璁块棶缃戠粶
+ ShowNotNetMsg(RequestName, listNotShowError);
return false;
}
byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -61,17 +56,10 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
/// </param>
- public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
+ public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
{
- if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
- {
- //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
- ShowNotNetMsg(listNotShowError);
- return "Error";
- }
-
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -80,7 +68,8 @@
{
if (setAgain == false)
{
- //涓嶆寚瀹氶噸鍙�
+ //褰撳墠鏃犳硶璁块棶缃戠粶
+ ShowNotNetMsg(RequestName, listNotShowError);
return "Error";
}
byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -105,16 +94,10 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
/// </param>
- public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
+ public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
{
- if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
- {
- //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
- ShowNotNetMsg(listNotShowError);
- return null;
- }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -123,7 +106,8 @@
{
if (setAgain == false)
{
- //涓嶆寚瀹氶噸鍙�
+ //褰撳墠鏃犳硶璁块棶缃戠粶
+ ShowNotNetMsg(RequestName, listNotShowError);
return null;
}
byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -154,15 +138,9 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
- public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
+ public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
{
- if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
- {
- //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
- ShowNotNetMsg(listNotShowError);
- return null;
- }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -172,7 +150,8 @@
{
if (setAgain == false)
{
- //涓嶆寚瀹氶噸鍙�
+ //褰撳墠鏃犳硶璁块棶缃戠粶
+ ShowNotNetMsg(RequestName, listNotShowError);
return null;
}
revertObj = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -227,7 +206,7 @@
if (count == 3)
{
//鏄剧ず娌℃湁缃戠粶鐨凪sg
- ShowNotNetMsg(null);
+ ShowNotNetMsg(RequestName, null);
break;
}
}
@@ -349,13 +328,15 @@
/// <summary>
/// 鏄剧ず娌℃湁缃戠粶鐨凪sg
/// </summary>
- private static void ShowNotNetMsg(List<string> listNotShowError)
+ private static void ShowNotNetMsg(string RequestName, List<string> listNotShowError)
{
if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)
{
//涓嶆娴�
return;
}
+ //HdlLogLogic.Current.WriteLog(-1, "褰撳墠鏃犵綉缁滆繛鎺�:" + RequestName);
+
HdlThreadLogic.Current.RunMain(() =>
{
// 褰撳墠鏃犵綉缁滆繛鎺�,璇风‘璁ょ綉缁�
@@ -519,13 +500,18 @@
#endregion
#region 鈻� 鍒锋柊鏈湴缂撳瓨_______________________
+
/// <summary>
- /// 鍒锋柊鏈湴鎵�鏈夌紦瀛�
+ /// 鍒锋柊鏈湴鎵�鏈夌紦瀛�(鐩墠姝ゆ柟娉曞彧鎻愪緵缁欐仮澶嶅浠芥暟鎹娇鐢�)
/// </summary>
public static void RefreshAllMemory()
{
//鍒锋柊浣忓畢瀵硅薄
RefreshHomeObject();
+ //鏍规嵁妯℃澘鏂囦欢,鎭㈠鏁版嵁
+ TemplateData.TemplateCommonLogic.Current.RecoverDataByTemplateBinFile();
+ //寮哄埗鐢熸垚璁惧鍜岀綉鍏虫枃浠�
+ TemplateData.TemplateCommonLogic.Current.CreatDeviceAndGatewayFileFromMemoryByForce();
//鍒锋柊鏈湴缃戝叧鏂囦欢
HdlGatewayLogic.Current.ReFreshByLocal();
//鍒锋柊鏈湴璁惧
@@ -537,7 +523,7 @@
//鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
HdlThreadLogic.Current.RunThread(async () =>
{
- HdlGatewayLogic.Current.ClearAllRealGateway();
+ HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
}, ShowErrorMode.NO);
}
@@ -590,7 +576,7 @@
//鍏抽棴鍏ㄩ儴寮圭獥
ShowMsgControl.CloseAllMsgDialog();
//鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
- CloseAllOpenForm();
+ CloseAllOpenForm(null, false);
//鏄剧ず鐧婚檰鐢婚潰
var formLogin = new Login.AccountLoginForm();
@@ -618,7 +604,7 @@
//娓呯┖褰撳墠浣忓畢id
Config.Instance.HomeId = string.Empty;
- HdlGatewayLogic.Current.ClearAllRealGateway();
+ HdlGatewayLogic.Current.ClearAllRealGatewayConection(false);
//鏂紑杩滅▼Mqtt杩炴帴
HdlThreadLogic.Current.RunThread(async () =>
@@ -631,7 +617,7 @@
//鏀惰捣宸﹁彍鍗�
CommonPage.Instance.CloseLeftMenu();
//鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
- CloseAllOpenForm();
+ CloseAllOpenForm(null, false);
//鏄剧ず鐧婚檰鐢婚潰
var formLogin = new Login.AccountLoginForm();
@@ -651,7 +637,8 @@
/// 鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
/// </summary>
/// <param name="tagetFrom">鐩爣鐣岄潰,濡傛灉鎸囧畾浜嗙殑璇�,鍒欏叧闂洰鏍囩晫闈笂灞傜殑鍏ㄩ儴鐣岄潰(瀹冭嚜韬笉鍏抽棴)</param>
- public static void CloseAllOpenForm(string tagetFrom = null)
+ /// <param name="refreshMainPage">褰撳叧闂殑鐣岄潰杈惧埌涓婚〉鏃�,鏄惁鍒锋柊涓婚〉</param>
+ public static void CloseAllOpenForm(string tagetFrom = null, bool refreshMainPage = true)
{
while (UserView.HomePage.Instance.ChildrenCount > 0)
{
@@ -674,8 +661,11 @@
}
else if (view is UserView.UserPage)
{
- var form = ((UserView.UserPage)view).GetNowActionForm();
- form?.FormActionAgainEvent();
+ //鍒锋柊涓婚〉
+ if (refreshMainPage == true)
+ {
+ UserView.UserPage.Instance.ReFreshControl();
+ }
return;
}
else
@@ -861,12 +851,15 @@
//鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
HdlThreadLogic.Current.RunThread(async () =>
{
- HdlGatewayLogic.Current.ClearAllRealGateway();
+ HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
}, ShowErrorMode.NO);
//鍒锋柊APP鍓嶄竴娆￠�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�)
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
+
+ //鍔犺浇妯℃澘缂撳瓨
+ //TemplateData.TemplateCommonLogic.Current.LoadLocalTemplateMemoryData();
//0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
if (result == 0 && ShowPrompted == true)
@@ -933,6 +926,8 @@
HdlRoomLogic.Current.RefreshAllRoomByLocation();
//鍒锋柊宸﹁竟鍒锋柊鎴块棿瑙嗗浘鍒楄〃
HdlRoomLogic.Current.RefreshRoomListView();
+ //鍔犺浇妯℃澘缂撳瓨
+ //TemplateData.TemplateCommonLogic.Current.LoadLocalTemplateMemoryData();
}
/// <summary>
--
Gitblit v1.8.0