From 305f57840fff5b7cb1914b35c56eaece618711e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 14 一月 2021 17:06:36 +0800
Subject: [PATCH] 2021-01-14 1. 修改判断当前值是否需要参与签名方法，保持跟云端一致
---
HDL_ON/Common/Utlis.cs | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
index 69935f3..e2c5604 100644
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -240,19 +240,18 @@
return abc;
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="unixTimeStamp"></param>
- /// <returns></returns>
- public static DateTime UnixToDateTime(long unixTimeStamp)
+ /// <summary>
+ /// 鑾峰彇鏃堕棿鎴筹紙ss锛�
+ /// </summary>
+ /// <param name="unixTimeStamp"></param>
+ /// <returns></returns>
+ public static DateTime UnixToDateTime(long unixTimeStamp)
{
DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
return startTime.AddSeconds(unixTimeStamp);
}
/// <summary>
- ///
/// </summary>
/// <param name="unixTimeStamp"></param>
/// <returns></returns>
@@ -303,10 +302,10 @@
}
/// <summary>
- ///
- /// </summary>
- /// <param name="isMilliseconds">鏄惁寰</param>
- /// <returns></returns>
+ /// 鑾峰彇鏃堕棿鎴筹紙s锛�
+ /// </summary>
+ /// <param name="isMilliseconds">鏄惁寰</param>
+ /// <returns></returns>
public static string GetTimestamp(bool isMilliseconds = true)
{
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
@@ -336,6 +335,33 @@
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 < Day)
+ // {
+ // //鏄剧ず 鏃�:鍒�
+ // return dateTime.ToString("HH:mm");
+ // }
+ // else if (delta < 12 * Month)
+ // {
+ // //鏄剧ず 鏈�:鏃�
+ // return dateTime.ToString("MM/dd");
+ // }
+ // else
+ // { //鏄剧ず 骞�
+ // return dateTime.ToString("yyyy");
+ // }
+ //}
/// <summary>
/// 鏃堕棿杞崲
/// 灏戜簬1澶� 鏄剧ず 鏃跺垎
@@ -346,23 +372,42 @@
/// <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
- { //鏄剧ず 骞�
+ var nowDateTime = DateTime.Now;
+ var subYear = nowDateTime.Year - dateTime.Year;
+ var subMonth = nowDateTime.Month - dateTime.Month;
+ var subDay = nowDateTime.Day - dateTime.Day;
+
+ //骞翠唤宸�煎ぇ浜�0
+ if(subYear > 0)
+ {
+ //鏄剧ず 骞�
return dateTime.ToString("yyyy");
- }
+ }
+ else
+ {
+ //鐩稿悓骞翠唤锛屾湀浠藉樊鍊煎ぇ浜�0
+ if (subMonth > 0)
+ {
+ //鏄剧ず 鏈�:鏃�
+ return dateTime.ToString("MM/dd");
+ }
+ else
+ {
+ //鐩稿悓鏈堜唤锛屾棩鏈熷樊鍊煎ぇ浜�0
+ if (subDay > 0)
+ {
+ //鏄剧ず 鏈�:鏃�
+ return dateTime.ToString("MM/dd");
+ }
+ else
+ {
+ //鍚屼竴澶╂樉绀� 鏃�:鍒�
+ return dateTime.ToString("HH:mm");
+ }
+ }
+ }
}
+
/// <summary>
/// 鏃堕棿杞崲
/// 灏戜簬1澶� 鏄剧ず 鏃跺垎
--
Gitblit v1.8.0