From dc840e2d67654781ebc9c7640e6c44a63a6d04d0 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 11 十二月 2020 09:44:37 +0800 Subject: [PATCH] 2020-12-11 1.注册、忘记密码、重置密码、点击返回到时候屏蔽检测错误提示。底部按钮使能效果优化修改。邮箱变密码输入问题修复。2.网络请求底层增加token过期检测刷新方法。3.更新控件库,iOS EditText取消默认密码输入方式。 --- HDL_ON/Common/HDLCommon.cs | 130 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index 111a589..7656e26 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> @@ -237,7 +238,134 @@ } } + #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