From 0bf9e65bc3ba98391e7835c922b15baab3c77876 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 01 六月 2020 14:59:39 +0800
Subject: [PATCH] 上传一个合并的版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 100 +++++++++++++++++++++++++++++++-------------------
1 files changed, 62 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 2f3c31e..3d10478 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -33,7 +33,7 @@
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo();
+ await ReInitUserAccoutInfo(listNotShowError);
return false;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
@@ -74,7 +74,7 @@
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo();
+ await ReInitUserAccoutInfo(listNotShowError);
return "Error";
}
@@ -115,7 +115,7 @@
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo();
+ await ReInitUserAccoutInfo(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
@@ -165,7 +165,7 @@
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo();
+ await ReInitUserAccoutInfo(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
@@ -642,6 +642,8 @@
{
//璁惧畾涓�涓椂闂�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+ //娓呯┖褰撳墠浣忓畢id
+ Config.Instance.HomeId = string.Empty;
Config.Instance.Save();
//鏀惰捣宸﹁彍鍗�
CommonPage.Instance.CloseLeftMenu();
@@ -673,7 +675,7 @@
Config.Instance.Save();
//娓呯┖褰撳墠浣忓畢id
- Shared.Common.Config.Instance.HomeId = string.Empty;
+ Config.Instance.HomeId = string.Empty;
HdlGatewayLogic.Current.ClearAllRealGateway();
try
{
@@ -801,13 +803,24 @@
string errorMsgBase = strResultData;
if (errorMsgBase == null)
{
- Type myType = resultData.GetType();
- object errorObj = myType.InvokeMember("errorMessageBase", System.Reflection.BindingFlags.GetField, null, resultData, null);
- if (errorObj == null)
+ if (resultData is ReceiptGatewayResult)
{
- return errorMsg;
+ errorMsgBase = string.Empty;
+ if (((ReceiptGatewayResult)resultData).ErrorMsgDiv == 0)
+ {
+ errorMsgBase = "鍥炲瓒呮椂";
+ }
}
- errorMsgBase = errorObj.ToString();
+ else
+ {
+ Type myType = resultData.GetType();
+ object errorObj = myType.InvokeMember("errorMessageBase", System.Reflection.BindingFlags.GetField, null, resultData, null);
+ if (errorObj == null)
+ {
+ return errorMsg;
+ }
+ errorMsgBase = errorObj.ToString();
+ }
}
if (errorMsgBase.Contains("鍥炲瓒呮椂") == false)
@@ -881,7 +894,7 @@
//鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅
var hadNet = await InitUserAccoutInfo(true);
//濡傛灉鏈夌綉缁滅殑璇�
- if (hadNet == true)
+ if (hadNet == 1)
{
//閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
@@ -908,7 +921,7 @@
//鍚屾鏁版嵁(浜屾璋冪敤娌″叧绯�)
int result = -1;
- if (hadNet == true)
+ if (hadNet == 1)
{
result = await HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
}
@@ -921,7 +934,7 @@
//鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
HdlRoomLogic.Current.RefreshAllRoomByLocation();
- if (hadNet == true)
+ if (hadNet == 1)
{
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
HdlGatewayLogic.Current.SynchronizeDbGateway();
@@ -984,11 +997,6 @@
}
});
- //褰撳墠涓婚〉,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 1:鍦烘櫙 2:鍔熻兘
- UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
- //褰撳墠鍒嗙被,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘 2:鑷姩鍖�
- UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;
-
//鍒囨崲浣忓畢娓呴櫎涔嬪墠閫昏緫缂撳瓨鏁版嵁;
Common.Logic.LogicList.Clear();
Common.Logic.LockLogicList.Clear();
@@ -1000,11 +1008,11 @@
#region 鈻� 鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅_______________
/// <summary>
- /// 鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅
+ /// 鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅 -1:鏃犵綉 1:姝ｅ父 2:鍏朵粬閿欒
/// </summary>
/// <param name="reLoad">鏄惁浠庢柊浠庢湰鍦板姞杞�(閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅,涓嶉渶瑕侀噸鏂板姞杞�)</param>
/// <returns></returns>
- private async static Task<bool> InitUserAccoutInfo(bool reLoad)
+ private async static Task<int> InitUserAccoutInfo(bool reLoad)
{
//鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
UserCenterResourse.UserInfo.InitUserInfoSuccess = false;
@@ -1023,13 +1031,13 @@
byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/GetAccountInfo", Encoding.UTF8.GetBytes(requestJson));
if (byteData == null)
{
- return false;
+ return -1;
}
//妫�娴嬮敊璇�
var revertObj = JsonConvert.DeserializeObject<ResponsePack>(Encoding.UTF8.GetString(byteData));
if (revertObj.StateCode.ToUpper() != "SUCCESS")
{
- return false;
+ return 2;
}
var userInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInformation>(revertObj.ResponseData.ToString());
@@ -1106,9 +1114,9 @@
UserCenterResourse.UserInfo.StringPwd = null;
//鍒濆鍖栫鐞嗗憳鎺у埗涓讳汉鐨勮繛鎺ュ湴鍧�(鍥犱负杩欎釜杩炴帴Token鏄笉浼氭敼鍙樼殑,鎵�浠ュ彧闇�瑕佸垵濮嬪寲涓�娆�)
- bool flage = await InitAdminConnectMainInfo();
+ var flage = await InitAdminConnectMainInfo();
//鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
- UserCenterResourse.UserInfo.InitUserInfoSuccess = flage;
+ UserCenterResourse.UserInfo.InitUserInfoSuccess = flage == 1;
return flage;
}
@@ -1133,20 +1141,36 @@
/// 閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅(鏃ㄥ湪瀵瑰簲閭ｄ竴鐬棿,缃戠粶涓嶅ソ,瀵艰嚧璇垽鐨勬儏鍐�)
/// </summary>
/// <returns></returns>
- private async static Task<bool> ReInitUserAccoutInfo()
+ private async static Task<bool> ReInitUserAccoutInfo(List<string> listNotShowError)
{
//閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
var result = await InitUserAccoutInfo(false);
- if (result == false)
+ //杩炴帴涓嶄簡澶栫綉鐨勬椂鍊�
+ if (result == -1)
{
- return result;
+ if (listNotShowError != null &&
+ (listNotShowError.Contains("NotSetAgain") == true || listNotShowError.Contains("NotCheck") == true))
+ {
+ //鏈夎繖涓や釜鏍囪瘑鏃�,涓嶆彁绀洪敊璇�
+ return false;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ //褰撳墠鏃犵綉缁滆繛鎺�,璇风‘璁ょ綉缁�
+ var alert = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uNowIsDonotNetworkAndCheckNetwork));
+ alert.Show();
+ });
}
- //鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
- HdlGatewayLogic.Current.SynchronizeDbGateway();
- //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
- UserCenterResourse.UserInfo.InitUserInfoSuccess = true;
+ if (result == 1)
+ {
+ //鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
+ HdlGatewayLogic.Current.SynchronizeDbGateway();
+ //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
+ UserCenterResourse.UserInfo.InitUserInfoSuccess = true;
- return true;
+ return true;
+ }
+ return false;
}
/// <summary>
@@ -1177,15 +1201,15 @@
#region 鈻� 鍒濆鍖栫鐞嗗憳鏉冮檺杩滅▼杩炴帴___________
/// <summary>
- /// 鍒濆鍖栫鐞嗗憳鏉冮檺杩滅▼杩炴帴涓讳汉鐨勪俊鎭�
+ /// 鍒濆鍖栫鐞嗗憳鏉冮檺杩滅▼杩炴帴涓讳汉鐨勪俊鎭� -1:鏃犵綉 1:姝ｅ父 2:鍏朵粬閿欒
/// </summary>
/// <returns></returns>
- private static async Task<bool> InitAdminConnectMainInfo()
+ private static async Task<int> InitAdminConnectMainInfo()
{
if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)
{
//鏃朵唬鍙樹簡,杩欓噷绠＄悊鍛樺拰鎴愬憳閮借兘璋冪敤
- return true;
+ return 1;
}
var pra = new
{
@@ -1201,13 +1225,13 @@
byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("App/GetSharedHomeApiControl", Encoding.UTF8.GetBytes(requestJson));
if (byteData == null)
{
- return false;
+ return -1;
}
//妫�娴嬮敊璇�
var revertObj = JsonConvert.DeserializeObject<ResponsePack>(Encoding.UTF8.GetString(byteData));
if (revertObj.StateCode.ToUpper() != "SUCCESS")
{
- return false;
+ return 2;
}
//鍒嗕韩閾炬帴
@@ -1215,7 +1239,7 @@
Config.Instance.AdminRequestBaseUrl = info.RequestBaseUrl;
Config.Instance.AdminRequestToken = info.RequestToken;
- return true;
+ return 1;
}
#endregion
--
Gitblit v1.8.0