server/ShengShengBuXi
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

321321

Browse Source
This commit is contained in:
zpc 2025-03-29 18:32:21 +08:00
parent 6718eed4e4
commit c626311dbf
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ShengShengBuXi/Hubs/AudioHub.cs
View File

@ -1090,6 +1090,7 @@ namespace ShengShengBuXi.Hubs
return;
}
// 在手动控屏模式下，只处理真实用户的消息
if (_manualScreenControlEnabled && !highestPriority.Value.IsRealUser)
{

42
ShengShengBuXi/Pages/Monitor.cshtml
View File

@ -21,14 +21,14 @@
<!-- 通话状态指示器 -->
<div class="d-flex align-items-center">
<div id="status-indicator" class="rounded-circle me-2"
style="width: 24px; height: 24px; background-color: red;"></div>
style="width: 24px; height: 24px; background-color: red;"></div>
<span id="status-text" class="me-3">未检测到通话</span>
</div>
<!-- 单选按钮组 - 隐藏自动识别显示选项 -->
<div class="btn-group" role="group" style="display: none;">
<input type="radio" class="btn-check" name="displayMode" id="displayMode0" value="0"
checked>
checked>
<label class="btn btn-outline-primary" for="displayMode0">自动识别显示</label>
<input type="radio" class="btn-check" name="displayMode" id="displayMode1" value="1">
@ -38,19 +38,19 @@
<!-- 音频传输开关 - 隐藏关闭音频传输选项 -->
<div class="btn-group ms-3" role="group">
<input type="radio" class="btn-check" name="audioStreaming" id="audioStreaming1" value="1"
checked>
checked>
<label class="btn btn-outline-success" for="audioStreaming1">开启音频传输</label>
<input type="radio" class="btn-check" name="audioStreaming" id="audioStreaming0" value="0"
style="display: none;">
style="display: none;">
<label class="btn btn-outline-danger" for="audioStreaming0"
style="display: none;">关闭音频传输</label>
style="display: none;">关闭音频传输</label>
<!-- 音量控制滑块 -->
<div class="ms-3 d-flex align-items-center">
<label for="volumeControl" class="me-2"><i class="bi bi-volume-up"></i></label>
<input type="range" class="form-range" min="0" max="1" step="0.1" value="1.0"
id="volumeControl" style="width: 100px;">
id="volumeControl" style="width: 100px;">
</div>
</div>
@ -58,11 +58,11 @@
<div class="btn-group ms-3" role="group">
控评开关：
<input type="radio" class="btn-check" name="screenControl" id="screenControlAuto" value="0"
checked>
checked>
<label class="btn btn-outline-primary" for="screenControlAuto">自动</label>
<input type="radio" class="btn-check" name="screenControl" id="screenControlManual"
value="1">
value="1">
<label class="btn btn-outline-primary" for="screenControlManual">手动</label>
</div>
</div>
@ -80,7 +80,7 @@
</div>
<div class="card-body p-0">
<div id="monitor-text-list" class="list-group list-group-flush"
style="max-height: 75vh; overflow-y: auto;">
style="max-height: 75vh; overflow-y: auto;">
<!-- 文本列表内容将通过JS动态填充 -->
<div class="text-center text-muted p-3">加载中...</div>
</div>
@ -120,7 +120,7 @@
</div>
<div class="card-body">
<textarea id="text-input" class="form-control h-100" placeholder="请输入要显示的文本..."
maxlength="100"></textarea>
maxlength="100"></textarea>
</div>
</div>
@ -131,12 +131,12 @@
<div class="card h-100">
<div class="card-body d-flex justify-content-center align-items-center">
<button id="add-text-btn" class="btn btn-primary me-3" data-bs-toggle="tooltip"
title="将文本添加到显示队列，并显示在大屏上" onclick="addDisplayText()">
title="将文本添加到显示队列，并显示在大屏上" onclick="addDisplayText()">
<i class="bi bi-plus-circle"></i> 显示到大屏
</button>
<button id="add-and-remove-btn" class="btn btn-warning" data-bs-toggle="tooltip"
title="将文本添加到显示队列，并从监控列表中移除当前选中项" onclick="addDisplayTextAndRemoveMonitor()"
style="display: none;">
title="将文本添加到显示队列，并从监控列表中移除当前选中项" onclick="addDisplayTextAndRemoveMonitor()"
style="display: none;">
<i class="bi bi-arrow-right-circle"></i> 添加并移除
</button>
</div>
@ -160,7 +160,7 @@
</div>
<div class="card-body p-0">
<div id="display-text-list" class="list-group list-group-flush"
style="max-height: 75vh; overflow-y: auto;">
style="max-height: 75vh; overflow-y: auto;">
<!-- 文本列表内容将通过JS动态填充 -->
<div class="text-center text-muted p-3">加载中...</div>
</div>
@ -193,7 +193,7 @@
<!-- 来电确认对话框 -->
<div class="modal fade" id="callConfirmDialog" tabindex="-1" aria-labelledby="callConfirmDialogLabel"
aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header bg-primary text-white">
@ -246,13 +246,13 @@
</div>
</div>
@section Scripts {
@section Scripts {
<script src="~/lib/microsoft-signalr/signalr.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
<script src='https://web.sdk.qcloud.com/trtc/webrtc/v5/dist/trtc.js'></script>
<script src="~//js/lib-generate-test-usersig.min.js"></script>
<script src="~//js/generateTestUserSig.js"></script>
<script src="~/js/lib-generate-test-usersig.min.js"></script>
<script src="~/js/generateTestUserSig.js"></script>
<script>
let connection = null;
let refreshDisplayInterval = null;
@ -275,7 +275,7 @@
const sdkAppId = 1600079538;
const sdkSecretKey = "df2427757c0ec29ae8ca45611ddb70381144d55338e5ac73c2da27a9c32729f6";
let userId = "监听者：" + Math.random().toString(36).substring(2, 15);
let userId = "监听者：" + Math.random().toString(36).substring(2, 10);
let roomId = 8888;
let trtc = TRTC.create();
@ -1095,7 +1095,7 @@
initSignalR();
// 设置各种事件监听器
// setupEventListeners();
// setupEventListeners();
setupDisplayModeListeners();
setupAudioStreamingListeners();
setupScreenControlListeners();
@ -1853,4 +1853,4 @@
});
}
</script>
}
}