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-04-09 11:12:59 +08:00
parent 0c9826f0f3
commit b5ae33f582
2 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
PrimaryFormParts/PrimaryForm.cs
View File

@ -153,14 +153,6 @@ namespace DualScreenDemo
private static Bitmap resizedMouseOverImageForLanguageQuery; private static Bitmap resizedMouseOverImageForLanguageQuery;
private static Bitmap resizedMouseDownImageForLanguageQuery; private static Bitmap resizedMouseDownImageForLanguageQuery;
private static Bitmap normalStateImage6_1;
private static Bitmap mouseOverImage6_1;
private static Bitmap mouseDownImage6_1;
private static Bitmap resizedNormalStateImageFor6_1;
private static Bitmap resizedMouseOverImageFor6_1;
private static Bitmap resizedMouseDownImageFor6_1;
private static Bitmap normalStateImageCategoryQuery; private static Bitmap normalStateImageCategoryQuery;
private static Bitmap mouseOverImageCategoryQuery; private static Bitmap mouseOverImageCategoryQuery;
private static Bitmap mouseDownImageCategoryQuery; private static Bitmap mouseDownImageCategoryQuery;
@ -169,22 +161,6 @@ namespace DualScreenDemo
private static Bitmap resizedMouseOverImageForCategoryQuery; private static Bitmap resizedMouseOverImageForCategoryQuery;
private static Bitmap resizedMouseDownImageForCategoryQuery; private static Bitmap resizedMouseDownImageForCategoryQuery;
private static Bitmap normalStateImage7_1;
private static Bitmap mouseOverImage7_1;
private static Bitmap mouseDownImage7_1;
private static Bitmap resizedNormalStateImageFor7_1;
private static Bitmap resizedMouseOverImageFor7_1;
private static Bitmap resizedMouseDownImageFor7_1;
private static Bitmap normalStateImage7_1_1;
private static Bitmap mouseOverImage7_1_1;
private static Bitmap mouseDownImage7_1_1;
private static Bitmap resizedNormalStateImageFor7_1_1;
private static Bitmap resizedMouseOverImageFor7_1_1;
private static Bitmap resizedMouseDownImageFor7_1_1;
private static Bitmap normalStateImageForPromotionsAndMenu; private static Bitmap normalStateImageForPromotionsAndMenu;
private static Bitmap resizedNormalStateImageForPromotionsAndMenu; private static Bitmap resizedNormalStateImageForPromotionsAndMenu;
@ -2703,15 +2679,6 @@ public class MultiPagePanel : Panel
resizedMouseDownImageForLanguageQuery = ResizeImage(mouseDownImageLanguageQuery, targetWidth, targetHeight); resizedMouseDownImageForLanguageQuery = ResizeImage(mouseDownImageLanguageQuery, targetWidth, targetHeight);
normalStateImage6_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\6-1.png"));
resizedNormalStateImageFor6_1 = ResizeImage(normalStateImage6_1, targetWidth, targetHeight);
mouseOverImage6_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\6-1.mouseover.png"));
resizedMouseOverImageFor6_1 = ResizeImage(mouseOverImage6_1, targetWidth, targetHeight);
mouseDownImage6_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\6-1.mousedown.png"));
resizedMouseDownImageFor6_1 = ResizeImage(mouseDownImage6_1, targetWidth, targetHeight);
normalStateImageCategoryQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\類別查詢_未按.jpg")); normalStateImageCategoryQuery = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\類別查詢_未按.jpg"));
resizedNormalStateImageForCategoryQuery = ResizeImage(normalStateImageCategoryQuery, targetWidth, targetHeight); resizedNormalStateImageForCategoryQuery = ResizeImage(normalStateImageCategoryQuery, targetWidth, targetHeight);
@ -2722,25 +2689,6 @@ public class MultiPagePanel : Panel
resizedMouseDownImageForCategoryQuery = ResizeImage(mouseDownImageCategoryQuery, targetWidth, targetHeight); resizedMouseDownImageForCategoryQuery = ResizeImage(mouseDownImageCategoryQuery, targetWidth, targetHeight);
normalStateImage7_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1.png"));
resizedNormalStateImageFor7_1 = ResizeImage(normalStateImage7_1, targetWidth, targetHeight);
mouseOverImage7_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1.mouseover.png"));
resizedMouseOverImageFor7_1 = ResizeImage(mouseOverImage7_1, targetWidth, targetHeight);
mouseDownImage7_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1.mousedown.png"));
resizedMouseDownImageFor7_1 = ResizeImage(mouseDownImage7_1, targetWidth, targetHeight);
normalStateImage7_1_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1-1.png"));
resizedNormalStateImageFor7_1_1 = ResizeImage(normalStateImage7_1_1, targetWidth, targetHeight);
mouseOverImage7_1_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1-1.mouseover.png"));
resizedMouseOverImageFor7_1_1 = ResizeImage(mouseOverImage7_1_1, targetWidth, targetHeight);
mouseDownImage7_1_1 = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\7-1-1.mousedown.png"));
resizedMouseDownImageFor7_1_1 = ResizeImage(mouseDownImage7_1_1, targetWidth, targetHeight);
normalStateImageForPromotionsAndMenu = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\555021.jpg")); normalStateImageForPromotionsAndMenu = new Bitmap(Path.Combine(Application.StartupPath, "themes\\superstar\\555021.jpg"));
resizedNormalStateImageForPromotionsAndMenu = ResizeImage(normalStateImageForPromotionsAndMenu, targetWidth, targetHeight); resizedNormalStateImageForPromotionsAndMenu = ResizeImage(normalStateImageForPromotionsAndMenu, targetWidth, targetHeight);

10
TCPServer.cs
View File

@ -150,7 +150,7 @@ namespace DualScreenDemo
DateTime.Now, closePath, "", "", "", "", DateTime.Now, closePath, "", "", "", "",
"", "", "", "", "", "", "", 1 "", "", "", "", "", "", "", 1
); );
VideoPlayerForm.publicPlaylist = new List<SongData>();
VideoPlayerForm.playingSongList = new List<SongData>(); VideoPlayerForm.playingSongList = new List<SongData>();
if (VideoPlayerForm.Instance.currentPlayingSong != null) if (VideoPlayerForm.Instance.currentPlayingSong != null)
@ -159,6 +159,8 @@ namespace DualScreenDemo
} }
VideoPlayerForm.playingSongList.Add(closeSong); VideoPlayerForm.playingSongList.Add(closeSong);
VideoPlayerForm.publicPlaylist.Add(closeSong);
PrimaryForm.userRequestedSongs = new List<SongData>(); PrimaryForm.userRequestedSongs = new List<SongData>();
if (IsFormReady(OverlayForm.MainForm)) if (IsFormReady(OverlayForm.MainForm))
@ -166,6 +168,8 @@ namespace DualScreenDemo
OverlayForm.MainForm.nextSongLabel.Visible = false; OverlayForm.MainForm.nextSongLabel.Visible = false;
} }
VideoPlayerForm.Instance.PlayNextSong();
Console.WriteLine("已設置新的播放列表，包含當前歌曲和 CLOSE.MPG"); Console.WriteLine("已設置新的播放列表，包含當前歌曲和 CLOSE.MPG");
} }
else else
@ -186,7 +190,9 @@ namespace DualScreenDemo
{ {
PrimaryForm.Instance.HideSendOffScreen(); PrimaryForm.Instance.HideSendOffScreen();
}); });
VideoPlayerForm.publicPlaylist = new List<SongData>();
VideoPlayerForm.playingSongList = new List<SongData>();
VideoPlayerForm.Instance.PlayPublicPlaylist();
UpdateStateFile(stateFilePath, "OPEN"); UpdateStateFile(stateFilePath, "OPEN");
continue; continue;
} }