From 8ca1dfcb2e9247e85c0a6f13f8f081f089075672 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Mon, 11 Aug 2025 10:42:06 +0800 Subject: [PATCH] =?UTF-8?q?202508081823=20Env=20=E5=8A=A0=E5=85=A5=20sshos?= =?UTF-8?q?t1=20PlayState.Skipped=20=E8=AA=BF=E6=95=B4=20=E7=82=BA=20?= =?UTF-8?q?=E5=88=AA=E9=99=A4=20=E6=89=8B=E5=8A=83=E5=88=B0=E9=81=B8?= =?UTF-8?q?=E5=96=AE=E4=B8=8A=E4=B8=8D=E9=A1=AF=E7=A4=BA=E9=A1=8F=E8=89=B2?= =?UTF-8?q?=20=E5=B7=B2=E9=BB=9E=E6=AD=8C=E6=9B=B2=E4=B8=8D=E6=9C=83?= =?UTF-8?q?=E5=88=AA=E9=99=A4=20=E8=80=8C=E7=A7=BB=E5=88=B0=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DBObj/SongData.cs | 21 +++++-------------- DBObj/SongList.cs | 4 ++-- Env.cs | 1 + PlayState.cs | 2 +- .../PrimaryForm.MultiPagePanel.cs | 6 +++--- Program.cs | 2 +- 6 files changed, 13 insertions(+), 23 deletions(-) diff --git a/DBObj/SongData.cs b/DBObj/SongData.cs index 0ffadde..5225671 100644 --- a/DBObj/SongData.cs +++ b/DBObj/SongData.cs @@ -103,22 +103,11 @@ namespace DBObj } public Color GetStateColor(){ Color c = Color.White; - if (state == PlayState.Played) - { - c = Color.Gray;//Color.FromArgb(200, 75, 125); // 播畢顏色：紫紅色 - } - else if (state == PlayState.NoFile) - { - c = Color.Gray; - } - else if (state == PlayState.Playing) - { - c = Color.LimeGreen; - } - else if (state == PlayState.InsertPlayback) - { - c = Color.Gold; - } + if (state == PlayState.Played) c = Color.Gray;//Color.FromArgb(200, 75, 125); // 播畢顏色：紫紅色 + else if (state == PlayState.Skipped)c = Color.Gray; + else if (state == PlayState.NoFile)c = Color.Gray; + else if (state == PlayState.Playing)c = Color.LimeGreen; + else if (state == PlayState.InsertPlayback)c = Color.Gold; return c; } public string GetStateTxt(bool IsSimplified){ diff --git a/DBObj/SongList.cs b/DBObj/SongList.cs index b26f30a..02542ea 100644 --- a/DBObj/SongList.cs +++ b/DBObj/SongList.cs @@ -103,8 +103,8 @@ namespace DBObj public static void Cancel(SongData song) { not_played.Remove(song); - played.Remove(song); - chkCut(); + song.SetState(PlayState.Skipped); + played.Add(song); } public static void Insert(SongData song) diff --git a/Env.cs b/Env.cs index f280a94..707a4be 100644 --- a/Env.cs +++ b/Env.cs @@ -10,6 +10,7 @@ namespace Utils private static readonly List KtvPaths = new() { @"\\sshost\KTVSuperstar", + @"\\sshost1\KTVSuperstar", @"\\pc101\KTVSuperstar" }; diff --git a/PlayState.cs b/PlayState.cs index eb45d89..a3ee173 100644 --- a/PlayState.cs +++ b/PlayState.cs @@ -19,7 +19,7 @@ namespace DualScreenDemo [LocalizedDescription("無文件", "无文件")] NoFile, - [LocalizedDescription("已跳過", "已跳过")] + [LocalizedDescription("刪除", "删除")] Skipped } diff --git a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs index 77d5d9d..e0bdfbf 100644 --- a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs +++ b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs @@ -333,7 +333,7 @@ namespace DualScreenDemo EventHandler mouseEnter = (sender, e) => { // 變更歌手名稱為黃色 - artistLabel.ForeColor = Color.Yellow; + //artistLabel.ForeColor = Color.Yellow; // 增強分隔線的亮度，使其更明顯 separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255); @@ -522,8 +522,8 @@ namespace DualScreenDemo // 定義滑鼠進入 (MouseEnter) 事件的處理程序 EventHandler mouseEnter = (sender, e) => { - songLabel.ForeColor = Color.Yellow; - artistLabel.ForeColor = Color.Yellow; + //songLabel.ForeColor = Color.Yellow; + //artistLabel.ForeColor = Color.Yellow; separatorPanel.BackColor = Color.FromArgb(120, 255, 255, 255); }; diff --git a/Program.cs b/Program.cs index bea569b..f813674 100644 --- a/Program.cs +++ b/Program.cs @@ -13,7 +13,7 @@ namespace DualScreenDemo private static PrimaryForm primaryForm; // 儲存實例的參考 public static Room room = new Room(); - public static string verSion = "Server V2.8 202508081600"; + public static string verSion = "Server V2.8 202508081823"; [STAThread] static void Main()