From 129b45969d4f6a475afba9a8aa973410c4bd54c3 Mon Sep 17 00:00:00 2001 From: Yuan <294065614@qq.com> Date: Mon, 28 Oct 2024 10:30:14 +0800 Subject: [PATCH 1/4] 1 --- sdk/src/CameraPlayer.js | 7 +++++++ sdk/src/MicrophonePlayer.js | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/sdk/src/CameraPlayer.js b/sdk/src/CameraPlayer.js index 9478a6f..30fff7c 100644 --- a/sdk/src/CameraPlayer.js +++ b/sdk/src/CameraPlayer.js @@ -57,6 +57,13 @@ export default class CameraPlayer { } } + if (this.videoStream) { + this.videoStream.stop(); + } + navigator.mediaDevices.getUserMedia({ video: videoOptions }) + .then((stream) => { + stream.getVideoTracks().forEach(track => track.stop()); + }) navigator.mediaDevices.getUserMedia({ video: videoOptions }) .then((stream) => { // 视频轨道 diff --git a/sdk/src/MicrophonePlayer.js b/sdk/src/MicrophonePlayer.js index d0f5a6b..d264ae9 100644 --- a/sdk/src/MicrophonePlayer.js +++ b/sdk/src/MicrophonePlayer.js @@ -53,6 +53,13 @@ export default class MicrophonePlayer { } } + if (this.audioStream) { + this.audioStream.stop(); + } + navigator.mediaDevices.getUserMedia({ audio: audioOptions }) + .then((stream) => { + stream.getAudioTracks().forEach(track => track.stop()); + }) navigator.mediaDevices.getUserMedia({ audio: audioOptions }) .then((stream) => { // 音频轨道 -- Gitee From ded53c1db95d99d643101523ad2f65ce95198fc7 Mon Sep 17 00:00:00 2001 From: Yuan <294065614@qq.com> Date: Thu, 7 Nov 2024 14:38:52 +0800 Subject: [PATCH 2/4] 1 --- H5_E2E/src/config/global.js | 2 +- H5_E2E/src/static/AppController.js | 4 ++++ H5_E2E/src/static/AppScreenPrint.js | 1 + sdk/demo/demo.html | 4 ++-- sdk/package.json | 2 +- sdk/src/AppController.js | 4 ++++ sdk/src/AppScreenPrint.js | 1 + 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/H5_E2E/src/config/global.js b/H5_E2E/src/config/global.js index a761bd5..703600a 100644 --- a/H5_E2E/src/config/global.js +++ b/H5_E2E/src/config/global.js @@ -1,4 +1,4 @@ export default { __IS_DEBUG__: false, - SDK_VERSION: "23.12.3.1", + SDK_VERSION: "24.3.1", }; diff --git a/H5_E2E/src/static/AppController.js b/H5_E2E/src/static/AppController.js index d100a90..15a757f 100644 --- a/H5_E2E/src/static/AppController.js +++ b/H5_E2E/src/static/AppController.js @@ -928,6 +928,9 @@ class AppController { if (params) { let kvs = Object.keys(params).map(key => { let value = params[key]; + if (key === 'ticket') { + return [key, value].join('=') + } if (typeof value === 'object') { value = Object.keys(value) .map(subKey => @@ -1077,6 +1080,7 @@ class AppController { this.startParams = { ticket: this.options.ticket, session_id: this.sessionId, + client_mode: "management", auth_ts: this.options.authTimeStamp, verify_data: verify, encrypted_data: cipherText, diff --git a/H5_E2E/src/static/AppScreenPrint.js b/H5_E2E/src/static/AppScreenPrint.js index 1a5b1b2..7627022 100644 --- a/H5_E2E/src/static/AppScreenPrint.js +++ b/H5_E2E/src/static/AppScreenPrint.js @@ -624,6 +624,7 @@ class AppController { this.startParams = { ticket: this.options.ticket, session_id: this.sessionId, + client_mode: "management", auth_ts: this.options.authTimeStamp, verify_data: verify, encrypted_data: cipherText, diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html index b48675c..67966ec 100644 --- a/sdk/demo/demo.html +++ b/sdk/demo/demo.html @@ -542,7 +542,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd. background_timeout: '60', available_playtime: '6000', touch_timeout: 600, - connect_uri: _HTTP_MODE_ ? 'ws://' : 'wss://' + [cloudIp, cloudPort].join(':') + connect_uri: (_HTTP_MODE_ ? 'ws://' : 'wss://') + [cloudIp, cloudPort].join(':') }; } else if (phoneInfo) { // 调度系统 @@ -556,7 +556,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd. background_timeout: phoneInfo['background_timeout'], available_playtime: phoneInfo['available_playTime'], touch_timeout: phoneInfo['touch_timeout'], - connect_uri: _HTTP_MODE_ ? 'ws://' : 'wss://' + [cloudIp, cloudPort].join(':'), + connect_uri: (_HTTP_MODE_ ? 'ws://' : 'wss://') + [cloudIp, cloudPort].join(':'), }; } else { let localHref = window.location.href; diff --git a/sdk/package.json b/sdk/package.json index 8fb5c86..8b8e611 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "CloudAppSdk_H5", - "version": "23.12.3.1", + "version": "24.3.1", "description": "cas h5 sdk", "main": ".eslintrc.js", "scripts": { diff --git a/sdk/src/AppController.js b/sdk/src/AppController.js index bc960f6..c2e67f6 100644 --- a/sdk/src/AppController.js +++ b/sdk/src/AppController.js @@ -853,6 +853,9 @@ class AppController { if (params) { let kvs = Object.keys(params).map(key => { let value = params[key]; + if (key === 'ticket') { + return [key, value].join('=') + } if (typeof value === 'object') { value = Object.keys(value).map(subKey => [subKey, encodeURIComponent(value[subKey])].join('=')).join(':'); return [key, value].join('='); @@ -983,6 +986,7 @@ class AppController { initParams(cipherText, verify, iv) { this.startParams = { + client_mode: "management", ticket: this.options.ticket, session_id: this.sessionId, auth_ts: this.options.authTimeStamp, diff --git a/sdk/src/AppScreenPrint.js b/sdk/src/AppScreenPrint.js index a65eaff..88406ee 100644 --- a/sdk/src/AppScreenPrint.js +++ b/sdk/src/AppScreenPrint.js @@ -619,6 +619,7 @@ class AppController { initParams(cipherText, verify, iv) { this.startParams = { + client_mode: "management", ticket: this.options.ticket, session_id: this.sessionId, auth_ts: this.options.authTimeStamp, -- Gitee From 9d36e0adf48da676b9ee5a4b0d44b855141ffece Mon Sep 17 00:00:00 2001 From: Yuan <294065614@qq.com> Date: Thu, 7 Nov 2024 17:22:12 +0800 Subject: [PATCH 3/4] 1 --- H5_E2E/src/views/SinglePhoneView.vue | 2 +- README.md | 2 +- sdk/demo/demo.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/H5_E2E/src/views/SinglePhoneView.vue b/H5_E2E/src/views/SinglePhoneView.vue index f730987..c33dbc8 100644 --- a/H5_E2E/src/views/SinglePhoneView.vue +++ b/H5_E2E/src/views/SinglePhoneView.vue @@ -132,7 +132,7 @@ export default { ...cloudPhoneParams, channelType: channelType, ticket: '256random'.padStart(256, '0'), - auth_ts: 'test_auth_ts', // 时间戳 timestamp + auth_ts: new Date().getTime(), // 时间戳 timestamp aes_key: '', _debug: true, auto_rotate: true, diff --git a/README.md b/README.md index e1c3a9c..ce94b09 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Chrome restricts the usage of WebCryptographyApi to secure origins. It means 'ht | user_id | 否 | String | 用户id | | auto_rotate | 否 | Boolean | 是否根据真机方向和应用方向自适应旋转画面 | | keepRatio | 否 | Boolean | 是否始终保持CLOUD_PHONE_RATIO中设置的宽高比 | - | media_config | 否 | Object | 可配置虚拟分辨率宽高（stream_width、stream_height）和 真机物理宽高(physical_width、physical_height) | + | media_config | 否 | Object | 详见 4.9 设置音视频参数（方法） | - 调用示例 diff --git a/sdk/demo/demo.html b/sdk/demo/demo.html index 67966ec..98eac1d 100644 --- a/sdk/demo/demo.html +++ b/sdk/demo/demo.html @@ -574,7 +574,7 @@ Copyright 2022 Huawei Cloud Computing Technology Co., Ltd. channelType: channelType, ticket: '256random'.padStart(256, '0'), aes_key: '11111111111111111111111111111111', - auth_ts: 'test_auth_ts', + auth_ts: new Date().getTime(), _debug: true, auto_rotate: true, libPath: commonLibPath, // 配置库文件地址 -- Gitee From 284f413a8b7bcbc344fbec1d27c1b6fa4a5d4ab7 Mon Sep 17 00:00:00 2001 From: Yuan <294065614@qq.com> Date: Thu, 14 Nov 2024 17:14:18 +0800 Subject: [PATCH 4/4] 1 --- H5_E2E/src/static/AppController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/H5_E2E/src/static/AppController.js b/H5_E2E/src/static/AppController.js index 15a757f..6a569c2 100644 --- a/H5_E2E/src/static/AppController.js +++ b/H5_E2E/src/static/AppController.js @@ -1179,7 +1179,7 @@ class AppController { this.player.style.setProperty('height', '100%', 'important'); // 硬解时video标签会按比例填充视频，避免视频被裁减设置contain显示完整画面 - this.player.style.setProperty('object-fit', 'contain', 'important'); + this.player.style.setProperty('object-fit', 'fill', 'important'); } else { // 解决画布居中问题 this.player.style.setProperty('margin', '0 auto', 'important'); -- Gitee