From 656f773ec71199d1548c660bac870626d7a774de Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Tue, 20 May 2025 16:16:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=AD=8C=E5=BA=AB=E6=9F=A5?= =?UTF-8?q?=E8=A9=A2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OverlayFormObj/OverlayForm.cs | 2 +- .../GroupSearch/PrimaryForm.GroupSearch.YingYu.cs | 4 ++-- PrimaryFormParts/HotSong/PrimaryForm.HotSongEnglish.cs | 2 +- .../LanguageSearch/PrimaryForm.LanguageSearch.YingWen.cs | 2 +- .../NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs | 4 ++-- PrimaryFormParts/PrimaryForm.SQLSearch.cs | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OverlayFormObj/OverlayForm.cs b/OverlayFormObj/OverlayForm.cs index 50ab165..16f47a7 100644 --- a/OverlayFormObj/OverlayForm.cs +++ b/OverlayFormObj/OverlayForm.cs @@ -1074,7 +1074,7 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e) currentLanguage = "粵語"; break; case 4: - currentLanguage = "英文"; + currentLanguage = "英語"; break; case 5: currentLanguage = "日語"; diff --git a/PrimaryFormParts/GroupSearch/PrimaryForm.GroupSearch.YingYu.cs b/PrimaryFormParts/GroupSearch/PrimaryForm.GroupSearch.YingYu.cs index cca8e17..cf9a18b 100644 --- a/PrimaryFormParts/GroupSearch/PrimaryForm.GroupSearch.YingYu.cs +++ b/PrimaryFormParts/GroupSearch/PrimaryForm.GroupSearch.YingYu.cs @@ -11,10 +11,10 @@ namespace DualScreenDemo groupRiYuButton.BackgroundImage = groupRiYuNormalBackground; groupHanYuButton.BackgroundImage = groupHanYuNormalBackground; - /*yingWenSongs = allSongs.Where(song => song.Category == "英文" && (song.ArtistACategory == "團" || song.ArtistBCategory == "團")) + /*yingWenSongs = allSongs.Where(song => song.Category == "英語" && (song.ArtistACategory == "團" || song.ArtistBCategory == "團")) .OrderByDescending(song => song.Plays) .ToList();*/ - string query = "SELECT * FROM song_library_cache WHERE language_name = '英文' AND (`artistA_category` = '團' OR `artistB_category` = '團') ORDER BY song_id DESC"; + string query = "SELECT * FROM song_library_cache WHERE language_name = '英語' AND (`artistA_category` = '團' OR `artistB_category` = '團') ORDER BY song_id DESC"; var yingWenSongs = SearchSongs_Mysql(query); currentPage = 0; currentSongList = yingWenSongs; diff --git a/PrimaryFormParts/HotSong/PrimaryForm.HotSongEnglish.cs b/PrimaryFormParts/HotSong/PrimaryForm.HotSongEnglish.cs index ef9dd8f..99a2049 100644 --- a/PrimaryFormParts/HotSong/PrimaryForm.HotSongEnglish.cs +++ b/PrimaryFormParts/HotSong/PrimaryForm.HotSongEnglish.cs @@ -4,7 +4,7 @@ namespace DualScreenDemo { private void YingWenButtonHotSong_Click(object sender, EventArgs e) { - OnHotSongButtonClick(yingWenButtonHotSong, yingWenHotSongActiveBackground, "英文"); + OnHotSongButtonClick(yingWenButtonHotSong, yingWenHotSongActiveBackground, "英語"); } } } \ No newline at end of file diff --git a/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.YingWen.cs b/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.YingWen.cs index 877c7a3..fc61613 100644 --- a/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.YingWen.cs +++ b/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.YingWen.cs @@ -10,7 +10,7 @@ namespace DualScreenDemo private void YingWenButton_Click(object sender, EventArgs e) { - OnLanguageButtonClick(yingWenButton, yingWenActiveBackground, "英文"); + OnLanguageButtonClick(yingWenButton, yingWenActiveBackground, "英語"); } } } \ No newline at end of file diff --git a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs index 4a3b963..7126385 100644 --- a/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs +++ b/PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs @@ -13,11 +13,11 @@ namespace DualScreenDemo int songLimit = ReadNewSongLimit(); - /*yingWenSongs2 = allSongs.Where(song => song.Category == "英文") + /*yingWenSongs2 = allSongs.Where(song => song.Category == "英語") .OrderByDescending(song => song.AddedTime) .Take(songLimit) .ToList();*/ - string query = setQueryforNewSong("英文"); + string query = setQueryforNewSong("英語"); var yingWenSongs2 = SearchSongs_Mysql(query); currentPage = 0; diff --git a/PrimaryFormParts/PrimaryForm.SQLSearch.cs b/PrimaryFormParts/PrimaryForm.SQLSearch.cs index 462b751..3857f33 100644 --- a/PrimaryFormParts/PrimaryForm.SQLSearch.cs +++ b/PrimaryFormParts/PrimaryForm.SQLSearch.cs @@ -36,8 +36,8 @@ namespace DualScreenDemo{ string artistA = reader["artistA"].ToString(); string artistB = reader["artistB"].ToString(); string fileName = reader["song_filename"].ToString(); - string songFilePathHost1 = Path.Combine(@"\\SVR01\DISK05", fileName); // \SVR01\DISK01\ - string songFilePathHost2 = Path.Combine(@"\\SVR02\DISK01", fileName); // \SVR02\DISK01\ + string songFilePathHost1 = Path.Combine(@"\\SVR01\", fileName); + string songFilePathHost2 = Path.Combine(@"\\SVR02\", fileName); string artistASimplified = reader["artistA_simplified"].ToString(); string artistBSimplified = reader["artistB_simplified"].ToString(); string songSimplified = reader["song_simplified"].ToString();