Leecheng/superstar_v2
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新歌庫查詢方式

Browse Source
This commit is contained in:
jasonchenwork 2025-05-20 16:16:27 +08:00
parent 34b73c3513
commit 656f773ec7
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OverlayFormObj/OverlayForm.cs
View File

@ -1074,7 +1074,7 @@ private static void SongDisplayTimer_Elapsed(object sender, EventArgs e)
currentLanguage = "粵語"; currentLanguage = "粵語";
break; break;
case 4: case 4:
currentLanguage = "英文"; currentLanguage = "英語";
break; break;
case 5: case 5:
currentLanguage = "日語"; currentLanguage = "日語";

4
PrimaryFormParts/GroupSearch/PrimaryForm.GroupSearch.YingYu.cs
View File

@ -11,10 +11,10 @@ namespace DualScreenDemo
groupRiYuButton.BackgroundImage = groupRiYuNormalBackground; groupRiYuButton.BackgroundImage = groupRiYuNormalBackground;
groupHanYuButton.BackgroundImage = groupHanYuNormalBackground; 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) .OrderByDescending(song => song.Plays)
.ToList();*/ .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); var yingWenSongs = SearchSongs_Mysql(query);
currentPage = 0; currentPage = 0;
currentSongList = yingWenSongs; currentSongList = yingWenSongs;

2
PrimaryFormParts/HotSong/PrimaryForm.HotSongEnglish.cs
View File

@ -4,7 +4,7 @@ namespace DualScreenDemo
{ {
private void YingWenButtonHotSong_Click(object sender, EventArgs e) private void YingWenButtonHotSong_Click(object sender, EventArgs e)
{ {
OnHotSongButtonClick(yingWenButtonHotSong, yingWenHotSongActiveBackground, "英文"); OnHotSongButtonClick(yingWenButtonHotSong, yingWenHotSongActiveBackground, "英語");
} }
} }
} }

2
PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.YingWen.cs
View File

@ -10,7 +10,7 @@ namespace DualScreenDemo
private void YingWenButton_Click(object sender, EventArgs e) private void YingWenButton_Click(object sender, EventArgs e)
{ {
OnLanguageButtonClick(yingWenButton, yingWenActiveBackground, "英文"); OnLanguageButtonClick(yingWenButton, yingWenActiveBackground, "英語");
} }
} }
} }

4
PrimaryFormParts/NewSongAlert/PrimaryForm.NewSongAlertEnglish.cs
View File

@ -13,11 +13,11 @@ namespace DualScreenDemo
int songLimit = ReadNewSongLimit(); int songLimit = ReadNewSongLimit();
/*yingWenSongs2 = allSongs.Where(song => song.Category == "英文") /*yingWenSongs2 = allSongs.Where(song => song.Category == "英語")
.OrderByDescending(song => song.AddedTime) .OrderByDescending(song => song.AddedTime)
.Take(songLimit) .Take(songLimit)
.ToList();*/ .ToList();*/
string query = setQueryforNewSong("英文"); string query = setQueryforNewSong("英語");
var yingWenSongs2 = SearchSongs_Mysql(query); var yingWenSongs2 = SearchSongs_Mysql(query);
currentPage = 0; currentPage = 0;

4
PrimaryFormParts/PrimaryForm.SQLSearch.cs
View File

@ -36,8 +36,8 @@ namespace DualScreenDemo{
string artistA = reader["artistA"].ToString(); string artistA = reader["artistA"].ToString();
string artistB = reader["artistB"].ToString(); string artistB = reader["artistB"].ToString();
string fileName = reader["song_filename"].ToString(); string fileName = reader["song_filename"].ToString();
string songFilePathHost1 = Path.Combine(@"\\SVR01\DISK05", fileName); // \SVR01\DISK01\ string songFilePathHost1 = Path.Combine(@"\\SVR01\", fileName);
string songFilePathHost2 = Path.Combine(@"\\SVR02\DISK01", fileName); // \SVR02\DISK01\ string songFilePathHost2 = Path.Combine(@"\\SVR02\", fileName);
string artistASimplified = reader["artistA_simplified"].ToString(); string artistASimplified = reader["artistA_simplified"].ToString();
string artistBSimplified = reader["artistB_simplified"].ToString(); string artistBSimplified = reader["artistB_simplified"].ToString();
string songSimplified = reader["song_simplified"].ToString(); string songSimplified = reader["song_simplified"].ToString();