From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 11 十二月 2020 15:58:32 +0800 Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath --- HDL_ON/Common/HDLCommon.cs | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index d947849..963549a 100644 --- a/HDL_ON/Common/HDLCommon.cs +++ b/HDL_ON/Common/HDLCommon.cs @@ -4,6 +4,7 @@ using HDL_ON.UI.CSS; using HDL_ON.DAL.Server; using HDL_ON.UI; +using HDL_ON.Entity; namespace HDL_ON { @@ -68,7 +69,7 @@ #endregion - #region 妫�娴嬫洿鏂� + #region 鈻� 妫�娴嬫洿鏂癬______________________ /// <summary> /// 妫�娴嬫洿鏂扮嚎绋� /// </summary> @@ -221,5 +222,150 @@ } #endregion + + ///// <summary> + ///// 鎭㈠浣忓畢 + ///// 2020-12-03 寰呮祴璇曟湭妫�娴� + ///// </summary> + //public void RestoreHomeBackup(string RegionID) + //{ + // var isExist = FileUtils.ExistRegion(RegionID); + // if (isExist) + // { + // //瀛樺湪鍒欐仮澶� + // string newRegionRootPath = FileUtils.CreateRegionBackup(RegionID); + // FileUtils.RestoreRegionFiles(newRegionRootPath); + // } + //} + + #region 鈻� 鎺ㄩ�佸鐞哶______________________ + /// <summary> + /// 鎺ㄩ�佹秷鎭鐞� + /// </summary> + /// <param name="jpushMessageInfo"></param> + public void AdjustPushMessage(JPushMessageInfo jpushMessageInfo) + { + try + { + if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("OffLine")) + { + Shared.Application.RunOnMainThread(() => + { + //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈� + new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show(); + //閫�鍑虹櫥褰曟搷浣� + CheckLogout(); + }); + return; + } + else + { + Shared.Application.RunOnMainThread(() => + { + new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show(); + }); + return; + } + } + catch + { + + } + } + + /// <summary> + /// 閫�鍑虹櫥褰曟搷浣� + /// </summary> + public void CheckLogout() + { +#if DEBUG + return; +#endif + //鏈櫥褰曚笉鐢ㄥ鐞� + if (!UserInfo.Current.IsLogin) return; + + Logout(); + } + + /// <summary> + /// 閫�鍑虹櫥褰曟搷浣� + /// </summary> + public void Logout() + { + new System.Threading.Thread(() => + { + try + { + #region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す + //string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString()); + ////娓呯┖涔嬪墠鐨勪綇瀹呮枃浠� + //FileUtils.DeleteRegionFiles(oldRegionRootPath); + //var backuplist = FileUtils.ReadFiles(); + ////绉诲姩鏂囦欢 + //foreach (var fileName in backuplist) + //{ + // System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName); + // if (fileInfo.Exists) + // { + // fileInfo.MoveTo(oldRegionRootPath + fileName); + // MainPage.Log("move file : " + fileName); + // } + //} + #endregion + } + catch (Exception ex) + { + MainPage.Log($"xxx:{ex.Message}"); + } + finally + { + //FileUtils.DeleteAllFile(); + //2.娉ㄩ攢鎺ㄩ�� + new HttpServerRequest().SignOutPush(); + //3.璺宠浆鐧诲綍椤甸潰 + UserInfo.Current.LastTime = DateTime.MinValue; + UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚 + UserInfo.Current.SaveUserInfo(); + Shared.Application.RunOnMainThread(() => + { + MainPage.GoLoginPage(UserInfo.Current); + DB_ResidenceData.residenceData.EixtAccount(); + }); + } + }).Start(); + } + + #endregion + + #region 鈻� 甯哥敤鏂规硶_______________________ + /// <summary> + /// 璁剧疆涓嬪垝绾挎寜閽姸鎬� + /// 缁熶竴灏佽璁剧疆鏂规硶 + /// </summary> + /// <param name="button">涓嬪垝绾挎寜閽�</param> + /// <param name="bottomLineType">鐘舵��</param> + public void BottomLineShowType(Button button, BottomLineType bottomLineType) + { + switch (bottomLineType) + { + case BottomLineType.GotFocus: + button.BackgroundColor = CSS_Color.MainColor; + button.Height = Application.GetRealHeight(2); + break; + case BottomLineType.Error: + button.BackgroundColor = CSS_Color.AuxiliaryColor2; + button.Height = Application.GetRealHeight(2); + break; + case BottomLineType.Normal: + button.BackgroundColor = CSS_Color.DividingLineColor; + button.Height = Application.GetRealHeight(1); + break; + default: + button.BackgroundColor = CSS_Color.DividingLineColor; + button.Height = Application.GetRealHeight(1); + break; + } + } + #endregion } } -- Gitblit v1.8.0