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

Merge branch 'main' of http://47.251.18.130:3000/Leecheng/superstar_v2

Browse Source
This commit is contained in:
allen.yan 2025-09-03 17:48:15 +08:00
commit 4da2c98500
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CommandHandler.cs
View File

@ -136,7 +136,7 @@ namespace DualScreenDemo
OverlayForm.Instance.topRightTimer.Stop(); OverlayForm.Instance.topRightTimer.Stop();
break; break;
case "A281A4": case "A281A4":
SafeInvokeAction("A281A4",() => OverlayForm.MainForm.ShowTopRightLabel("↑升2調 ")); SafeInvokeAction("A281A4",() => OverlayForm.MainForm.ShowTopRightLabel(" 女調 "));
OverlayForm.Instance.topRightTimer.Stop(); OverlayForm.Instance.topRightTimer.Stop();
break; break;
case "A280A4": case "A280A4":
@ -151,7 +151,7 @@ namespace DualScreenDemo
OverlayForm.Instance.topRightTimer.Stop(); OverlayForm.Instance.topRightTimer.Stop();
break; break;
case "A27DA4": case "A27DA4":
SafeInvokeAction("A27EA4",() => OverlayForm.MainForm.ShowTopRightLabel("↓降2調 ")); SafeInvokeAction("A27EA4",() => OverlayForm.MainForm.ShowTopRightLabel(" 男調 "));
OverlayForm.Instance.topRightTimer.Stop(); OverlayForm.Instance.topRightTimer.Stop();
break; break;
case "A27CA4": case "A27CA4":

2
DBObj/SongData.cs
View File

@ -122,7 +122,7 @@ namespace DBObj
var check = IsFtpUriReachable(new Uri(server).ToString()); var check = IsFtpUriReachable(new Uri(server).ToString());
if (!string.IsNullOrWhiteSpace(server) && check != false) if (!string.IsNullOrWhiteSpace(server) && check != false)
{ {
Console.WriteLine(new Uri(new Uri(server), filename)); // Console.WriteLine(new Uri(new Uri(server), filename));
if (IsFtpUriReachable(new Uri(new Uri(server), filename).ToString())) return new Uri(new Uri(server), filename); if (IsFtpUriReachable(new Uri(new Uri(server), filename).ToString())) return new Uri(new Uri(server), filename);
} }
} }

6
PrimaryFormParts/PrimaryForm.cs
View File

@ -1034,14 +1034,16 @@ namespace DualScreenDemo
{ {
videoPlayerForm.SetVolume(videoPlayerForm.GetVolume() + 5); videoPlayerForm.SetVolume(videoPlayerForm.GetVolume() + 5);
int vol = videoPlayerForm.GetVolume() - 100; int vol = videoPlayerForm.GetVolume() - 100;
OverlayForm.MainForm.ShowTopRightLabel(vol.ToString(), null); OverlayForm.MainForm.ShowTopRightLabel((vol+5).ToString(), null);
OverlayForm.Instance.topRightTimer.Stop();
}; };
musicDownButton.Click -= (sender, e) => { OverlayForm.MainForm.ShowTopRightLabelTime("音量 ↓", "a2 b4 a4"); }; musicDownButton.Click -= (sender, e) => { OverlayForm.MainForm.ShowTopRightLabelTime("音量 ↓", "a2 b4 a4"); };
musicDownButton.Click += (sender, e) => musicDownButton.Click += (sender, e) =>
{ {
videoPlayerForm.SetVolume(videoPlayerForm.GetVolume() - 5); videoPlayerForm.SetVolume(videoPlayerForm.GetVolume() - 5);
int vol = videoPlayerForm.GetVolume() - 100; int vol = videoPlayerForm.GetVolume() - 100;
OverlayForm.MainForm.ShowTopRightLabel(vol.ToString(), null); OverlayForm.MainForm.ShowTopRightLabel((vol-5).ToString(), null);
OverlayForm.Instance.topRightTimer.Stop();
}; };
} }

24
VideoPlayerForm.cs
View File

@ -126,6 +126,8 @@ namespace DualScreenDemo
this.Controls.Add(PrimaryForm.Instance.videoView1); this.Controls.Add(PrimaryForm.Instance.videoView1);
PrimaryForm.Instance.videoView1.MediaPlayer = _mediaService1.Player; PrimaryForm.Instance.videoView1.MediaPlayer = _mediaService1.Player;
PrimaryForm.Instance.videoView0.MediaPlayer = _mediaService0.Player; PrimaryForm.Instance.videoView0.MediaPlayer = _mediaService0.Player;
//同步畫面比例
_mediaService0.Player.AspectRatio = "8:5";
_mediaService0._zero = true; _mediaService0._zero = true;
PlayNextSong(); PlayNextSong();
} }
@ -348,14 +350,19 @@ namespace DualScreenDemo
{ {
string pathToPlay = song.getFile(); string pathToPlay = song.getFile();
Uri url = song.getFileUrl(); Uri url = song.getFileUrl();
if (pathToPlay == null) _mediaService0.LoadMedia(url, 0);
//同步畫面播放器載入media設置參數
else _mediaService0.LoadMedia(pathToPlay, 0);
// _mediaService0.Player.Media.AddOption(":no-audio");
_mediaService0.Player.AspectRatio = "8:5";
if(pathToPlay==null)_mediaService1.LoadMedia(url, song.isPublicSong ? 0 : 1);
//影片畫面播放器載入media設置聲道 //影片畫面播放器載入media設置聲道
else _mediaService1.LoadMedia(pathToPlay, song.isPublicSong ? 0 : 1); if (pathToPlay == null)
{
_mediaService0.LoadMedia(url, 0);
_mediaService1.LoadMedia(url, song.isPublicSong ? 0 : 1);
}
else
{
_mediaService0.LoadMedia(pathToPlay, 0);
_mediaService1.LoadMedia(pathToPlay, song.isPublicSong ? 0 : 1);
}
// _mediaService0.Player.Media.AddOption(":no-audio");
// _mediaService0.Player.AspectRatio = "8:5";
isVocalRemoved = true; isVocalRemoved = true;
if (isMuted) { Mute(true); } if (isMuted) { Mute(true); }
@ -364,7 +371,8 @@ namespace DualScreenDemo
SetVolume(100 + song.getBasic().getDbChange()); SetVolume(100 + song.getBasic().getDbChange());
Task.Run(() => Thread.Sleep(100)); Task.Run(() => Thread.Sleep(100));
if (isSyncToPrimaryMonitor) SyncToPrimaryMonitor(); if (isSyncToPrimaryMonitor) SyncToPrimaryMonitor();
if (url == null&&!song.isPublicSong) PlayNextSong(); //ftp抓不到檔案跳下一首歌
if (url == null && !song.isPublicSong) PlayNextSong();
PrimaryForm.Instance.standardKeyButton.PerformClick(); PrimaryForm.Instance.standardKeyButton.PerformClick();
return Task.CompletedTask; return Task.CompletedTask;
} }