From f23ad1b3f9f6193f35f72104d690b21dc67d5c1f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 七月 2020 12:35:25 +0800
Subject: [PATCH] 去掉了访问外网的异步
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 226 ++++++++++++++++++++++++++++---------------------------
1 files changed, 115 insertions(+), 111 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 3542581..daed4fb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -2,8 +2,6 @@
using Shared.Common;
using Newtonsoft.Json;
using Shared.Common.ResponseEntity;
-using System.Threading.Tasks;
-using System.Text.RegularExpressions;
using System.Collections.Generic;
using System.Text;
@@ -23,30 +21,35 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖銆恌alse銆�</pra>
- /// </param>
- public static async Task<bool> GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ /// <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)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return false;
+ }
//妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ ReInitUserAccoutInfo(listNotShowError);
return false;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var byteData = await GettByteResponsePack(RequestName, connectMode, obj);
- if (byteData == null)
+ var byteData = GettByteResponsePack(RequestName, connectMode, obj);
+ if (byteData == null && setAgain == true)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
+ //涓嶆寚瀹氶噸鍙�
return false;
}
- byteData = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (byteData == null)
{
return false;
@@ -64,31 +67,37 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�怱uccess銆�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖銆怑rrorEx銆�</pra>
+ /// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
/// </param>
- public static async Task<string> GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return "Error";
+ }
//妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ ReInitUserAccoutInfo(listNotShowError);
return "Error";
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var byteData = await GettByteResponsePack(RequestName, connectMode, obj);
+ var byteData = GettByteResponsePack(RequestName, connectMode, obj);
if (byteData == null)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
- return "ErrorEx";
+ //涓嶆寚瀹氶噸鍙�
+ return "Error";
}
- byteData = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (byteData == null)
{
return "Error";
@@ -109,30 +118,36 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炵┖瀛楃涓�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖绌哄瓧绗︿覆</pra>
+ /// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
/// </param>
- public static async Task<string> GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return null;
+ }
//妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ ReInitUserAccoutInfo(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var byteData = await GettByteResponsePack(RequestName, connectMode, obj);
+ var byteData = GettByteResponsePack(RequestName, connectMode, obj);
if (byteData == null)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
- return string.Empty;
+ //涓嶆寚瀹氶噸鍙�
+ return null;
}
- byteData = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (byteData == null)
{
return null;
@@ -159,32 +174,36 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炵┖瀛楃涓�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖null</pra>
- /// </param>
- public static async Task<byte[]> GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ /// <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)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return null;
+ }
//妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ ReInitUserAccoutInfo(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var revertObj = await GettByteResponsePack(RequestName, connectMode, obj);
+ var revertObj = GettByteResponsePack(RequestName, connectMode, obj);
if (revertObj == null)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
+ //涓嶆寚瀹氶噸鍙�
return null;
}
- //閲嶆柊鍙戦��
- revertObj = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ revertObj = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (revertObj == null)
{
return null;
@@ -216,7 +235,7 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <returns></returns>
- private static async Task<byte[]> ResetByteRequestHttps(string RequestName, bool checkAuthority, object obj)
+ private static byte[] ResetByteRequestHttps(string RequestName, bool checkAuthority, object obj)
{
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
@@ -225,9 +244,9 @@
int count = 0;
while (true)
{
- await Task.Delay(1000);
+ System.Threading.Thread.Sleep(1000);
//璋冪敤鎺ュ彛
- responsePack = await GettByteResponsePack(RequestName, connectMode, obj);
+ responsePack = GettByteResponsePack(RequestName, connectMode, obj);
if (responsePack != null)
{
break;
@@ -235,13 +254,8 @@
count++;
if (count == 3)
{
- Application.RunOnMainThread(() =>
- {
- //缃戠粶涓嶇ǔ瀹�,璇风◢鍚庡啀璇�
- string msg = Language.StringByID(R.MyInternationalizationString.uNetIsUnStabilityAndDoAgain);
- var control = new ShowMsgControl(ShowMsgType.Tip, msg);
- control.Show();
- });
+ //鏄剧ず娌℃湁缃戠粶鐨凪sg
+ ShowNotNetMsg(null);
break;
}
}
@@ -255,7 +269,7 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="connectMode">鎺ュ彛鐨勮繛鎺ユā寮�</param>
/// <param name="obj">涓�涓被</param>
- private static async Task<byte[]> GettByteResponsePack(string RequestName, HttpConnectMode connectMode, object obj)
+ private static byte[] GettByteResponsePack(string RequestName, HttpConnectMode connectMode, object obj)
{
try
{
@@ -266,12 +280,12 @@
if (connectMode == HttpConnectMode.Normal)
{
//鏅�氳闂�
- result = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, Encoding.UTF8.GetBytes(requestJson));
+ result = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, Encoding.UTF8.GetBytes(requestJson));
}
else if (connectMode == HttpConnectMode.Admin)
{
//浠ョ鐞嗗憳鐨勮韩浠借闂紝鑷韩鏄垚鍛�
- result = await CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, Encoding.UTF8.GetBytes(requestJson));
+ result = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, Encoding.UTF8.GetBytes(requestJson));
}
return result;
}
@@ -299,13 +313,13 @@
}
if (revertObj == null)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//缃戠粶涓嶇ǔ瀹�,璇风◢鍚庡啀璇�
string msg = Language.StringByID(R.MyInternationalizationString.uNetIsUnStabilityAndDoAgain);
var control = new ShowMsgControl(ShowMsgType.Tip, msg);
control.Show();
- });
+ }, ShowErrorMode.NO);
return false;
}
@@ -316,7 +330,7 @@
//涓嶆樉绀洪敊璇�,鐒跺悗杩斿洖true
return true;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (HdlCheckLogic.Current.IsAccountLoginOut() == true)
{
@@ -332,10 +346,10 @@
//鏃犳晥鐧诲綍Token
if (revertObj.StateCode == "NoLogin")
{
- UserCenterLogic.ReLoginAgain(Config.Instance.Account, false);
+ ReLoginAgain(Config.Instance.Account, false);
}
}
- });
+ }, ShowErrorMode.NO);
return false;
}
@@ -358,6 +372,25 @@
return HttpConnectMode.Admin;
}
return HttpConnectMode.Normal;
+ }
+
+ /// <summary>
+ /// 鏄剧ず娌℃湁缃戠粶鐨凪sg
+ /// </summary>
+ private static void ShowNotNetMsg(List<string> listNotShowError)
+ {
+ if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)
+ {
+ //涓嶆娴�
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ // 褰撳墠鏃犵綉缁滆繛鎺�,璇风‘璁ょ綉缁�
+ string msg = Language.StringByID(R.MyInternationalizationString.uNowIsDonotNetworkAndCheckNetwork);
+ var control = new ShowMsgControl(ShowMsgType.Tip, msg);
+ control.Show();
+ }, ShowErrorMode.NO);
}
#endregion
@@ -648,12 +681,12 @@
//娓呴櫎鍗囩骇鍒楄〃
FirmwareUpdateResourse.dicUpdateList.Clear();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//妫�娴婣PP鏄惁鑳藉閫�鍑�
while (UserCenterResourse.AccountOption.AppCanSignout == false)
{
- await Task.Delay(500);
+ System.Threading.Thread.Sleep(500);
}
//璁惧畾涓�涓椂闂�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
@@ -685,7 +718,7 @@
if (noticeDb == true)
{
//閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄�
- var result = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/SignOut", null, "GET");
+ var result = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/SignOut", null, "GET");
}
});
}
@@ -835,10 +868,13 @@
/// </summary>
/// <param name="ShowPrompted">鏂拌拷鍔犲彉閲忥細鏄惁鏄剧ず鎻愮ず鑷姩澶囦唤鐨勭晫闈�</param>
/// <returns></returns>
- public async static Task<bool> InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
+ public static bool InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
{
//璋冪敤杩欎釜鏂规硶,閮介渶瑕侀噸鏂板埛鏂颁富椤�
UserView.UserPage.Instance.RefreshForm = true;
+
+ //娣诲姞缃戠粶鐘舵�佺洃鍚�
+ HdlWifiLogic.Current.StartListenNetWork();
//濡傛灉鏄櫄鎷熶綇瀹�
if (Config.Instance.Home.IsVirtually == true)
@@ -876,18 +912,15 @@
UserCenterResourse.ResidenceOption = UserCenterResourse.ResidenceOption.Load();
//鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅
- var hadNet = await InitUserAccoutInfo(true);
+ var hadNet = InitUserAccoutInfo(true);
//濡傛灉鏈夌綉缁滅殑璇�
if (hadNet == 1)
{
//閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
//璇诲彇闅愬尶閰嶇疆
- await HdlBackupLogic.Current.LoadHideOption();
+ HdlBackupLogic.Current.LoadHideOption();
}
-
- //鍒濆鍖栫紦瀛樻垚鍛樼殑淇℃伅
- InitLocalMemberListInfo();
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
CreatAllUserCenterDirectory();
@@ -907,7 +940,7 @@
int result = -1;
if (hadNet == 1)
{
- result = await HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
+ result = HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
}
//鍒濆鍖栨湰鍦扮殑缃戝叧淇℃伅
@@ -996,7 +1029,7 @@
/// </summary>
/// <param name="reLoad">鏄惁浠庢柊浠庢湰鍦板姞杞�(閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅,涓嶉渶瑕侀噸鏂板姞杞�)</param>
/// <returns></returns>
- private async static Task<int> InitUserAccoutInfo(bool reLoad)
+ private static int InitUserAccoutInfo(bool reLoad)
{
//鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
UserCenterResourse.UserInfo.InitUserInfoSuccess = false;
@@ -1006,13 +1039,18 @@
UserCenterResourse.UserInfo = GetUserInformationFromLocation();
UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, "Admin.png");
}
+ if (HdlWifiLogic.Current.CanAccessHttp == false)
+ {
+ //鏃犳硶杩炴帴澶栫綉
+ return -1;
+ }
//鑾峰彇鐧诲綍璐﹀彿鐨勪俊鎭�
var pra = new AccountInfoPra();
//搴忓垪鍖栧璞�
var requestJson = JsonConvert.SerializeObject(pra);
//璁块棶鎺ュ彛
- byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/GetAccountInfo", Encoding.UTF8.GetBytes(requestJson));
+ byte[] byteData = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/GetAccountInfo", Encoding.UTF8.GetBytes(requestJson));
if (byteData == null)
{
return -1;
@@ -1098,7 +1136,7 @@
UserCenterResourse.UserInfo.StringPwd = null;
//鍒濆鍖栫鐞嗗憳鎺у埗涓讳汉鐨勮繛鎺ュ湴鍧�(鍥犱负杩欎釜杩炴帴Token鏄笉浼氭敼鍙樼殑,鎵�浠ュ彧闇�瑕佸垵濮嬪寲涓�娆�)
- var flage = await InitAdminConnectMainInfo();
+ var flage = InitAdminConnectMainInfo();
//鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
UserCenterResourse.UserInfo.InitUserInfoSuccess = flage == 1;
@@ -1125,17 +1163,16 @@
/// 閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅(鏃ㄥ湪瀵瑰簲閭ｄ竴鐬棿,缃戠粶涓嶅ソ,瀵艰嚧璇垽鐨勬儏鍐�)
/// </summary>
/// <returns></returns>
- private async static Task<bool> ReInitUserAccoutInfo(List<string> listNotShowError)
+ private static bool ReInitUserAccoutInfo(List<string> listNotShowError)
{
//閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
- var result = await InitUserAccoutInfo(false);
+ var result = InitUserAccoutInfo(false);
//杩炴帴涓嶄簡澶栫綉鐨勬椂鍊�
if (result == -1)
{
- if (listNotShowError != null &&
- (listNotShowError.Contains("NotSetAgain") == true || listNotShowError.Contains("NotCheck") == true))
+ if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)
{
- //鏈夎繖涓や釜鏍囪瘑鏃�,涓嶆彁绀洪敊璇�
+ //鏈夎繖涓爣璇嗘椂,涓嶆彁绀洪敊璇�
return false;
}
Application.RunOnMainThread(() =>
@@ -1188,7 +1225,7 @@
/// 鍒濆鍖栫鐞嗗憳鏉冮檺杩滅▼杩炴帴涓讳汉鐨勪俊鎭� -1:鏃犵綉 1:姝ｅ父 2:鍏朵粬閿欒
/// </summary>
/// <returns></returns>
- private static async Task<int> InitAdminConnectMainInfo()
+ private static int InitAdminConnectMainInfo()
{
if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)
{
@@ -1206,7 +1243,7 @@
//搴忓垪鍖栧璞�
var requestJson = JsonConvert.SerializeObject(pra);
//璁块棶鎺ュ彛
- byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("App/GetSharedHomeApiControl", Encoding.UTF8.GetBytes(requestJson));
+ byte[] byteData = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("App/GetSharedHomeApiControl", Encoding.UTF8.GetBytes(requestJson));
if (byteData == null)
{
return -1;
@@ -1224,39 +1261,6 @@
Config.Instance.AdminRequestToken = info.RequestToken;
return 1;
- }
-
- #endregion
-
- #region 鈻� 鍒濆鍖栫紦瀛樻垚鍛樼殑淇℃伅_______________
-
- /// <summary>
- /// 鍒濆鍖栫紦瀛樻垚鍛樼殑淇℃伅
- /// </summary>
- private static void InitLocalMemberListInfo()
- {
- //鍏堟竻绌�
- UserCenterResourse.ListMemberInfo.Clear();
- string fileName = CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.MemberListInfoFile);
- if (System.IO.File.Exists(fileName) == false)
- {
- return;
- }
- var varByte = Shared.IO.FileUtils.ReadFile(fileName);
- UserCenterResourse.ListMemberInfo = JsonConvert.DeserializeObject<List<MemberInfoRes>>(System.Text.Encoding.UTF8.GetString(varByte));
- }
-
- /// <summary>
- /// 淇濆瓨缂撳瓨鎴愬憳鐨勪俊鎭�
- /// </summary>
- public static void SaveLocalMemberListInfo()
- {
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(UserCenterResourse.ListMemberInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
-
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.MemberListInfoFile);
- //鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
}
#endregion
--
Gitblit v1.8.0