From 16604a593202f2f87adf71abd57d036fe7da3b52 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 18 十一月 2019 10:39:42 +0800 Subject: [PATCH] 同步了全部的代码 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 146 ++++++++++++++++++++++++------------------------ 1 files changed, 73 insertions(+), 73 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs index a6b048b..ada9751 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs @@ -309,7 +309,7 @@ /// </summary> /// <param name="checkAuthority">鏄惁妫�娴嬫潈闄�</param> /// <returns></returns> - private static HttpConnectMode GetHttpConnectMode(bool checkAuthority) + public static HttpConnectMode GetHttpConnectMode(bool checkAuthority) { if (checkAuthority == false) { @@ -397,17 +397,21 @@ { //璁剧疆褰撳墠婵�娲荤殑鐢婚潰ID UserCenterResourse.NowActionFormID = UserCenterResourse.listActionFormId[index]; - if (UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true) + //杩藉姞鏉′欢涓�:鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊欐墠澶勭悊 + if ((form is EditorCommonForm) && UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true) { try { var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID]; - //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢 - int value = Myform.FormActionAgainEvent(); - if (value == 1) + if (Myform is EditorCommonForm) { - //Log鍑哄姏 - HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�"); + //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢 + int value = ((EditorCommonForm)Myform).FormActionAgainEvent(); + if (value == 1) + { + //Log鍑哄姏 + HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�"); + } } } catch (Exception ex) @@ -428,17 +432,21 @@ { //璁剧疆褰撳墠婵�娲荤殑鐢婚潰ID UserCenterResourse.NowActionFormID = UserCenterResourse.listActionFormId[index]; - if (UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true) + //杩藉姞鏉′欢涓�:鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊欐墠澶勭悊 + if ((form is EditorCommonForm) && UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true) { try { var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID]; - //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢 - int value = Myform.FormActionAgainEvent(); - if (value == 1) + if (Myform is EditorCommonForm) { - //Log鍑哄姏 - HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�"); + //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢 + int value = ((EditorCommonForm)Myform).FormActionAgainEvent(); + if (value == 1) + { + //Log鍑哄姏 + HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�"); + } } } catch (Exception ex) @@ -534,7 +542,7 @@ /// <param name="all">true:鍏ㄩ儴鍒犻櫎(鐢ㄤ簬浣忓畢鍒犻櫎) false:閲嶈鐨勬枃浠朵笉鍒犻櫎</param> public static void DeleteAllLocationFile(bool all = true) { - string dPath = UserCenterResourse.LocalRootPath; + string dPath = Config.Instance.FullPath; if (System.IO.Directory.Exists(dPath) == false) { return; @@ -572,11 +580,6 @@ //涓嶈兘鍒犻櫎Config鏂囦欢 return true; } - else if (fileName.StartsWith("DeviceUI_") == true) - { - //涓嶈兘鍒犻櫎璁惧UI鏂囦欢 - return true; - } else if (fileName.StartsWith("House_") == true) { //涓嶈兘鍒犻櫎浣忓畢鏂囦欢 @@ -596,7 +599,7 @@ /// <param name="noticeDb">鏄惁閫氱煡浜戠</param> public static void ReLoginAgain(string account = "", bool noticeDb = true) { - UserCenterResourse.oldAccountId = string.Empty; + UserCenterResourse.Option.OldAccountId = string.Empty; //鍏抽棴鎵�鏈夋帴鏀� HdlDeviceAttributeLogic.Current.RemoveAllEvent(); //娓呴櫎鍗囩骇鍒楄〃 @@ -606,7 +609,7 @@ HdlThreadLogic.Current.RunThread(async () => { //妫�娴婣PP鏄惁鑳藉閫�鍑� - while (UserCenterResourse.AppCanSignout == false) + while (UserCenterResourse.Option.AppCanSignout == false) { await Task.Delay(500); } @@ -620,7 +623,6 @@ try { ZigBee.Device.ZbGateway.RemoteMqttClient?.DisconnectAsync(); - ZigBee.Device.ZbGateway.RemoteMqttClient = null; } catch { } @@ -647,27 +649,22 @@ /// </summary> public static void CloseAllOpenForm() { - var listForm = new List<CommonFormBase>(); - var listId = new List<string>(); - foreach (CommonFormBase form in UserCenterResourse.DicActionForm.Values) + while (UserView.HomePage.Instance.ChildrenCount > 0) { - if (form.FormID != "UserMainForm") + var view = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1); + if (view is CommonFormBase) { - listForm.Insert(0, form); - listId.Add(form.FormID); + ((CommonFormBase)view).CloseForm(); + } + else if (view is UserView.UserPage) + { + break; + } + else + { + view.RemoveFromParent(); } } - foreach (var id in listId) - { - UserCenterResourse.DicActionForm.Remove(id); - } - - //鍏抽棴鎵�鏈夌敾闈� - foreach (CommonFormBase form in listForm) - { - form.CloseForm(); - } - listForm.Clear(); } #endregion @@ -716,7 +713,7 @@ /// <returns></returns> public static string CombinePath(params object[] listNames) { - string rootPath = UserCenterResourse.LocalRootPath; + string rootPath = Config.Instance.FullPath; if (listNames == null || listNames.Length == 0) { return rootPath; @@ -787,22 +784,17 @@ public async static Task<bool> InitUserCenterMenmoryAndThread() { //APP缂撳瓨鍔犺浇寮�濮� - UserCenterResourse.AppCanSignout = false; - - //寮哄埗鎸囧畾涓嶅叧闂繘搴︽潯 - ProgressBar.SetCloseBarFlag(true); + UserCenterResourse.Option.AppCanSignout = false; //鍙湁鍦ㄤ綇瀹匢D涓嶄竴鏍风殑鏃跺�欐墠鍋氳繖涓搷浣� - if (Common.Config.Instance.HomeId != UserCenterResourse.oldHomeStringId - || Common.Config.Instance.Account != UserCenterResourse.oldAccountId) + if (Common.Config.Instance.HomeId != UserCenterResourse.Option.OldHomeStringId + || Common.Config.Instance.Account != UserCenterResourse.Option.OldAccountId) { - //鍙樻洿鏍圭洰褰曡矾寰� - UserCenterResourse.LocalRootPath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, Config.Instance.Home.Id); - UserCenterResourse.UserPictruePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, DirNameResourse.UserPictrueDirectory); - //鍔犺浇璐﹀彿閰嶇疆淇℃伅 var optionInfo = UserCenterResourse.Option.Load(); UserCenterResourse.Option = optionInfo; + //鍙樻洿鏍圭敤鎴峰浘鐗囩洰褰曡矾寰� + UserCenterResourse.Option.UserPictruePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, DirNameResourse.UserPictrueDirectory); //鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅 await InitUserAccoutInfo(); @@ -828,8 +820,8 @@ //淇濆瓨鐢ㄦ埛鐨勭櫥闄嗕俊鎭埌鏈湴 SaveUserInformationToLocation(); - UserCenterResourse.oldHomeStringId = Common.Config.Instance.HomeId; - UserCenterResourse.oldAccountId = Common.Config.Instance.Account; + UserCenterResourse.Option.OldHomeStringId = Common.Config.Instance.HomeId; + UserCenterResourse.Option.OldAccountId = Common.Config.Instance.Account; //鍚屾鏁版嵁(浜屾璋冪敤娌″叧绯�) var result = await HdlAutoBackupLogic.SynchronizeDbAutoBackupData(); @@ -842,27 +834,24 @@ //鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄� HdlGatewayLogic.Current.SynchronizeDbGateway(); + //鍒濆鍖栦綇瀹呭璞� + Common.Config.Instance.Home = House.GetHouseByHouseId(Common.Config.Instance.HomeId); + //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�) Room.RefreshAllRoomByLocation(); //鍒锋柊APP鍓嶄竴娆¢�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�) HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId(); - //娓呯┖寮哄埗鎸囧畾鏂囨湰鐨勯檮鍔犱俊鎭� - ProgressBar.SetAppendText(string.Empty); - //0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠� - if (result == 0) - { - //寮�鍚嚜鍔ㄥ浠芥彁绀� - //HdlAutoBackupLogic.ShowAutoBackupPromptedForm(); - } + //if (result == 0) + //{ + // //寮�鍚嚜鍔ㄥ浠芥彁绀� + // HdlAutoBackupLogic.ShowAutoBackupPromptedForm(); + //} } - - //鎭㈠鍙叧闂繘搴︽潯 - ProgressBar.SetCloseBarFlag(false); //APP缂撳瓨鍔犺浇瀹屾垚 - UserCenterResourse.AppCanSignout = true; + UserCenterResourse.Option.AppCanSignout = true; return true; } @@ -879,7 +868,7 @@ { //鑾峰彇鏈湴璁板綍鐨勭敤鎴蜂俊鎭� UserCenterResourse.UserInfo = GetUserInformationFromLocation(); - UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.UserPictruePath, "Admin.png"); + UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, "Admin.png"); //鑾峰彇鐧诲綍璐﹀彿鐨勪俊鎭� var pra = new AccountInfoPra(); @@ -950,7 +939,19 @@ } UserCenterResourse.UserInfo = userInfo; - UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.UserPictruePath, "Admin.png"); + UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, "Admin.png"); + if (UserCenterResourse.UserInfo.HeadImage != null) + { + //鍐欏叆澶村儚鍐呭 + Shared.IO.FileUtils.WriteFileByBytes(UserCenterResourse.UserInfo.UserIconFile, UserCenterResourse.UserInfo.HeadImage); + } + UserCenterResourse.UserInfo.HeadImage = null; + //鎵嬪娍瀵嗙爜 + UserCenterResourse.Option.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.UserInfo.StringPwd = null; //鍒濆鍖栫鐞嗗憳鎺у埗涓讳汉鐨勮繛鎺ュ湴鍧�(鍥犱负杩欎釜杩炴帴Token鏄笉浼氭敼鍙樼殑,鎵�浠ュ彧闇�瑕佸垵濮嬪寲涓�娆�) await InitAdminConnectMainInfo(); @@ -989,13 +990,12 @@ { return; } - string nowFile = System.IO.Path.Combine(UserCenterResourse.UserPictruePath, "Admin.png"); - if (System.IO.File.Exists(nowFile) == true) + if (System.IO.File.Exists(UserCenterResourse.UserInfo.UserIconFile) == true) { return; } //澶嶅埗杩囧幓 - System.IO.File.Copy(defultFile, nowFile); + System.IO.File.Copy(defultFile, UserCenterResourse.UserInfo.UserIconFile); } #endregion @@ -1013,9 +1013,9 @@ Config.Instance.AdminRequestBaseUrl = string.Empty; Config.Instance.AdminRequestToken = string.Empty; - if (UserCenterResourse.UserInfo.AuthorityNo != 2) + if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3) { - //鎷ユ湁绠$悊鍛樻潈闄愮殑鎴愬憳鎵嶈兘杩欐牱鎼�, 杩欓噷蹇呴』鏄�2 + //鏃朵唬鍙樹簡,杩欓噷绠$悊鍛樺拰鎴愬憳閮借兘璋冪敤 return true; } var pra = new @@ -1155,9 +1155,9 @@ Global.CreateEmptyDirectory(directory); //鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆� - if (!System.IO.Directory.Exists(UserCenterResourse.UserPictruePath)) + if (UserCenterResourse.Option.UserPictruePath != string.Empty && !System.IO.Directory.Exists(UserCenterResourse.Option.UserPictruePath)) { - System.IO.Directory.CreateDirectory(UserCenterResourse.UserPictruePath); + System.IO.Directory.CreateDirectory(UserCenterResourse.Option.UserPictruePath); } } -- Gitblit v1.8.0