關閉跑馬燈+修正關台Bug
This commit is contained in:
parent
dd53c14fdd
commit
46b1bc81a2
21
TCPServer.cs
21
TCPServer.cs
@ -90,16 +90,16 @@ namespace DualScreenDemo
|
||||
|
||||
string stateFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,"txt","states.txt");
|
||||
string initialState = ReadStateFile(stateFilePath);
|
||||
/*
|
||||
|
||||
if (initialState.Equals("CLOSE", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_ = SafeInvoke(PrimaryForm.Instance, () =>
|
||||
{
|
||||
try {
|
||||
foreach (Control ctrl in PrimaryForm.Instance.Controls)
|
||||
/*foreach (Control ctrl in PrimaryForm.Instance.Controls)
|
||||
{
|
||||
ctrl.Enabled = false;
|
||||
}
|
||||
}*/
|
||||
PrimaryForm.Instance.ShowSendOffScreen();
|
||||
}
|
||||
catch (Exception ex) {
|
||||
@ -107,7 +107,7 @@ namespace DualScreenDemo
|
||||
}
|
||||
});
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
while (true)
|
||||
{
|
||||
@ -150,14 +150,9 @@ namespace DualScreenDemo
|
||||
await SafeInvoke(PrimaryForm.Instance, async () =>
|
||||
{
|
||||
PrimaryForm.Instance.ShowSendOffScreen();
|
||||
_ = SafeInvoke(PrimaryForm.Instance, () =>
|
||||
{
|
||||
string marqueeMessage= "歡迎使用超級巨星歡唱網路版系統,與你共度美好時光。";
|
||||
OverlayForm.MainForm.UpdateMarqueeText(marqueeMessage, OverlayForm.MarqueeStartPosition.Middle, Color.White);
|
||||
});
|
||||
Console.WriteLine("開始設置新的播放列表");
|
||||
|
||||
string closePath = @"C:\video\CLOSE.MPG";
|
||||
string closePath = @"D:\video\CLOSE.MPG";
|
||||
if (File.Exists(closePath))
|
||||
{
|
||||
SongData closeSong = new SongData(
|
||||
@ -212,12 +207,6 @@ namespace DualScreenDemo
|
||||
|
||||
if (command.Trim().Equals("O", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_ = SafeInvoke(PrimaryForm.Instance, () =>
|
||||
{
|
||||
PrimaryForm.Instance.HideSendOffScreen();
|
||||
string marqueeMessage= "歡迎使用超級巨星歡唱網路版系統,與你共度美好時光。";
|
||||
OverlayForm.MainForm.UpdateMarqueeText(marqueeMessage, OverlayForm.MarqueeStartPosition.Middle, Color.White);
|
||||
});
|
||||
// 開台時跳至首頁
|
||||
|
||||
VideoPlayerForm.publicPlaylist = new List<SongData>();
|
||||
|
Loading…
x
Reference in New Issue
Block a user