From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01

---
 HDL_ON/Common/Utlis.cs |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
old mode 100755
new mode 100644
index a0d84c0..13a4af0
--- 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);
@@ -60,8 +61,10 @@
 		public static string PhoneForForeignRegexStr = "^[0-9]*$";
 		/// <summary>
 		/// 鐢ㄤ簬楠岃瘉閭姝e垯琛ㄨ揪寮�
+        /// 2021-10-21 11:07:44  鍚屾浜戠姝e垯鏍煎紡 --wxr
 		/// </summary>
-		public static string EmailRegexStr = "^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$";
+		public static string EmailRegexStr = "^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\\.[a-zA-Z0-9-]+)*\\.[a-zA-Z0-9]{2,6}$";
+		//public static string EmailRegexStr = "^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$";
 
 		/// <summary>
 		/// 鍒ゆ柇鏄惁鍖呭惈澶у啓瀛楁瘝
@@ -240,19 +243,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 +276,7 @@
 		}
 
 		/// <summary>
-        /// 
+        /// 鏃堕棿鎴宠浆鏃堕棿瀛楃涓�
         /// </summary>
         /// <param name="unixTimeStamp"></param>
         /// <param name="format"></param>
@@ -303,10 +305,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