From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 21 deletions(-) diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs index 30afa04..1796050 100644 --- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs +++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Threading; using HDL_ON.DAL.Server; -#if DEBUG -using Xamarin.Essentials; -#endif +//#if DEBUG +//using Xamarin.Essentials; +//#endif namespace HDL_ON.UI { /// <summary> @@ -124,10 +124,10 @@ //娴嬭瘯鎻愬墠褰撳墠鎺ㄩ�両D allMenuButton.ImageButton.MouseLongEventHandler = (sender, e) => { -#if DEBUG +//#if DEBUG - CopyToClipboard("鎺ㄩ�両D锛�" + OnAppConfig.Instance.PushId); -#else +// CopyToClipboard("鎺ㄩ�両D锛�" + OnAppConfig.Instance.PushId); +//#else //妫�娴嬫槸鍚﹁幏鍙栨帹閫両D鎴愬姛锛屾彁绀烘帹閫佹敞鍐屾槸鍚︽甯� if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) { @@ -137,7 +137,7 @@ { Utlis.ShowTip(Language.StringByID(StringId.PushNormal)); } -#endif +//#endif }; #endregion @@ -378,9 +378,9 @@ //鏃ユ湡 var btnDatetime = new Button() { - X = Application.GetRealWidth(259), + X = Application.GetRealWidth(249), Y = btnTilte.Bottom + Application.GetRealHeight(4), - Width = Application.GetRealWidth(100), + Width = Application.GetRealWidth(110), Height = Application.GetRealHeight(17), TextAlignment = TextAlignment.CenterRight, TextColor = CSS_Color.PromptingColor1, @@ -406,7 +406,7 @@ }; - btnDatetime.Text = GetUnixToDateTime(pushMessageInfo.createTime); + btnDatetime.Text = GetUnixToDateTime2(pushMessageInfo.createTime); EventHandler<MouseEventArgs> eventHandler = (sender, e) => { @@ -430,6 +430,23 @@ try { return Utlis.UnixToDateTimeWithFormatMS(time, "MM/dd HH:mm"); + } + catch (Exception ex) + { + return ""; + } + } + + /// <summary> + /// 鏃堕棿鏍煎紡杞崲澶勭悊 + /// </summary> + /// <param name="time">姣鏃堕棿鎴�</param> + /// <returns></returns> + string GetUnixToDateTime2(long time) + { + try + { + return Utlis.UnixToDateTimeWithFormatMS(time, "yyyy.MM.dd HH:mm"); } catch (Exception ex) { @@ -847,18 +864,18 @@ HDLCommon.GetPushMessageAction = null; } -#if DEBUG +//#if DEBUG - /// <summary> - /// 澶嶅埗鍒板壀鍒囨澘 - /// </summary> - /// <param name="text"></param> - void CopyToClipboard(string text) - { - Clipboard.SetTextAsync(text); - Utlis.ShowTip(text + "\n" + Language.StringByID(StringId.CopySuccess)); - } -#endif +// /// <summary> +// /// 澶嶅埗鍒板壀鍒囨澘 +// /// </summary> +// /// <param name="text"></param> +// void CopyToClipboard(string text) +// { +// Clipboard.SetTextAsync(text); +// Utlis.ShowTip(text + "\n" + Language.StringByID(StringId.CopySuccess)); +// } +//#endif } -- Gitblit v1.8.0