From 1a13c963a5fb8cad92bf03667e411f46d6a6a843 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:10:33 +0800
Subject: [PATCH] Revert "Merge branch 'tzy' into NewFilePath"

---
 HDL_ON/Common/Utlis.cs |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
index 51066b8..62cb24e 100644
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -8,7 +8,7 @@
     /// <summary>
     /// 甯哥敤宸ュ叿绫�
     /// </summary>
-    public class Utlis
+    public static class Utlis
     {
 		/// <summary>
 		/// 鍏ㄥ眬鎵撳嵃
@@ -328,7 +328,55 @@
 			return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
 		}
 
-		
+
+		#region 鏃堕棿鏍煎紡杞崲
+		private const int Second = 1;
+		private const int Minute = 60 * Second;
+		private const int Hour = 60 * Minute;
+		private const int Day = 24 * Hour;
+		private const int Month = 30 * Day;
+
+		/// <summary>
+		/// 鏃堕棿杞崲
+		/// 灏戜簬1澶�  鏄剧ず 鏃跺垎
+		/// 灏戜簬涓�骞� 鏄剧ず 鏈堟棩
+		/// 澶т簬涓�骞� 鏄剧ず 骞�
+		/// </summary>
+		/// <param name="dateTime"></param>
+		/// <returns></returns>
+		public static string ToFriendlyDisplay(this DateTime dateTime)
+		{
+			var ts = DateTime.Now - dateTime;
+			var delta = ts.TotalSeconds;
+			if (delta < 24 * Hour)
+			{
+				//鏄剧ず 鏃�:鍒�
+				return dateTime.ToString("HH:mm");
+			}
+			else if (delta < 12 * Month)
+			{
+				//鏄剧ず 鏈�:鏃�
+				return dateTime.ToString("MM/dd");
+			}
+			else
+			{   //鏄剧ず 骞�
+				return dateTime.ToString("yyyy");
+			}
+		}
+		/// <summary>
+		/// 鏃堕棿杞崲
+		/// 灏戜簬1澶�  鏄剧ず 鏃跺垎
+		/// 灏戜簬涓�骞� 鏄剧ず 鏈堟棩
+		/// 澶т簬涓�骞� 鏄剧ず 骞�
+		/// </summary>
+		/// <param name="dateTime"></param>
+		/// <returns></returns>
+		public static string ToFriendlyDisplay(long unixTimeStamp)
+		{
+			return ToFriendlyDisplay(UnixToDateTimeMS(unixTimeStamp));
+		}
+		#endregion
+
 	}
 
 

--
Gitblit v1.8.0