From 34a11de7f5123ce36dc2dda6d2ab3a4670ca6bae Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Fri, 2 May 2025 10:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=BB=82=E8=99=9F=E8=AA=BF=E6=95=B4+?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=95=AB=E9=9D=A2=E6=9C=8D=E5=8B=99=E9=88=B4?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrimaryFormParts/PrimaryForm.SyncScreen.cs | 6 +++--- PrimaryFormParts/PrimaryForm.cs | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PrimaryFormParts/PrimaryForm.SyncScreen.cs b/PrimaryFormParts/PrimaryForm.SyncScreen.cs index 67d3651..78ef0d0 100644 --- a/PrimaryFormParts/PrimaryForm.SyncScreen.cs +++ b/PrimaryFormParts/PrimaryForm.SyncScreen.cs @@ -49,11 +49,11 @@ namespace DualScreenDemo - + //同步畫面 服務鈴 ConfigureButton(this.syncServiceBellButton, 1240, 17, 161, 161, resizedNormalStateImageForSyncScreen, resizedNormalStateImageForSyncScreen, resizedNormalStateImageForSyncScreen, - (sender, e) => SendCommandThroughSerialPort("a2 53 a4")); - + //(sender, e) => SendCommandThroughSerialPort("a2 53 a4")); + (sender,e)=>OnServiceBellButtonClick(sender,e)); diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs index 1b0d96c..7cbda55 100644 --- a/PrimaryFormParts/PrimaryForm.cs +++ b/PrimaryFormParts/PrimaryForm.cs @@ -370,7 +370,7 @@ namespace DualScreenDemo // 顯示包廂名稱 // 取主機名稱的最後 20 個字元 (如果長度不足 20,則取全部) - string displayName = "包廂" + hostName.Substring(Math.Max(0, hostName.Length - 20)); + string displayName = "包廂" + hostName.Substring(Math.Max(0, hostName.Length - 3)); string totalPages = multiPagePanel.totalPages.ToString() == "0" ? "1" : multiPagePanel.totalPages.ToString(); string pageNumber = (multiPagePanel.currentPageIndex + 1).ToString() + "/" + totalPages; @@ -3321,6 +3321,7 @@ public class MultiPagePanel : Panel private bool isWaiting = false; + // 服務鈴事件 private async void OnServiceBellButtonClick(object sender, EventArgs e) { if (isWaiting) return; @@ -3499,7 +3500,7 @@ public class MultiPagePanel : Panel float scaledFontSize = 84f * scaleY; string hostName = System.Net.Dns.GetHostName(); - string displayName = "包廂" + hostName.Substring(Math.Max(0, hostName.Length - 20)); + string displayName = "包廂" + hostName.Substring(Math.Max(0, hostName.Length - 3)); using (Font font = new Font("微軟正黑體", scaledFontSize, FontStyle.Bold)) using (Brush brush = new SolidBrush(Color.Red))