From c5a93a08289a1479021907730a9cff67376e8598 Mon Sep 17 00:00:00 2001 From: jasonchenwork Date: Fri, 2 May 2025 10:29:50 +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 --- HttpServer.cs | 41 ++++++++++++---------- PrimaryFormParts/PrimaryForm.SyncScreen.cs | 5 +-- PrimaryFormParts/PrimaryForm.cs | 7 ++-- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/HttpServer.cs b/HttpServer.cs index a4bc583..3aaa076 100644 --- a/HttpServer.cs +++ b/HttpServer.cs @@ -1059,40 +1059,43 @@ namespace DualScreenDemo // 启动服务器的公共方法 private static async Task HandleFavoriteRequest(HttpListenerContext context) { - /* try + try { - if (PrimaryForm.isPhoneNumberValid && !string.IsNullOrEmpty(PrimaryForm.phonenumber)) + if (PrimaryForm.isPhoneNumberValid && !string.IsNullOrEmpty(PrimaryForm.Instance.userPhone)) { - string phone = PrimaryForm.phonenumber; // 直接通过类名访问 + //string phone = PrimaryForm.phonenumber; // 直接通过类名访问 // 登录用户 - SongListManager.Instance.UserLogin(phone); + //SongListManager.Instance.UserLogin(phone); // 获取用户的收藏歌曲 - var favoriteSongs = SongListManager.Instance.GetFavoriteSongsByPhoneNumber(); - + var favoriteSongs=new List(); //= SongListManager.Instance.GetFavoriteSongsByPhoneNumber(); + + string query =PrimaryForm.Instance.SearchFavoriteSongs_Mysql(); + var searchResults = PrimaryForm.Instance.SearchSongs_Mysql(query); // 创建响应数据 var response = new { isLoggedIn = true, - favoriteSongList = favoriteSongs + + favoriteSongList = searchResults .Select(song => new { song.Song, song.ArtistA, song.SongNumber, - song.Category, - song.PhoneticNotation, - song.PinyinNotation, - song.ArtistAPhonetic, - song.ArtistBPhonetic, + //song.Category, + //song.PhoneticNotation, + //song.PinyinNotation, + //song.ArtistAPhonetic, + //song.ArtistBPhonetic, song.ArtistASimplified, song.ArtistBSimplified, song.SongSimplified, - song.SongGenre, - song.ArtistAPinyin, - song.ArtistBPinyin, + //song.SongGenre, + //song.ArtistAPinyin, + //song.ArtistBPinyin, song.HumanVoice, - song.AddedTime, + //song.AddedTime, song.SongFilePathHost1, song.SongFilePathHost2 // 例如语言类别等信息 }) @@ -1143,11 +1146,11 @@ namespace DualScreenDemo context.Response.ContentType = "application/json"; context.Response.StatusCode = (int)HttpStatusCode.InternalServerError; await SendResponseAsyncs(context, jsonResponse); - }*/ + } } // 异步响应发送方法 - /* + private static async Task SendResponseAsyncs(HttpListenerContext context, string responseContent) { try @@ -1162,7 +1165,7 @@ namespace DualScreenDemo Console.WriteLine("Error sending response: " + ex.Message); } } - */ + private static async Task HandleGetRequest(HttpListenerContext context, string baseDirectory, string requestedFile) { try diff --git a/PrimaryFormParts/PrimaryForm.SyncScreen.cs b/PrimaryFormParts/PrimaryForm.SyncScreen.cs index 04bf55a..15ae371 100644 --- a/PrimaryFormParts/PrimaryForm.SyncScreen.cs +++ b/PrimaryFormParts/PrimaryForm.SyncScreen.cs @@ -46,10 +46,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 564c816..a2d5f4b 100644 --- a/PrimaryFormParts/PrimaryForm.cs +++ b/PrimaryFormParts/PrimaryForm.cs @@ -264,7 +264,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; @@ -895,8 +895,6 @@ namespace DualScreenDemo { try { - - byte[] commandBytes = HexStringToByteArray(command); SerialPortManager.mySerialPort.Write(commandBytes, 0, commandBytes.Length); } @@ -2229,6 +2227,7 @@ namespace DualScreenDemo } private bool isWaiting = false; + //服務鈴事件 private async void OnServiceBellButtonClick(object sender, EventArgs e) { if (isWaiting) return; @@ -2390,7 +2389,7 @@ namespace DualScreenDemo 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))