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 | 153 +++++++++++++++++++++++++++++++--------------------
1 files changed, 93 insertions(+), 60 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 5d7cf4d..963549a 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -69,7 +69,7 @@
#endregion
- #region 妫�娴嬫洿鏂�
+ #region 鈻� 妫�娴嬫洿鏂癬______________________
/// <summary>
/// 妫�娴嬫洿鏂扮嚎绋�
/// </summary>
@@ -223,22 +223,22 @@
#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);
- }
- }
+ ///// <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 鎺ㄩ�佸鐞�
+ #region 鈻� 鎺ㄩ�佸鐞哶______________________
/// <summary>
/// 鎺ㄩ�佹秷鎭鐞�
/// </summary>
@@ -253,8 +253,8 @@
{
//璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- //2020-12-04 寰呭鍔犻��鍑虹櫥褰曟搷浣�
- Logout();
+ //閫�鍑虹櫥褰曟搷浣�
+ CheckLogout();
});
return;
}
@@ -265,7 +265,6 @@
new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
});
return;
-
}
}
catch
@@ -277,62 +276,96 @@
/// <summary>
/// 閫�鍑虹櫥褰曟搷浣�
/// </summary>
+ public void CheckLogout()
+ {
+#if DEBUG
+ return;
+#endif
+ //鏈櫥褰曚笉鐢ㄥ鐞�
+ if (!UserInfo.Current.IsLogin) return;
+
+ Logout();
+ }
+
+ /// <summary>
+ /// 閫�鍑虹櫥褰曟搷浣�
+ /// </summary>
public void Logout()
{
- try
+ new System.Threading.Thread(() =>
{
- //鏈櫥褰曚笉鐢ㄥ鐞�
- if (!UserInfo.Current.IsLogin) return;
-
- Shared.Application.RunOnMainThread(() =>
+ try
{
#region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す
- string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- new System.Threading.Thread(() =>
- {
- try
- {
- var backuplist = FileUtils.ReadFiles();
- FileUtils.DeleteRegionFiles(oldRegionRootPath);
- //绉诲姩鏂囦欢
- 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);
- }
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"xxx:{ex.Message}");
- }
- finally
- {
- FileUtils.DeleteAllFile();
- }
- }).Start();
+ //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
-
- ////2.娉ㄩ攢鎺ㄩ��
+ }
+ 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();
- MainPage.GoLoginPage(UserInfo.Current);
- DB_ResidenceData.residenceData.EixtAccount();
- });
+ Shared.Application.RunOnMainThread(() =>
+ {
+ MainPage.GoLoginPage(UserInfo.Current);
+ DB_ResidenceData.residenceData.EixtAccount();
+ });
+ }
+ }).Start();
+ }
- }
- catch (Exception ex)
+ #endregion
+
+ #region 鈻� 甯哥敤鏂规硶_______________________
+ /// <summary>
+ /// 璁剧疆涓嬪垝绾挎寜閽姸鎬�
+ /// 缁熶竴灏佽璁剧疆鏂规硶
+ /// </summary>
+ /// <param name="button">涓嬪垝绾挎寜閽�</param>
+ /// <param name="bottomLineType">鐘舵��</param>
+ public void BottomLineShowType(Button button, BottomLineType bottomLineType)
+ {
+ switch (bottomLineType)
{
- MainPage.Log($"xxx:{ex.Message}");
+ 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