Compare commits
No commits in common. "53b9571e0eb07a22c4e0eac172b95b74a4d86b08" and "11d9fe7c49b6f728dea8b30b9f0f4122f98bd3e7" have entirely different histories.
53b9571e0e
...
11d9fe7c49
@ -39,6 +39,7 @@ namespace DualScreenDemo
|
|||||||
private static CancellationTokenSource _cts;
|
private static CancellationTokenSource _cts;
|
||||||
private static Task _serverTask;
|
private static Task _serverTask;
|
||||||
private static string _baseDirectory = @"themes\superstar\_www"; // 根據實際情況設定
|
private static string _baseDirectory = @"themes\superstar\_www"; // 根據實際情況設定
|
||||||
|
private static SongListManager _songListManager;
|
||||||
private static TaskCompletionSource<string> _qrReadyTcs;
|
private static TaskCompletionSource<string> _qrReadyTcs;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -138,7 +139,7 @@ namespace DualScreenDemo
|
|||||||
*/
|
*/
|
||||||
public static async Task StartServer(string baseDirectory, int port, SongListManager manager, CancellationToken token)
|
public static async Task StartServer(string baseDirectory, int port, SongListManager manager, CancellationToken token)
|
||||||
{
|
{
|
||||||
songListManager = manager;
|
_songListManager = manager;
|
||||||
string randomFolderName = CreateRandomFolderAndRedirectHTML(baseDirectory);
|
string randomFolderName = CreateRandomFolderAndRedirectHTML(baseDirectory);
|
||||||
randomFolderPath = randomFolderName;
|
randomFolderPath = randomFolderName;
|
||||||
Console.WriteLine("測試" + randomFolderPath);
|
Console.WriteLine("測試" + randomFolderPath);
|
||||||
@ -222,7 +223,7 @@ namespace DualScreenDemo
|
|||||||
|
|
||||||
// ✅ 等 QR code 跑完
|
// ✅ 等 QR code 跑完
|
||||||
_qrReadyTcs = new TaskCompletionSource<string>();
|
_qrReadyTcs = new TaskCompletionSource<string>();
|
||||||
_serverTask = StartServer(_baseDirectory, _port, songListManager, _cts.Token);
|
_serverTask = StartServer(_baseDirectory, _port, _songListManager, _cts.Token);
|
||||||
string readyFolder = await _qrReadyTcs.Task;
|
string readyFolder = await _qrReadyTcs.Task;
|
||||||
|
|
||||||
// ✅ 等 QR Code 圖片準備好之後再處理 UI 更新
|
// ✅ 等 QR Code 圖片準備好之後再處理 UI 更新
|
||||||
|
BIN
bin/themes/superstar/_www/手機點歌/BG-3-01.png
Normal file
After Width: | Height: | Size: 30 KiB |
BIN
bin/themes/superstar/_www/手機點歌/BG-3-02.png
Normal file
After Width: | Height: | Size: 32 KiB |
BIN
bin/themes/superstar/_www/手機點歌/BG-3-03.png
Normal file
After Width: | Height: | Size: 29 KiB |
BIN
bin/themes/superstar/_www/手機點歌/LOGO-03.png
Normal file
After Width: | Height: | Size: 59 KiB |
BIN
bin/themes/superstar/_www/手機點歌/LOGO0728-02.png
Normal file
After Width: | Height: | Size: 32 KiB |
BIN
bin/themes/superstar/_www/手機點歌/LOGO0728-03.png
Normal file
After Width: | Height: | Size: 29 KiB |
BIN
bin/themes/superstar/_www/手機點歌/LOGO0728_工作區域 1.png
Normal file
After Width: | Height: | Size: 30 KiB |