From 34b73c3513d03dca0846743bb30c967f624ffe59 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Tue, 20 May 2025 14:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4query=E8=AA=9E=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs | 4 ++-- PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs | 2 +- .../HotSong/PrimaryForm.HotSongTaiwaneseNew.cs | 2 +- .../LanguageSearch/PrimaryForm.LanguageSearch.cs | 4 ++-- .../SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs | 2 +- .../PrimaryForm.SingerSearch.StrokeCountSearch.cs | 7 ------- 6 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.StrokeCountSearch.cs diff --git a/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs b/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs index c1debf7..032020f 100644 --- a/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs +++ b/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs @@ -63,7 +63,7 @@ namespace DualScreenDemo /* 清空搜尋欄 */ ResetinputBox(); int songLimit = ReadHotSongLimit(); - string query = $"SELECT * FROM song_library_cache WHERE language_name = '國語' ORDER BY `song_id` DESC LIMIT {songLimit}"; + string query = $"SELECT * FROM song_library_cache WHERE language_name = '國語' ORDER BY `song_counts` DESC LIMIT {songLimit}"; var guoYuSongs = SearchSongs_Mysql(query); UpdateSongList(guoYuSongs); @@ -92,7 +92,7 @@ namespace DualScreenDemo UpdateHotSongButtons(activeButton, activeBackground); int songLimit = ReadHotSongLimit(); - string query = $"SELECT * FROM song_library_cache WHERE language_name = '{category}' ORDER BY `song_id` DESC LIMIT {songLimit}"; + string query = $"SELECT * FROM song_library_cache WHERE language_name = '{category}' ORDER BY `song_counts` DESC LIMIT {songLimit}"; var selectedSongs = SearchSongs_Mysql(query); UpdateSongList(selectedSongs); diff --git a/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs b/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs index 13b574f..ec8712a 100644 --- a/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs +++ b/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs @@ -8,7 +8,7 @@ namespace DualScreenDemo UpdateHotSongButtons(guoYuNewSongButtonHotSong, guoYuNewSongHotSongActiveBackground); int songLimit = ReadHotSongLimit(); - string query = $"SELECT * FROM song_library_cache WHERE language_name = '國語' ORDER BY `add_date` DESC LIMIT {songLimit}"; + string query = $"SELECT * FROM song_library_cache WHERE language_name = '國語' ORDER BY `add_date` DESC, `song_counts` DESC LIMIT {songLimit}"; var selectedSongs = PrimaryForm.Instance.SearchSongs_Mysql(query); currentPage = 0; diff --git a/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs b/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs index b0751ca..a77401f 100644 --- a/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs +++ b/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs @@ -9,7 +9,7 @@ namespace DualScreenDemo int songLimit = ReadHotSongLimit(); - string query = $"SELECT * FROM song_library_cache WHERE language_name = '台語' ORDER BY `add_date` DESC LIMIT {songLimit}"; + string query = $"SELECT * FROM song_library_cache WHERE language_name = '台語' ORDER BY `add_date` DESC, `song_counts` DESC LIMIT {songLimit}"; var selectedSongs = SearchSongs_Mysql(query); currentPage = 0; diff --git a/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.cs b/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.cs index 4287281..7993566 100644 --- a/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.cs +++ b/PrimaryFormParts/LanguageSearch/PrimaryForm.LanguageSearch.cs @@ -75,7 +75,7 @@ namespace DualScreenDemo /* 清空搜尋欄 */ ResetinputBox(); - string query = $"SELECT * FROM song_library_cache WHERE language_name = '國語' ORDER BY song_id DESC LIMIT 100"; + string query = $"SELECT * FROM song_library_cache WHERE language_name = '國語' ORDER BY song_counts DESC LIMIT 100"; var guoYuSongs = SearchSongs_Mysql(query); currentPage = 0; currentSongList = guoYuSongs; @@ -123,7 +123,7 @@ namespace DualScreenDemo activeButton.BackgroundImage = activeBackground; - string query = $"SELECT * FROM song_library_cache WHERE language_name = '{category}' ORDER BY song_id DESC LIMIT 100"; + string query = $"SELECT * FROM song_library_cache WHERE language_name = '{category}' ORDER BY song_counts DESC LIMIT 100"; var selectedSongs = SearchSongs_Mysql(query); /*var selectedSongs = allSongs.Where(song => song.Category == category) .OrderByDescending(song => song.Plays) diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs index 644486f..2d2e1dd 100644 --- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs +++ b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.EnglishSearch.cs @@ -273,7 +273,7 @@ namespace DualScreenDemo string searchText = inputBoxEnglishSingers.Text; string query = string.IsNullOrWhiteSpace(searchText) ? "SELECT * FROM artists LIMIT 50;" - : $"SELECT * FROM artists WHERE `name` LIKE '{searchText}%';"; + : $"SELECT * FROM artists WHERE `name` LIKE '%{searchText}%';"; //string query = $"SELECT * FROM ArtistLibrary WHERE `歌手姓名` LIKE '{searchText}%' "; var searchResults = SearchSingers_Mysql(query); diff --git a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.StrokeCountSearch.cs b/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.StrokeCountSearch.cs deleted file mode 100644 index 3358ab9..0000000 --- a/PrimaryFormParts/SingerSearch/PrimaryForm.SingerSearch.StrokeCountSearch.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace DualScreenDemo -{ - public partial class PrimaryForm - { - - } -} \ No newline at end of file