From 2d656b0884ee67914d0df40aab6a153769961b21 Mon Sep 17 00:00:00 2001
From: enncy <877526278@qq.com>
Date: Thu, 21 Dec 2023 18:26:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(web):=20=E4=BC=98=E5=8C=96=E7=9B=91?=
=?UTF-8?q?=E6=8E=A7=E5=B8=A7=E7=8E=87=E9=80=89=E6=8B=A9=EF=BC=8C=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E7=9B=91=E6=8E=A7=E8=8E=B7=E5=8F=96=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/app/index.ts | 9 +-
packages/app/src/worker/index.ts | 3 +-
packages/web/src/pages/dashboard/index.vue | 163 ++++++++++++++-------
3 files changed, 122 insertions(+), 53 deletions(-)
diff --git a/packages/app/index.ts b/packages/app/index.ts
index 7c32e5f..d4eb1fa 100644
--- a/packages/app/index.ts
+++ b/packages/app/index.ts
@@ -8,11 +8,10 @@ import { task } from './src/utils';
import { handleError } from './src/tasks/error.handler';
import { updater } from './src/tasks/updater';
import { startupServer } from './src/tasks/startup.server';
+import { store } from './src/store';
app.setName('ocs');
-// 设置 webrtc 的影像帧率比例,最高100,太高会造成卡顿,默认50
-app.commandLine.appendSwitch('webrtc-max-cpu-consumption-percentage', '100');
// 防止软件崩溃以及兼容
app.commandLine.appendSwitch('no-sandbox');
app.commandLine.appendSwitch('disable-gpu');
@@ -42,6 +41,12 @@ function bootstrap() {
}),
task('初始化自动启动', () => autoLaunch()),
task('启动渲染进程', async () => {
+ // 设置 webrtc 的影像帧率比例,最高100,太高会造成卡顿,参数默认50
+ app.commandLine.appendSwitch(
+ 'webrtc-max-cpu-consumption-percentage',
+ (store?.store?.render?.dashboard?.video?.frameRate ?? 1).toString()
+ );
+
await app.whenReady();
const window = createWindow();
diff --git a/packages/app/src/worker/index.ts b/packages/app/src/worker/index.ts
index 19739b6..e0a8ffc 100644
--- a/packages/app/src/worker/index.ts
+++ b/packages/app/src/worker/index.ts
@@ -150,9 +150,10 @@ export class ScriptWorker {
document.body.innerHTML = `正在获取图像中,请勿操作。`;
}, this.uid)
.catch(console.error);
+
setTimeout(() => {
send('webrtc-page-loaded');
- }, 3000);
+ }, 100);
}
}
diff --git a/packages/web/src/pages/dashboard/index.vue b/packages/web/src/pages/dashboard/index.vue
index c216682..48938b8 100644
--- a/packages/web/src/pages/dashboard/index.vue
+++ b/packages/web/src/pages/dashboard/index.vue
@@ -14,18 +14,24 @@
-
- 加载中...
- {{ state.show ? '暂停' : '开始' }}监控
-
+
+
+ 加载中...
+ {{ state.show ? '暂停' : '开始' }}监控
+
+
@@ -58,12 +64,12 @@
帧率
@@ -226,7 +232,7 @@