From 23532fa8ad34c89b6d24b01eaef6475fd0aad898 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 18:08:24 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 367 ++++++++++++++++++++++++++++++----------------------
1 files changed, 213 insertions(+), 154 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 389dc39..d97b76c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -29,6 +29,13 @@
/// </param>
public static async Task<bool> GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
{
+ //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+ if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ {
+ //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+ await ReInitUserAccoutInfo();
+ return false;
+ }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -63,6 +70,14 @@
/// </param>
public static async Task<string> GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
{
+ //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+ if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ {
+ //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+ await ReInitUserAccoutInfo();
+ return "Error";
+ }
+
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -96,6 +111,13 @@
/// </param>
public static async Task<string> GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
{
+ //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+ if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ {
+ //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+ await ReInitUserAccoutInfo();
+ return null;
+ }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -139,6 +161,13 @@
/// </param>
public static async Task<byte[]> GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
{
+ //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+ if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ {
+ //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
+ await ReInitUserAccoutInfo();
+ return null;
+ }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -320,7 +349,7 @@
{
return HttpConnectMode.Normal;
}
- if (Config.Instance.isAdministrator == true)
+ if (Config.Instance.Home.IsOthreShare == true)
{
return HttpConnectMode.Admin;
}
@@ -399,70 +428,22 @@
var actionForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
if (actionForm != null && actionForm is CommonFormBase)
{
- //璁剧疆褰撳墠婵�娲荤殑鐢婚潰ID
- UserCenterResourse.NowActionFormID = UserCenterResourse.listActionFormId[index];
- //杩藉姞鏉′欢涓�:鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊欐墠澶勭悊
- if ((form is EditorCommonForm) && UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true)
+ string formId = ((CommonFormBase)actionForm).FormID;
+ //瀵瑰簲寰愭缁ф壙浜嗗簳灞傦紝浣嗘槸涓嶅垵濮嬪寲鏁版嵁鐨勯棶棰�
+ if (UserCenterResourse.listActionFormId.Contains(formId) == true)
{
- try
- {
- var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID];
- if (Myform is EditorCommonForm)
- {
- //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
- int value = ((EditorCommonForm)Myform).FormActionAgainEvent();
- if (value == 1)
- {
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
- }
- }
- }
- catch (Exception ex)
- {
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
- alert.Show();
-
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(ex);
- }
+ //璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
+ CallFormActionAgainEvent(form, index);
}
}
else if (actionForm != null && actionForm is UserView.UserPage)
{
- //杩欓噷瀹冨凡缁忛��鍒颁富椤典簡,濡傛灉瀹冨寘鍚釜浜轰腑蹇冧富椤电殑璇�
- if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == true)
+ //杩欓噷瀹冨凡缁忛��鍒颁富椤典簡
+ if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == true//涓汉涓績
+ || UserCenterResourse.listActionFormId.Contains("HomeMainPageForm") == true)//
{
- //璁剧疆褰撳墠婵�娲荤殑鐢婚潰ID
- UserCenterResourse.NowActionFormID = UserCenterResourse.listActionFormId[index];
- //杩藉姞鏉′欢涓�:鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊欐墠澶勭悊
- if ((form is EditorCommonForm) && UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true)
- {
- try
- {
- var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID];
- if (Myform is EditorCommonForm)
- {
- //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
- int value = ((EditorCommonForm)Myform).FormActionAgainEvent();
- if (value == 1)
- {
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
- }
- }
- }
- catch (Exception ex)
- {
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
- alert.Show();
-
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(ex);
- }
- }
+ //璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
+ CallFormActionAgainEvent(form, index);
}
}
}
@@ -471,6 +452,43 @@
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)
+ {
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
+ }
+ }
+ catch (Exception ex)
+ {
+ //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ alert.Show();
+
+ //Log鍑哄姏
+ HdlLogLogic.Current.WriteLog(ex, "鐣岄潰閲嶆柊婵�娲诲紓甯�");
+ }
}
}
@@ -521,7 +539,7 @@
//闇�浼樺厛浜庡埛鏂版埧闂�,鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
HdlGatewayLogic.Current.SynchronizeDbGateway();
//浠庢湰鍦伴噸鏂板姞杞藉叏閮ㄧ殑鎴块棿
- Common.Room.RefreshAllRoomByLocation();
+ HdlRoomLogic.Current.RefreshAllRoomByLocation();
}
/// <summary>
@@ -613,7 +631,7 @@
/// <param name="noticeDb">鏄惁閫氱煡浜戠</param>
public static void ReLoginAgain(string account = "", bool noticeDb = true)
{
- UserCenterResourse.Option.OldAccountId = string.Empty;
+ UserCenterResourse.AccountOption.OldAccountId = string.Empty;
//鍏抽棴鎵�鏈夋帴鏀�
HdlGatewayReceiveLogic.Current.RemoveAllEvent();
//娓呴櫎鍗囩骇鍒楄〃
@@ -622,7 +640,7 @@
HdlThreadLogic.Current.RunThread(async () =>
{
//妫�娴婣PP鏄惁鑳藉閫�鍑�
- while (UserCenterResourse.Option.AppCanSignout == false)
+ while (UserCenterResourse.AccountOption.AppCanSignout == false)
{
await Task.Delay(500);
}
@@ -642,11 +660,13 @@
HdlThreadLogic.Current.RunMain(() =>
{
+ //鏀惰捣宸﹁彍鍗�
+ CommonPage.Instance.CloseLeftMenu();
//鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
CloseAllOpenForm();
//鏄剧ず鐧婚檰鐢婚潰
- var formLogin = new Shared.Phone.Device.Account.AccountLogin();
+ var formLogin = new Login.AccountLogin();
Shared.Common.CommonPage.Instance.AddChidren(formLogin);
formLogin.Show(account);
});
@@ -663,11 +683,18 @@
/// 鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
/// </summary>
/// <param name="tagetFrom">鐩爣鐣岄潰,濡傛灉鎸囧畾浜嗙殑璇�,鍒欏叧闂洰鏍囩晫闈笂灞傜殑鍏ㄩ儴鐣岄潰(瀹冭嚜韬笉鍏抽棴)</param>
- public static void CloseAllOpenForm(string tagetFrom = "")
+ public static void CloseAllOpenForm(string tagetFrom = null)
{
while (UserView.HomePage.Instance.ChildrenCount > 0)
{
var view = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
+ //(鍥犲簳灞傛帶浠朵慨鏀逛簡, 鐖舵帶浠剁Щ闄ゆ椂, 涓嶈Е鍙戝瓙鎺т欢鐨勭Щ闄や簨浠�)
+ if (view is ViewGroup)
+ {
+ //鍏抽棴鍔犺浇鍦╒iewGroup閲岄潰鐨勮嚜瀹氫箟鐣岄潰Form
+ CloseViewGroupChildren((ViewGroup)view);
+ }
+
if (view is CommonFormBase)
{
if (((CommonFormBase)view).FormID == tagetFrom)
@@ -688,38 +715,20 @@
}
}
- #endregion
-
- #region 鈻� 瀛愭帶浠剁殑Y杞村潗鏍嘷___________________
-
/// <summary>
- /// 鎸囧畾浣嶇疆绫诲瀷鑾峰彇Rowlayout鐨勫瓙鎺т欢鐨刌杞村潗鏍�(璇风‘淇濆瓙鎺т欢涓嶅ぇ浜庣埗瀹瑰櫒)
+ /// 鍏抽棴鍔犺浇鍦╒iewGroup閲岄潰鐨勮嚜瀹氫箟鐣岄潰Form(鍥犲簳灞傛帶浠朵慨鏀逛簡,鐖舵帶浠剁Щ闄ゆ椂,涓嶈Е鍙戝瓙鎺т欢鐨勭Щ闄や簨浠�)
/// </summary>
- /// <param name="fatherCtrHeight">鐖舵帶浠剁殑鐪熷疄楂樺害</param>
- /// <param name="ctrHeight">瀛愭帶浠剁殑鐪熷疄楂樺害</param>
- /// <param name="alignment">浣嶇疆瀵归綈鏂瑰紡</param>
- /// <param name="Space">涓婁笅闂寸殑绌虹櫧闂磋窛,鐪佺暐鏃讹紝鍙栬鎺т欢鍏遍�氬彉閲忕殑鍊笺�傝缃负-1鏃讹紝涓嶈绠楃┖鐧介棿璺�</param>
- /// <returns></returns>
- public static int GetControlChidrenYaxis(int fatherCtrHeight, int ctrHeight, UViewAlignment alignment, int Space = 0)
+ /// <param name="group"></param>
+ private static void CloseViewGroupChildren(ViewGroup group)
{
- if (Space < 0)
+ for (int i = 0; i < group.ChildrenCount; i++)
{
- //涓嶈绠楅棿璺濆��
- Space = 0;
- }
-
- if (alignment == UViewAlignment.Center)
- {
- return fatherCtrHeight / 2 - ctrHeight / 2;
- }
- else if (alignment == UViewAlignment.Top)
- {
- return (fatherCtrHeight / 2 - Space / 2) / 2 - ctrHeight / 2;
- }
- else
- {
- int top = fatherCtrHeight / 2 + Space / 2;
- return top + (fatherCtrHeight - top) / 2 - ctrHeight / 2;
+ var view = group.GetChildren(i);
+ if (view is CommonFormBase)
+ {
+ ((CommonFormBase)view).CloseForm();
+ i--;
+ }
}
}
@@ -807,13 +816,13 @@
public async static Task<bool> InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
{
//APP缂撳瓨鍔犺浇寮�濮�
- UserCenterResourse.Option.AppCanSignout = false;
- //杩樺師杩滅▼杩炴帴鍙橀噺
+ UserCenterResourse.AccountOption.AppCanSignout = false;
+ //杩樺師杩滅▼杩炴帴鏉冮檺鍙橀噺
ZigBee.Device.ZbGateway.AllowRemoteCtrl = true;
//鍙湁鍦ㄤ綇瀹匢D涓嶄竴鏍风殑鏃跺�欐墠鍋氳繖涓搷浣�
- if (Common.Config.Instance.HomeId != UserCenterResourse.Option.OldHomeStringId
- || Common.Config.Instance.Account != UserCenterResourse.Option.OldAccountId)
+ if (Common.Config.Instance.HomeId != UserCenterResourse.AccountOption.OldHomeStringId
+ || Common.Config.Instance.Account != UserCenterResourse.AccountOption.OldAccountId)
{
try
{
@@ -822,23 +831,17 @@
}
catch { }
- //娑堟伅璁板綍閲嶆柊璇诲彇鍙婃娴�
- ControlCommonResourse.ReadMessageAgain = true;
- ControlCommonResourse.HadNewMessage = false;
- HdlThreadLogic.Current.RunMain(() =>
- {
- for (int i = 0; i < ControlCommonResourse.listMessageManaContr.Count; i++)
- {
- //鏄剧ず瑙掓爣鐗规晥
- ControlCommonResourse.listMessageManaContr[i].IsSelected = false;
- }
- });
+ //娓呯┖鎵�鏈夋垚鍛樼紦瀛�
+ ClearAllMemberMemory();
//鍔犺浇璐﹀彿閰嶇疆淇℃伅
- var optionInfo = UserCenterResourse.Option.Load();
- UserCenterResourse.Option = optionInfo;
+ var optionInfo = UserCenterResourse.AccountOption.Load();
+ UserCenterResourse.AccountOption = optionInfo;
//鍙樻洿鏍圭敤鎴峰浘鐗囩洰褰曡矾寰�
- UserCenterResourse.Option.UserPictruePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, DirNameResourse.UserPictrueDirectory);
+ UserCenterResourse.AccountOption.UserPictruePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, DirNameResourse.UserPictrueDirectory);
+
+ //鍔犺浇浣忓畢閰嶇疆淇℃伅
+ UserCenterResourse.ResidenceOption = UserCenterResourse.ResidenceOption.Load();
//鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅
var hadNet = await InitUserAccoutInfo();
@@ -865,8 +868,8 @@
//淇濆瓨鐢ㄦ埛鐨勭櫥闄嗕俊鎭埌鏈湴
SaveUserInformationToLocation();
- UserCenterResourse.Option.OldHomeStringId = Common.Config.Instance.HomeId;
- UserCenterResourse.Option.OldAccountId = Common.Config.Instance.Account;
+ UserCenterResourse.AccountOption.OldHomeStringId = Common.Config.Instance.HomeId;
+ UserCenterResourse.AccountOption.OldAccountId = Common.Config.Instance.Account;
//鍚屾鏁版嵁(浜屾璋冪敤娌″叧绯�)
int result = -1;
@@ -880,14 +883,14 @@
//鍒濆鍖栨湰鍦扮殑璁惧淇℃伅
Common.LocalDevice.Current.ReFreshByLocal();
+ //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
+ HdlRoomLogic.Current.RefreshAllRoomByLocation();
+
if (hadNet == true)
{
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
HdlGatewayLogic.Current.SynchronizeDbGateway();
}
-
- //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
- Room.RefreshAllRoomByLocation();
//鍒锋柊APP鍓嶄竴娆￠�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�)
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
@@ -902,9 +905,32 @@
ShowGuideForm(result);
}
//APP缂撳瓨鍔犺浇瀹屾垚
- UserCenterResourse.Option.AppCanSignout = true;
+ UserCenterResourse.AccountOption.AppCanSignout = true;
return true;
+ }
+
+ /// <summary>
+ /// 娓呯┖鎵�鏈夋垚鍛樼紦瀛�
+ /// </summary>
+ private static void ClearAllMemberMemory()
+ {
+ //娑堟伅璁板綍閲嶆柊璇诲彇鍙婃娴�
+ ControlCommonResourse.ReadMessageAgain = true;
+ ControlCommonResourse.HadNewMessage = false;
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ for (int i = 0; i < ControlCommonResourse.listMessageManaContr.Count; i++)
+ {
+ //鏄剧ず瑙掓爣鐗规晥
+ ControlCommonResourse.listMessageManaContr[i].IsSelected = false;
+ }
+ });
+
+ //褰撳墠涓婚〉,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 1:鍦烘櫙 2:鍔熻兘
+ UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
+ //褰撳墠鍒嗙被,鍦烘櫙鍜屽姛鑳芥墍閫夋嫨鐨勫垎鏀� 0:鍦烘櫙 1:鍔熻兘 2:鑷姩鍖�
+ UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = 0;
}
#endregion
@@ -917,22 +943,30 @@
/// <returns></returns>
private async static Task<bool> InitUserAccoutInfo()
{
+ //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
+ UserCenterResourse.UserInfo.InitUserInfoSuccess = false;
//鑾峰彇鏈湴璁板綍鐨勭敤鎴蜂俊鎭�
UserCenterResourse.UserInfo = GetUserInformationFromLocation();
- UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, "Admin.png");
+ UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, "Admin.png");
//鑾峰彇鐧诲綍璐﹀彿鐨勪俊鎭�
var pra = new AccountInfoPra();
- var listNotShow = new List<string>() { "NotSetAgain" };
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetAccountInfo", false, pra, listNotShow);
- if (string.IsNullOrEmpty(result) == true)
+ //搴忓垪鍖栧璞�
+ var requestJson = JsonConvert.SerializeObject(pra);
+ //璁块棶鎺ュ彛
+ byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/GetAccountInfo", Encoding.UTF8.GetBytes(requestJson));
+ if (byteData == null)
{
- //鏂綉鐨勮瘽锛岃骞插槢灏卞共鍢涘惂,鎬讳箣涓嶈兘鎺т富浜虹殑涓滆タ
- Config.Instance.isAdministrator = false;
+ return false;
+ }
+ //妫�娴嬮敊璇�
+ var revertObj = JsonConvert.DeserializeObject<ResponsePack>(Encoding.UTF8.GetString(byteData));
+ if (revertObj.StateCode.ToUpper() != "SUCCESS")
+ {
return false;
}
- var userInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInformation>(result);
+ var userInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInformation>(revertObj.ResponseData.ToString());
userInfo.Account = Common.Config.Instance.Account;
if (string.IsNullOrEmpty(userInfo.UserName) == true)
{
@@ -965,22 +999,23 @@
string dirPath = CombinePath();
if (System.IO.Directory.Exists(dirPath) == true)
{
- //鍏堣褰曡捣浣忓畢鐨勪竴浜涗俊鎭�
- var house = House.GetHouseByHouseId(Config.Instance.HomeId);
- //鍒犻櫎鏁翠釜鏂囦欢澶�
- System.IO.Directory.Delete(dirPath, true);
+ try
+ {
+ //鍚屾鏁版嵁鐨勫垽鏂枃浠�(浠ラ槻涓囦竴鍒犻櫎鏁翠釜鏂囦欢澶瑰け璐ョ殑鏃跺��,杩欎釜鏂囦欢琚垹鐨勮瘽,搴旇娌′粈涔堝ぇ闂)
+ string SynchronizeFile = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoDownLoadBackupCheckFile);
+ //濡傛灉鏈湴宸茬粡鎷ユ湁浜嗚繖涓枃浠讹紝鍒欒鏄庝笉鏄柊鎵嬫満锛屼笉鍐嶈嚜鍔ㄨ繕鍘�
+ if (System.IO.File.Exists(SynchronizeFile) == true)
+ {
+ System.IO.File.Delete(SynchronizeFile);
+ }
+ //鍒犻櫎鏁翠釜鏂囦欢澶�
+ System.IO.Directory.Delete(dirPath, true);
+ }
+ catch { }
//鍒涘缓浣忓畢鏂囦欢澶�
Global.CreateHomeDirectory(Config.Instance.HomeId);
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
CreatAllUserCenterDirectory();
-
- var newHouse = new House();
- newHouse.Id = house.Id;
- newHouse.Name = house.Name;
- newHouse.IsOthreShare = house.IsOthreShare;
- newHouse.AccountType = house.AccountType;
- newHouse.MainUserDistributedMark = house.MainUserDistributedMark;
- newHouse.Save(false);
}
}
if (string.IsNullOrEmpty(userInfo.UserName) == true)
@@ -990,7 +1025,7 @@
}
UserCenterResourse.UserInfo = userInfo;
- UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, "Admin.png");
+ UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, "Admin.png");
if (UserCenterResourse.UserInfo.HeadImage != null)
{
//鍐欏叆澶村儚鍐呭
@@ -998,16 +1033,18 @@
}
UserCenterResourse.UserInfo.HeadImage = null;
//鎵嬪娍瀵嗙爜
- UserCenterResourse.Option.GestureAuthentication = UserCenterResourse.UserInfo.GesturePwd == null ? string.Empty : UserCenterResourse.UserInfo.GesturePwd;
+ UserCenterResourse.AccountOption.GestureAuthentication = UserCenterResourse.UserInfo.GesturePwd == null ? string.Empty : UserCenterResourse.UserInfo.GesturePwd;
UserCenterResourse.UserInfo.GesturePwd = null;
//瀵嗙爜楠岃瘉
- UserCenterResourse.Option.PswAuthentication = UserCenterResourse.UserInfo.StringPwd == null ? string.Empty : UserCenterResourse.UserInfo.StringPwd;
+ UserCenterResourse.AccountOption.PswAuthentication = UserCenterResourse.UserInfo.StringPwd == null ? string.Empty : UserCenterResourse.UserInfo.StringPwd;
UserCenterResourse.UserInfo.StringPwd = null;
//鍒濆鍖栫鐞嗗憳鎺у埗涓讳汉鐨勮繛鎺ュ湴鍧�(鍥犱负杩欎釜杩炴帴Token鏄笉浼氭敼鍙樼殑,鎵�浠ュ彧闇�瑕佸垵濮嬪寲涓�娆�)
- await InitAdminConnectMainInfo();
+ bool flage = await InitAdminConnectMainInfo();
+ //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
+ UserCenterResourse.UserInfo.InitUserInfoSuccess = flage;
- return true;
+ return flage;
}
/// <summary>
@@ -1024,6 +1061,26 @@
}
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInformation>(value);
return info;
+ }
+
+ /// <summary>
+ /// 閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅(鏃ㄥ湪瀵瑰簲閭ｄ竴鐬棿,缃戠粶涓嶅ソ,瀵艰嚧璇垽鐨勬儏鍐�)
+ /// </summary>
+ /// <returns></returns>
+ private async static Task<bool> ReInitUserAccoutInfo()
+ {
+ //閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
+ var result = await InitUserAccoutInfo();
+ if (result == false)
+ {
+ return result;
+ }
+ //鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
+ HdlGatewayLogic.Current.SynchronizeDbGateway();
+ //鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
+ UserCenterResourse.UserInfo.InitUserInfoSuccess = true;
+
+ return true;
}
/// <summary>
@@ -1057,13 +1114,8 @@
/// 鍒濆鍖栫鐞嗗憳鏉冮檺杩滅▼杩炴帴涓讳汉鐨勪俊鎭�
/// </summary>
/// <returns></returns>
- public static async Task<bool> InitAdminConnectMainInfo()
+ private static async Task<bool> InitAdminConnectMainInfo()
{
- //鍏堟竻绌�
- Config.Instance.isAdministrator = false;
- Config.Instance.AdminRequestBaseUrl = string.Empty;
- Config.Instance.AdminRequestToken = string.Empty;
-
if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)
{
//鏃朵唬鍙樹簡,杩欓噷绠＄悊鍛樺拰鎴愬憳閮借兘璋冪敤
@@ -1077,16 +1129,23 @@
SharedHid = Config.Instance.Home.Id
};
- var listNotShow = new List<string>() { "NotSetAgain" };
- var result = await GetResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra, listNotShow);
- if (string.IsNullOrEmpty(result) == true)
+ //搴忓垪鍖栧璞�
+ var requestJson = JsonConvert.SerializeObject(pra);
+ //璁块棶鎺ュ彛
+ byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("App/GetSharedHomeApiControl", Encoding.UTF8.GetBytes(requestJson));
+ if (byteData == null)
+ {
+ return false;
+ }
+ //妫�娴嬮敊璇�
+ var revertObj = JsonConvert.DeserializeObject<ResponsePack>(Encoding.UTF8.GetString(byteData));
+ if (revertObj.StateCode.ToUpper() != "SUCCESS")
{
return false;
}
- Config.Instance.isAdministrator = true;
//鍒嗕韩閾炬帴
- var info = JsonConvert.DeserializeObject<MemberAdministratorResult>(result);
+ var info = JsonConvert.DeserializeObject<MemberAdministratorResult>(revertObj.ResponseData.ToString());
Config.Instance.AdminRequestBaseUrl = info.RequestBaseUrl;
Config.Instance.AdminRequestToken = info.RequestToken;
@@ -1168,9 +1227,9 @@
Global.CreateEmptyDirectory(directory);
//鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
- if (UserCenterResourse.Option.UserPictruePath != string.Empty && !System.IO.Directory.Exists(UserCenterResourse.Option.UserPictruePath))
+ if (UserCenterResourse.AccountOption.UserPictruePath != string.Empty && !System.IO.Directory.Exists(UserCenterResourse.AccountOption.UserPictruePath))
{
- System.IO.Directory.CreateDirectory(UserCenterResourse.Option.UserPictruePath);
+ System.IO.Directory.CreateDirectory(UserCenterResourse.AccountOption.UserPictruePath);
}
}
@@ -1185,7 +1244,7 @@
public static string GetConnectMainToken()
{
//鍚敤绠＄悊鍛樻潈闄�
- if (Config.Instance.isAdministrator == true)
+ if (Config.Instance.Home.IsOthreShare == true)
{
return Config.Instance.AdminRequestToken;
}
--
Gitblit v1.8.0