20201219-99

wei

2020-12-19 d6aec3027ebec50e1096af7da19d03b1e5f5bea4

 HDL_ON/Common/Utlis.cs

old mode 100755
new mode 100644
@@ -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)); // 当地时区