From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/Common/Utlis.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
old mode 100755
new mode 100644
index a0d84c0..37e1aa8
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -42,6 +42,7 @@
{
Text = mes,
CloseTime = closeTime,
+ MaxWidth = Application.GetRealWidth(300),
Direction = AMPopTipDirection.None
};
tip.Show(MainPage.BaseView);
@@ -240,19 +241,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>
@@ -274,7 +274,7 @@
}
/// <summary>
- ///
+ /// 鏃堕棿鎴宠浆鏃堕棿瀛楃涓�
/// </summary>
/// <param name="unixTimeStamp"></param>
/// <param name="format"></param>
@@ -303,10 +303,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)); // 褰撳湴鏃跺尯
--
Gitblit v1.8.0