zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 重命名UTC1970/1/1为Jan1st1970

Browse Source
This commit is contained in:
Sunny 2020-09-23 21:14:37 +08:00
parent 3b1a5b6649
commit e281846a3e
8 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/SunnyUI.pdb
View File

Binary file not shown.

BIN
SunnyUI.Demo/Bin/SunnyUI.dll
View File

Binary file not shown.

4
SunnyUI/Controls/UIDatePicker.cs
View File

@ -93,8 +93,8 @@ namespace Sunny.UI
get => item.Date; get => item.Date;
set set
{ {
if (value < DateTimeEx.DateTimeBegin) if (value < DateTimeEx.Jan1st1970)
value = DateTimeEx.DateTimeBegin; value = DateTimeEx.Jan1st1970;
Text = value.ToString(dateFormat); Text = value.ToString(dateFormat);
item.Date = value; item.Date = value;
} }

4
SunnyUI/Controls/UIDateTimePicker.cs
View File

@ -113,8 +113,8 @@ namespace Sunny.UI
get => item.Date; get => item.Date;
set set
{ {
if (value < DateTimeEx.DateTimeBegin) if (value < DateTimeEx.Jan1st1970)
value = DateTimeEx.DateTimeBegin; value = DateTimeEx.Jan1st1970;
Text = value.ToString(dateFormat); Text = value.ToString(dateFormat);
item.Date = value; item.Date = value;
} }

13
SunnyUI/Static/UDateTime.cs
View File

@ -249,18 +249,13 @@ namespace Sunny.UI
/// <returns>浮点</returns> /// <returns>浮点</returns>
public static double ToDouble(this DateTime datetime) public static double ToDouble(this DateTime datetime)
{ {
return datetime.Subtract(DateTimeBegin).TotalDays; return datetime.Subtract(Jan1st1970).TotalDays;
} }
/// <summary> /// <summary>
/// 起始日期，UTC时间，1970-01-01 00：00：00起始 /// 起始日期，UTC时间，1970-01-01 00：00：00起始
/// </summary> /// </summary>
public static DateTime DateTimeBegin = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); public static DateTime Jan1st1970 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
/// <summary>
/// 日期最大值
/// </summary>
public static DateTime DateTimeEnd = new DateTime(9999, 12, 31, 23, 59, 59, 999, DateTimeKind.Utc);
/// <summary> /// <summary>
/// 浮点转时间日期，以UTC时间，1970-01-01 00：00：00起始 /// 浮点转时间日期，以UTC时间，1970-01-01 00：00：00起始
@ -269,7 +264,7 @@ namespace Sunny.UI
/// <returns>日期</returns> /// <returns>日期</returns>
public static DateTime ToDateTime(this double iDays) public static DateTime ToDateTime(this double iDays)
{ {
return TimeZone.CurrentTimeZone.ToLocalTime(DateTimeBegin.AddDays(iDays)); return TimeZone.CurrentTimeZone.ToLocalTime(Jan1st1970.AddDays(iDays));
} }
/// <summary> /// <summary>
@ -444,7 +439,7 @@ namespace Sunny.UI
/// </remarks> /// </remarks>
public static long SecondsSince1970(this DateTime datetime) public static long SecondsSince1970(this DateTime datetime)
{ {
TimeSpan ts = datetime.ToUniversalTime().Subtract(DateTimeBegin); TimeSpan ts = datetime.ToUniversalTime().Subtract(Jan1st1970);
return (long)ts.TotalSeconds; return (long)ts.TotalSeconds;
} }

2
SunnyUI/Units/UDateTimeInt64.cs
View File

@ -7,7 +7,7 @@ namespace Sunny.UI
public long Value { get; set; } public long Value { get; set; }
public const long Jan1st1970Ticks = 621355968000000000; //Jan1st1970.Ticks; public const long Jan1st1970Ticks = 621355968000000000; //Jan1st1970.Ticks;
public const long Dec31th9999Ticks = 3155378975999990000; //Dec31th9999.Ticks; public const long Dec31th9999Ticks = 3155378975999990000; //DateTime.MaxValue.Ticks;
public const string DefaultFormatString = DateTimeEx.DateTimeFormatEx; public const string DefaultFormatString = DateTimeEx.DateTimeFormatEx;
/// <summary> /// <summary>

4
SunnyUI/Units/USnowflakeID.cs
View File

@ -172,7 +172,7 @@ namespace Sunny.UI
SnowflakeIDDetail result = new SnowflakeIDDetail(); SnowflakeIDDetail result = new SnowflakeIDDetail();
result.SnowflakeID = Id; result.SnowflakeID = Id;
var timestamp = (Id >> timestampLeftShift); var timestamp = (Id >> timestampLeftShift);
var time = DateTimeEx.DateTimeBegin.AddMilliseconds(timestamp + twepoch); var time = DateTimeEx.Jan1st1970.AddMilliseconds(timestamp + twepoch);
result.DateTime = time.ToLocalTime(); result.DateTime = time.ToLocalTime();
result.DataCenterID = (Id ^ (timestamp << timestampLeftShift)) >> datacenterIdShift; result.DataCenterID = (Id ^ (timestamp << timestampLeftShift)) >> datacenterIdShift;
result.WorkerID = (Id ^ ((timestamp << timestampLeftShift) | (result.DataCenterID << datacenterIdShift))) >> workerIdShift; result.WorkerID = (Id ^ ((timestamp << timestampLeftShift) | (result.DataCenterID << datacenterIdShift))) >> workerIdShift;
@ -201,7 +201,7 @@ namespace Sunny.UI
/// <returns></returns> /// <returns></returns>
private static long GetCurrentTimestamp() private static long GetCurrentTimestamp()
{ {
return (long)(DateTime.UtcNow - DateTimeEx.DateTimeBegin).TotalMilliseconds; return (long)(DateTime.UtcNow - DateTimeEx.Jan1st1970).TotalMilliseconds;
} }
} }