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

Compare commits

base: Leecheng:08dc3539e64c7bcb27668e23bc944cf613cd2616
Branches Tags
Leecheng:main
Leecheng:superstar_1.2.1
..
compare: Leecheng:e7f4b854888f22740b049a36ba3c77c0f5a1fe47
Branches Tags
Leecheng:superstar_1.2.1
Leecheng:main

No commits in common. "08dc3539e64c7bcb27668e23bc944cf613cd2616" and "e7f4b854888f22740b049a36ba3c77c0f5a1fe47" have entirely different histories.
08dc3539e6 ... e7f4b85488

5 changed files with 19 additions and 18 deletions
Show Stats Expand all files Collapse all files

7
OverlayFormObj/OverlayForm.Labels.cs
View File

@ -169,7 +169,7 @@ namespace OverlayFormObj
string qrContent = serverAddress.Contains(":") ?
String.Format("http://{0}/{1}/windows.html", serverAddress, randomFolderPath) :
String.Format("http://{0}:{1}/{2}/windows.html", serverAddress, 9090, randomFolderPath);
// Console.WriteLine("QR Content: " + qrContent);
Console.WriteLine("QR Content: " + qrContent);
string qrImagePath = Path.Combine(Application.StartupPath, "themes/superstar/_www", randomFolderPath, "qrcode.png");
if (!File.Exists(qrImagePath))
{
@ -474,7 +474,7 @@ namespace OverlayFormObj
using (Font largeFont = new Font("微軟正黑體", 34, FontStyle.Bold))
using (Font secondLineFont = new Font("微軟正黑體", 34, FontStyle.Bold))
using (Brush whiteBrush = new SolidBrush(Color.White))
using (Brush RedBrush = new SolidBrush(Color.Red))
using (Brush limeGreenBrush = new SolidBrush(Color.LimeGreen))
using (Brush marqueeBrush = new SolidBrush(marqueeTextColor))
using (Brush backgroundBrush = new SolidBrush(Color.FromArgb(255, 0, 0, 0)))
{
@ -500,8 +500,7 @@ namespace OverlayFormObj
SizeF textSizeSecondLine = e.Graphics.MeasureString(displayText, secondLineFont);
float centeredXPos = (this.Width - textSizeSecondLine.Width) / 2;
e.Graphics.FillRectangle(backgroundBrush, centeredXPos, yPosition2, textSizeSecondLine.Width, textSizeSecondLine.Height);
// 系統公告塗色調整區域
e.Graphics.DrawString(displayText, secondLineFont, RedBrush, new PointF(centeredXPos, yPosition2));
e.Graphics.DrawString(displayText, secondLineFont, limeGreenBrush, new PointF(centeredXPos, yPosition2));
// 还原裁剪区域
e.Graphics.Clip = originalClip;

2
PrimaryFormParts/PrimaryForm.QRCode.cs
View File

@ -34,7 +34,7 @@ namespace DualScreenDemo
string qrContent = serverAddress.Contains(":") ?
String.Format("http://{0}/{1}/windows.html", serverAddress, randomFolderPath) :
String.Format("http://{0}:{1}/{2}/windows.html", serverAddress, 9090, randomFolderPath);
// Console.WriteLine("QR Content: " + qrContent);
Console.WriteLine("QR Content: " + qrContent);
string qrImagePath = Path.Combine(Application.StartupPath, "themes/superstar/_www", randomFolderPath, "qrcode.png");

12
themes/superstar/_www/new-songs.html
View File

@ -254,7 +254,7 @@
<tr>
<th>歌名</th>
<th>歌手</th>
<th>語別</th>
</tr>
</thead>
<tbody>
@ -270,7 +270,7 @@
<p>歌名：<span id="detail-song-name"></span></p>
<p>編號：<span id="detail-song-number"></span></p>
<p>歌手：<span id="detail-singer"></span></p>
<!-- <p>語別：<span id="detail-language"></span></p> -->
<p>語別：<span id="detail-language"></span></p>
<button id="order-song-button">包廂點歌</button>
<button id="insert-song-button">插播歌曲</button>
</div>
@ -350,15 +350,15 @@
const row = document.createElement('tr');
const songNameCell = document.createElement('td');
const singerCell = document.createElement('td');
// const languageCell = document.createElement('td');
const languageCell = document.createElement('td');
songNameCell.textContent = song.Song;
singerCell.textContent = song.ArtistA;
// languageCell.textContent = song.Category;
languageCell.textContent = song.Category;
row.appendChild(songNameCell);
row.appendChild(singerCell);
// row.appendChild(languageCell);
row.appendChild(languageCell);
row.addEventListener('click', (e) => {
e.preventDefault();
@ -369,7 +369,7 @@
document.getElementById('detail-song-name').textContent = song.Song;
document.getElementById('detail-song-number').textContent = song.SongNumber;
document.getElementById('detail-singer').textContent = song.ArtistA;
// document.getElementById('detail-language').textContent = song.Category;
document.getElementById('detail-language').textContent = song.Category;
document.getElementById('song-details').style.display = 'block';
});

6
themes/superstar/_www/sound-control.html
View File

@ -86,14 +86,14 @@
@media (max-width: 600px) {
.content {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 5px;
grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
gap: 10px;
}
}
.card {
background: linear-gradient(135deg, #FF4081, #FF4081);
color: white;
width: 100%;
width: 130px;
display: flex;
align-items: center;
justify-content: center;

10
themes/superstar/_www/top-ranking.html
View File

@ -259,6 +259,7 @@
<tr>
<th>歌名</th>
<th>歌手</th>
<th>語別</th>
</tr>
</thead>
<tbody>
@ -274,7 +275,7 @@
<p>歌名：<span id="detail-song-name"></span></p>
<p>編號：<span id="detail-song-number"></span></p>
<p>歌手：<span id="detail-singer"></span></p>
<!-- <p>語別：<span id="detail-language"></span></p> -->
<p>語別：<span id="detail-language"></span></p>
<button id="order-song-button">包廂點歌</button>
<button id="insert-song-button">插播歌曲</button>
</div>
@ -354,14 +355,15 @@
const row = document.createElement('tr');
const songNameCell = document.createElement('td');
const singerCell = document.createElement('td');
const languageCell = document.createElement('td');
songNameCell.textContent = song.Song;
singerCell.textContent = song.ArtistA;
languageCell.textContent = song.Category;
row.appendChild(songNameCell);
row.appendChild(singerCell);
row.appendChild(languageCell);
row.addEventListener('click', (e) => {
e.preventDefault(); // 阻止默認行為
@ -374,7 +376,7 @@
document.getElementById('detail-song-name').textContent = song.Song;
document.getElementById('detail-song-number').textContent = song.SongNumber;
document.getElementById('detail-singer').textContent = song.ArtistA;
// document.getElementById('detail-language').textContent = song.Category;
document.getElementById('detail-language').textContent = song.Category;
// 顯示詳情視窗和遮罩
document.getElementById('song-details').style.display = 'block';