From 304dca51c28183a9dfc192c6b93ea1c00bdd5d97 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:00:40 +0800
Subject: [PATCH] 添加了写入功能类型
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 407 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 266 insertions(+), 141 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index d97b76c..3542581 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";
}
@@ -95,6 +95,10 @@
}
}
var revertObj = JsonConvert.DeserializeObject<ResponsePack>(Encoding.UTF8.GetString(byteData));
+ if (revertObj == null)
+ {
+ return "Error";
+ }
return revertObj.StateCode;
}
@@ -115,7 +119,7 @@
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo();
+ await ReInitUserAccoutInfo(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
@@ -143,7 +147,7 @@
}
if (revertObj == null || revertObj.ResponseData == null)
{
- return string.Empty;
+ return null;
}
return revertObj.ResponseData.ToString();
}
@@ -165,7 +169,7 @@
if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
{
//涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo();
+ await ReInitUserAccoutInfo(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
@@ -368,17 +372,17 @@
public static bool CheckCanAddForm(CommonFormBase form)
{
//鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
- string formName = GetFormName(form);
+ string formId = GetFormID(form);
//浜岄噸杩藉姞涓嶅彲
- if (UserCenterResourse.DicActionForm.ContainsKey(formName) == false)
+ if (UserCenterResourse.DicActionForm.ContainsKey(formId) == false)
{
return true;
}
//鏆傛椂杩欐牱寮勭湅鐪嬶紝濡傛灉閲嶅锛屽垯鍏抽棴鎺夊師鏉ョ殑鐣岄潰
- var formTemp = UserCenterResourse.DicActionForm[formName];
+ var formTemp = UserCenterResourse.DicActionForm[formId];
formTemp.CloseForm();
- UserCenterResourse.DicActionForm.Remove(formName);
+ UserCenterResourse.DicActionForm.Remove(formId);
return true;
}
@@ -390,14 +394,14 @@
public static void AddActionForm(CommonFormBase form)
{
//鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
- string formName = GetFormName(form);
+ string formId = GetFormID(form);
//浜岄噸杩藉姞涓嶅彲
- if (UserCenterResourse.DicActionForm.ContainsKey(formName) == false)
+ if (UserCenterResourse.DicActionForm.ContainsKey(formId) == false)
{
- form.FormID = formName;
+ form.FormID = formId;
//鍐呭瓨娣诲姞
- UserCenterResourse.DicActionForm[formName] = form;
+ UserCenterResourse.DicActionForm[formId] = form;
//娣诲姞鐢婚潰鏃讹紝瀹冭嚜韬氨鏄縺娲荤殑鐣岄潰
UserCenterResourse.NowActionFormID = form.FormID;
@@ -408,96 +412,81 @@
/// <summary>
/// 浠庡垪琛ㄤ腑绉婚櫎鐢婚潰
/// </summary>
- /// <param name="form">Form</param>
- public static void RemoveActionForm(CommonFormBase form)
+ /// <param name="i_closeForm">鍏抽棴鐨勭晫闈�</param>
+ public static void RemoveActionForm(CommonFormBase i_closeForm)
{
- //鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
- string formName = GetFormName(form);
+ //鑾峰彇鐢婚潰ID
+ string formId = GetFormID(i_closeForm);
- if (UserCenterResourse.DicActionForm.ContainsKey(formName) == true)
+ if (UserCenterResourse.DicActionForm.ContainsKey(formId) == true)
{
- //鍒锋柊褰撳墠姝ｅ湪鎿嶄綔鐨勭敾闈D
- if (UserCenterResourse.NowActionFormID == UserCenterResourse.DicActionForm[formName].FormID)
+ //绉婚櫎ID
+ UserCenterResourse.listActionFormId.Remove(formId);
+ //绉婚櫎鐢婚潰
+ UserCenterResourse.DicActionForm.Remove(formId);
+ //娓呯┖
+ UserCenterResourse.NowActionFormID = string.Empty;
+
+ var actionForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
+ if (actionForm == null)
{
- //鍚戝墠鎺ㄤ竴浣嶅嵆涓轰笅涓�涓縺娲荤殑鐣岄潰
- int index = UserCenterResourse.listActionFormId.IndexOf(UserCenterResourse.NowActionFormID) - 1;
- //鍒濆鍊�
- UserCenterResourse.NowActionFormID = string.Empty;
- if (index >= 0)
+ return;
+ }
+ //濡傛灉鍏抽棴鐨勭晫闈㈡槸DialogCommonForm绫诲瀷,鍒欎笉闇�瑕佽Е鍙戞縺娲诲嚱鏁�
+ if (i_closeForm is DialogCommonForm)
+ {
+ if (actionForm is EditorCommonForm)
{
- var actionForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
- if (actionForm != null && actionForm is CommonFormBase)
+ UserCenterResourse.NowActionFormID = GetFormID((EditorCommonForm)actionForm);
+ }
+ return;
+ }
+ //鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊�
+ else if ((i_closeForm is EditorCommonForm) && (actionForm is EditorCommonForm))
+ {
+ //鎺ヤ笅鏉ユ縺娲荤殑鐣岄潰id
+ UserCenterResourse.NowActionFormID = GetFormID((CommonFormBase)actionForm);
+ try
+ {
+ var Myform = actionForm as EditorCommonForm;
+ //閲嶇疆宸︽粦浣胯兘
+ Myform.ScrollEnabled = Myform.ScrollEnabled;
+ //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
+ int value = Myform.FormActionAgainEvent();
+ if (value == 1)
{
- string formId = ((CommonFormBase)actionForm).FormID;
- //瀵瑰簲寰愭缁ф壙浜嗗簳灞傦紝浣嗘槸涓嶅垵濮嬪寲鏁版嵁鐨勯棶棰�
- if (UserCenterResourse.listActionFormId.Contains(formId) == true)
- {
- //璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
- CallFormActionAgainEvent(form, index);
- }
- }
- else if (actionForm != null && actionForm is UserView.UserPage)
- {
- //杩欓噷瀹冨凡缁忛��鍒颁富椤典簡
- if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == true//涓汉涓績
- || UserCenterResourse.listActionFormId.Contains("HomeMainPageForm") == true)//
- {
- //璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
- CallFormActionAgainEvent(form, index);
- }
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
}
}
- }
- //绉婚櫎ID
- UserCenterResourse.listActionFormId.Remove(UserCenterResourse.DicActionForm[formName].FormID);
- //绉婚櫎鐢婚潰
- UserCenterResourse.DicActionForm.Remove(formName);
- }
- }
-
- /// <summary>
- /// 璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
- /// </summary>
- /// <param name="form">鍏抽棴鐨勭晫闈㈠璞�</param>
- /// <param name="index">褰撳墠闇�瑕侀噸鏂版縺娲荤晫闈㈢殑绱㈠紩</param>
- private static void CallFormActionAgainEvent(CommonFormBase form, int index)
- {
- //璁剧疆褰撳墠婵�娲荤殑鐢婚潰ID
- UserCenterResourse.NowActionFormID = UserCenterResourse.listActionFormId[index];
- //杩藉姞鏉′欢涓�:鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊欐墠澶勭悊
- if ((form is EditorCommonForm) && UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true)
- {
- try
- {
- var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID] as EditorCommonForm;
- //閲嶇疆宸︽粦浣胯兘
- Myform.ScrollEnabled = Myform.ScrollEnabled;
- //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
- int value = Myform.FormActionAgainEvent();
- if (value == 1)
+ catch (Exception ex)
{
//Log鍑哄姏
- HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
+ HdlLogLogic.Current.WriteLog(ex, "鐣岄潰閲嶆柊婵�娲诲紓甯� " + UserCenterResourse.NowActionFormID);
}
}
- catch (Exception ex)
+ else if (actionForm is UserView.UserPage)
{
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
- alert.Show();
-
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(ex, "鐣岄潰閲嶆柊婵�娲诲紓甯�");
+ //娓呯┖
+ UserCenterResourse.NowActionFormID = string.Empty;
+ //杩欓噷瀹冨凡缁忛��鍒颁富椤典簡
+ var nowForm = UserView.UserPage.Instance.GetNowActionForm();
+ nowForm?.FormActionAgainEvent();
+ }
+ else
+ {
+ //娓呯┖
+ UserCenterResourse.NowActionFormID = string.Empty;
}
}
}
/// <summary>
- /// 鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
+ /// 鑾峰彇鐢婚潰ID
/// </summary>
/// <returns>The form name.</returns>
/// <param name="form">Form.</param>
- public static string GetFormName(CommonFormBase form)
+ private static string GetFormID(CommonFormBase form)
{
if (form.FormID != string.Empty)
{
@@ -555,7 +544,7 @@
double Longitude = Config.Instance.Home.Longitude;
double Latitude = Config.Instance.Home.Latitude;
//杩樺師浣忓畢瀵硅薄
- Config.Instance.Home = House.GetHouseByHouseId(Config.Instance.Home.Id);
+ Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(Config.Instance.Home.Id);
Config.Instance.Home.IsOthreShare = isOthreShare;
Config.Instance.Home.AccountType = accountType;
Config.Instance.Home.MainUserDistributedMark = mainMark;
@@ -631,6 +620,28 @@
/// <param name="noticeDb">鏄惁閫氱煡浜戠</param>
public static void ReLoginAgain(string account = "", bool noticeDb = true)
{
+ if (Config.Instance.Home.IsVirtually == true)
+ {
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁惧畾涓�涓椂闂�
+ Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+ //娓呯┖褰撳墠浣忓畢id
+ Config.Instance.HomeId = string.Empty;
+ Config.Instance.Save();
+ //鏀惰捣宸﹁彍鍗�
+ CommonPage.Instance.CloseLeftMenu();
+ //鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
+ CloseAllOpenForm();
+
+ //鏄剧ず鐧婚檰鐢婚潰
+ var formLogin = new Login.AccountLoginForm();
+ Shared.Common.CommonPage.Instance.AddChidren(formLogin);
+ formLogin.ShowForm(account);
+ });
+ return;
+ }
UserCenterResourse.AccountOption.OldAccountId = string.Empty;
//鍏抽棴鎵�鏈夋帴鏀�
HdlGatewayReceiveLogic.Current.RemoveAllEvent();
@@ -649,14 +660,14 @@
Config.Instance.Save();
//娓呯┖褰撳墠浣忓畢id
- Shared.Common.Config.Instance.HomeId = string.Empty;
+ Config.Instance.HomeId = string.Empty;
HdlGatewayLogic.Current.ClearAllRealGateway();
- try
+
+ //鏂紑杩滅▼Mqtt杩炴帴
+ HdlThreadLogic.Current.RunThread(async () =>
{
- //鏂紑杩滅▼Mqtt杩炴帴
- ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
- }
- catch { }
+ await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+ }, ShowErrorMode.NO);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -666,9 +677,9 @@
CloseAllOpenForm();
//鏄剧ず鐧婚檰鐢婚潰
- var formLogin = new Login.AccountLogin();
+ var formLogin = new Login.AccountLoginForm();
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
- formLogin.Show(account);
+ formLogin.ShowForm(account);
});
if (noticeDb == true)
@@ -777,13 +788,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)
@@ -815,6 +837,17 @@
/// <returns></returns>
public async static Task<bool> InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
{
+ //璋冪敤杩欎釜鏂规硶,閮介渶瑕侀噸鏂板埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshForm = true;
+
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ if (Config.Instance.Home.IsVirtually == true)
+ {
+ //鍒濆鍖栬櫄鎷熶綇瀹呯殑涓汉涓績鐨勬暟鎹�(鍒囨崲浣忓畢浣跨敤)
+ InitUserCenterMenmoryByVirtualHome();
+ return true;
+ }
+
//APP缂撳瓨鍔犺浇寮�濮�
UserCenterResourse.AccountOption.AppCanSignout = false;
//杩樺師杩滅▼杩炴帴鏉冮檺鍙橀噺
@@ -824,12 +857,11 @@
if (Common.Config.Instance.HomeId != UserCenterResourse.AccountOption.OldHomeStringId
|| Common.Config.Instance.Account != UserCenterResourse.AccountOption.OldAccountId)
{
- try
+ //鏂紑杩滅▼Mqtt杩炴帴
+ HdlThreadLogic.Current.RunThread(async () =>
{
- //鏂紑杩滅▼Mqtt杩炴帴
await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
- }
- catch { }
+ }, ShowErrorMode.NO);
//娓呯┖鎵�鏈夋垚鍛樼紦瀛�
ClearAllMemberMemory();
@@ -844,9 +876,9 @@
UserCenterResourse.ResidenceOption = UserCenterResourse.ResidenceOption.Load();
//鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅
- var hadNet = await InitUserAccoutInfo();
+ var hadNet = await InitUserAccoutInfo(true);
//濡傛灉鏈夌綉缁滅殑璇�
- if (hadNet == true)
+ if (hadNet == 1)
{
//閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
@@ -873,7 +905,7 @@
//鍚屾鏁版嵁(浜屾璋冪敤娌″叧绯�)
int result = -1;
- if (hadNet == true)
+ if (hadNet == 1)
{
result = await HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
}
@@ -881,12 +913,12 @@
//鍒濆鍖栨湰鍦扮殑缃戝叧淇℃伅
HdlGatewayLogic.Current.ReFreshByLocal();
//鍒濆鍖栨湰鍦扮殑璁惧淇℃伅
- Common.LocalDevice.Current.ReFreshByLocal();
+ LocalDevice.Current.ReFreshByLocal();
//鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
HdlRoomLogic.Current.RefreshAllRoomByLocation();
- if (hadNet == true)
+ if (hadNet == 1)
{
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
HdlGatewayLogic.Current.SynchronizeDbGateway();
@@ -898,7 +930,7 @@
//0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
if (result == 0 && ShowPrompted == true)
{
- //寮�鍚嚜鍔ㄥ浠芥彁绀�
+ //寮�鍚嚜鍔ㄥ浠�
HdlAutoBackupLogic.ShowAutoBackupPromptedForm();
}
//鏄剧ず寮曞鐣岄潰
@@ -908,6 +940,28 @@
UserCenterResourse.AccountOption.AppCanSignout = true;
return true;
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栬櫄鎷熶綇瀹呯殑涓汉涓績鐨勬暟鎹�(鍒囨崲浣忓畢浣跨敤)
+ /// </summary>
+ private static void InitUserCenterMenmoryByVirtualHome()
+ {
+ UserCenterResourse.AccountOption.OldHomeStringId = Common.Config.Instance.Home.Id;
+ //娓呯┖鎵�鏈夋垚鍛樼紦瀛�
+ ClearAllMemberMemory();
+ //棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
+ CreatAllUserCenterDirectory();
+ //鍏抽棴鎵�鏈夋帴鏀�
+ HdlGatewayReceiveLogic.Current.RemoveAllEvent();
+ //鍒濆鍖栨湰鍦扮殑缃戝叧淇℃伅
+ HdlGatewayLogic.Current.ReFreshByLocal();
+ //鍒濆鍖栨湰鍦扮殑璁惧淇℃伅
+ Common.LocalDevice.Current.ReFreshByLocal();
+ //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
+ HdlRoomLogic.Current.RefreshAllRoomByLocation();
+ //鍒锋柊宸﹁竟鍒锋柊鎴块棿瑙嗗浘鍒楄〃
+ HdlRoomLogic.Current.RefreshRoomListView();
}
/// <summary>
@@ -927,10 +981,10 @@
}
});
- //褰撳墠涓婚〉,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 1:鍦烘櫙 2:鍔熻兘
- UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
- //褰撳墠鍒嗙被,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘 2:鑷姩鍖�
- UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;
+ //鍒囨崲浣忓畢娓呴櫎涔嬪墠閫昏緫缂撳瓨鏁版嵁;
+ Common.Logic.LogicList.Clear();
+ Common.Logic.LockLogicList.Clear();
+ Common.Logic.SoneLogicList.Clear();
}
#endregion
@@ -938,16 +992,20 @@
#region 鈻� 鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅_______________
/// <summary>
- /// 鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅
+ /// 鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅 -1:鏃犵綉 1:姝ｅ父 2:鍏朵粬閿欒
/// </summary>
+ /// <param name="reLoad">鏄惁浠庢柊浠庢湰鍦板姞杞�(閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅,涓嶉渶瑕侀噸鏂板姞杞�)</param>
/// <returns></returns>
- private async static Task<bool> InitUserAccoutInfo()
+ private async static Task<int> InitUserAccoutInfo(bool reLoad)
{
//鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
UserCenterResourse.UserInfo.InitUserInfoSuccess = false;
- //鑾峰彇鏈湴璁板綍鐨勭敤鎴蜂俊鎭�
- UserCenterResourse.UserInfo = GetUserInformationFromLocation();
- UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, "Admin.png");
+ if (reLoad == true)
+ {
+ //鑾峰彇鏈湴璁板綍鐨勭敤鎴蜂俊鎭�
+ UserCenterResourse.UserInfo = GetUserInformationFromLocation();
+ UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, "Admin.png");
+ }
//鑾峰彇鐧诲綍璐﹀彿鐨勪俊鎭�
var pra = new AccountInfoPra();
@@ -957,13 +1015,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());
@@ -1040,9 +1098,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;
}
@@ -1067,20 +1125,36 @@
/// 閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅(鏃ㄥ湪瀵瑰簲閭ｄ竴鐬棿,缃戠粶涓嶅ソ,瀵艰嚧璇垽鐨勬儏鍐�)
/// </summary>
/// <returns></returns>
- private async static Task<bool> ReInitUserAccoutInfo()
+ private async static Task<bool> ReInitUserAccoutInfo(List<string> listNotShowError)
{
//閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
- var result = await InitUserAccoutInfo();
- if (result == false)
+ var result = await InitUserAccoutInfo(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>
@@ -1111,15 +1185,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
{
@@ -1135,13 +1209,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;
}
//鍒嗕韩閾炬帴
@@ -1149,7 +1223,7 @@
Config.Instance.AdminRequestBaseUrl = info.RequestBaseUrl;
Config.Instance.AdminRequestToken = info.RequestToken;
- return true;
+ return 1;
}
#endregion
@@ -1417,25 +1491,76 @@
/// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
public static void SaveFileContent(string fullName, object obj)
{
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- //鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
+ var data = JsonConvert.SerializeObject(obj);
+ SaveTexToFile(fullName, data);
}
/// <summary>
- /// 璇诲彇鏂囦欢(鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull,鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
+ public static void SaveTexToFile(string fullName, string textValue)
+ {
+ var byteData = Encoding.UTF8.GetBytes(textValue);
+ //鍐欏叆鍐呭
+ System.IO.FileStream fileStream = null;
+ try
+ {
+ fileStream = new System.IO.FileStream(fullName, System.IO.FileMode.Create, System.IO.FileAccess.Write);
+ fileStream.Write(byteData, 0, byteData.Length);
+ fileStream.Flush();
+ }
+ catch { }
+ finally
+ {
+ fileStream?.Close();
+ }
+ }
+
+ /// <summary>
+ /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�(鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull,鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
/// </summary>
/// <param name="fullName">鍏ㄨ矾寰�</param>
/// <returns></returns>
public static string LoadFileContent(string fullName)
{
+ //璇诲彇鏂囦欢
+ var varByte = ReadFileContent(fullName);
+ if (varByte == null)
+ {
+ return null;
+ }
+ return Encoding.UTF8.GetString(varByte);
+ }
+
+ /// <summary>
+ /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�,鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <returns></returns>
+ public static byte[] ReadFileContent(string fullName)
+ {
if (System.IO.File.Exists(fullName) == false)
{
return null;
}
- var varByte = Shared.IO.FileUtils.ReadFile(fullName);
- return System.Text.Encoding.UTF8.GetString(varByte);
+ System.IO.FileStream fileStream = null;
+ try
+ {
+ fileStream = new System.IO.FileStream(fullName, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+ byte[] array = new byte[fileStream.Length];
+ fileStream.Read(array, 0, array.Length);
+ return array;
+ }
+ catch
+ {
+ return null;
+ }
+ finally
+ {
+ fileStream?.Close();
+ }
}
#endregion
--
Gitblit v1.8.0