Skip to content

Commit 81a9fe6

Browse files
authored
Merge pull request #351 from Ezviz-OpenBiz/develop
fixed: set quality can't autoplay
2 parents 6cacb02 + 0f124c7 commit 81a9fe6

File tree

31 files changed

+186
-123
lines changed

31 files changed

+186
-123
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ coverage
44
.nyc_output
55
.DS_Store
66
*.log
7-
.vscode
87
.idea
98
dist
109
compiled

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ themeData将主题数据本地化,设置本地数据,需要删除template参
270270
<tr><td>language</td><td>String</td><td>多语言 (zh | en), 默认zh (v8.0.8版本及以上支持)</td><td>N</td></tr>
271271
<tr><td>debugDownloadData</td><td>boolean</td><td>下载原始码流, 调试码流使用, 默认 false (v8.1.1版本及以上支持)</td><td>N</td></tr>
272272
<tr><td>disableRenderPrivateData</td><td>boolean</td><td>禁止渲染私有数据(如智能分析, 移动侦测, 火点信息等), 默认 false (v8.1.1版本及以上支持)</td><td>N</td></tr>
273-
<tr><td>quality</td><td>0 | 1 | 2 | 3 | 4 | 5 | 6 | pp | qp</td><td>预览初始化支持指定清晰度进行播放, 默认 undefined (v8.1.5版本及以上支持), 0: 流畅; 1: 标清; 2: 高清; 3: 超清; 4: 极清; 5: 3K; 6: 4K ; "pp": "性能优先 (Performance Priority)"; "qp": "画质优先(Quality Priority)"。</td><td>N</td></tr>
273+
<tr><td>quality</td><td>0 | 1 | 2 | 3 | 4 | 5 | 6 | pp | qp</td><td>预览初始化支持指定清晰度进行播放, 默认 undefined (v8.1.5版本及以上支持), 0: 流畅; 1: 标清; 2: 高清; 3: 超清; 4: 极清; 5: 3K; 6: 4K ; "pp": "性能优先 (Performance Priority)"; "qp": "画质优先(Quality Priority)"。 如果没有命中,默认取上次的设置</td><td>N</td></tr>
274274
<tr><td>loggerOptions</td><td> {name: string, level: "INFO" | "LOG" | "WARN" | "ERROR" , showTime: boolean}</td><td>本地日志设置, 默认值 {name: "ezuikit", level: "INFO", showTime: true}, 支持动态设置请参考 <a href="#日志设置">setLoggerOptions(options)</a> (v8.1.9版本及以上支持)</td><td>N</td></tr>
275275
<tr><td>streamInfoCBType</td><td> 0 | 1 </td><td> 流信息回调类型,监听 streamInfoCB 事件, 0 : 每次都回调(会影响性能), 1 : 只回调一次, 默认值 1 (v8.1.9版本及以上支持)</td><td>N</td></tr>
276276

demos/base-demo/ezuikit.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/nginx-demo/html/ezuikit.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/react-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"ezuikit-js": "8.1.12-beta.1",
6+
"ezuikit-js": "8.1.12-beta.2",
77
"react": "^17",
88
"react-dom": "^17",
99
"react-scripts": "5.0.1",

demos/react-demo/pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/react-demo/src/Player.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useCallback, useRef } from "react";
2-
import EZUIKit from "ezuikit-js";
2+
import { EZUIKitPlayer } from "ezuikit-js";
33
import { isMobile } from "./utils";
44

55
const Player = () => {
@@ -27,14 +27,16 @@ const Player = () => {
2727
player.current = null;
2828
}
2929

30-
player.current = new EZUIKit.EZUIKitPlayer({
30+
// https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm?tab=readme-ov-file#%E9%99%84%E5%BD%95-%E5%88%9D%E5%A7%8B%E5%8C%96%E5%8F%82%E6%95%B0%E8%AF%B4%E6%98%8E
31+
player.current = new EZUIKitPlayer({
3132
id: "player-container",
3233
url: urlRef.current.value, // "ezopen://open.ys7.com/BB9480953/1.hd.live",
3334
accessToken: accessTokenRef.current.value, // "at.2ec3m7dga2v59cps6rv0d1haa2vqsjka-1lbu5f5hyi-1j9rleq-npvuluse",
3435
width,
3536
height,
3637
template: "pcLive",
3738
language: "en", // zh | en
39+
// quality: 1, //
3840
// isCloudRecord: true, // 如果是云录制的播放 需要这个值,是必须的
3941
env: {
4042
// https://open.ys7.com/help/1772?h=domain
@@ -62,10 +64,12 @@ const Player = () => {
6264
// v8.1.10
6365
// 自定义清晰度 默认 null, 如果有值 sdk 内部不在进行获取, null 默认使用接口获取的清晰度列表, videoLevelList.length === 0 不展示清晰度控件 sdk 内部不在进行获取, videoLevelList.length > 0 展示控件 sdk 内部不在进行获取
6466
// videoLevelList: [
65-
// { level: 0, name: "流畅", streamTypeIn: 1 },
66-
// { level: 1, name: "标清", streamTypeIn: 1 },
67+
// { level: 1, name: "标清", streamTypeIn: 2 }, // 需要保证支持子码流 (streamTypeIn=2)
68+
// { level: 2, name: "高清", streamTypeIn: 1 },
6769
// ],
6870
});
71+
72+
window.player = player.current;
6973
}
7074
}, []);
7175

demos/react-demo/src/PlayerClass.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from "react";
2-
import EZUIKit from "ezuikit-js";
2+
import { EZUIKitPlayer } from "ezuikit-js";
3+
34

45
let player = null;
56

@@ -23,16 +24,17 @@ class App extends React.Component {
2324
}
2425

2526
if (document.getElementById("player-container")) {
26-
player = new EZUIKit.EZUIKitPlayer({
27+
player = new EZUIKitPlayer({
2728
id: "player-container", // 视频容器ID
2829
url: "ezopen://open.ys7.com/BC7799091/1.hd.live",
2930
accessToken:
30-
"at.d525oyj8d7bwohb40ssn3266cfq2mwi2-8hgpypehn9-1fafaty-ea2fxbc1",
31+
"at.2s5bel782emtho68ae31snumc1wuuioa-3d531vj77f-0gtnx7g-fddkee44",
3132
// simple:极简版; pcLive: pc直播; pcRec: pc回放; mobileLive: 移动端直播; mobileRec: 移动端回放; security: 安防版; voice: 语音版;
3233
template: "pcLive",
3334
plugin: ["talk"], // 加载插件,talk-对讲
3435
width: 600,
3536
height: 400,
37+
quality: 1, //
3638
handleFirstFrameDisplay: (res) => {
3739
// 首帧
3840
},
@@ -50,10 +52,10 @@ class App extends React.Component {
5052
},
5153
// v8.1.10
5254
// 自定义清晰度 默认 null, 如果有值 sdk 内部不在进行获取, null 默认使用接口获取的清晰度列表, videoLevelList.length === 0 不展示清晰度控件 sdk 内部不在进行获取, videoLevelList.length > 0 展示控件 sdk 内部不在进行获取
53-
videoLevelList: [
54-
{ level: 0, name: "流畅", streamTypeIn: 2 },
55-
{ level: 1, name: "标清", streamTypeIn: 1 },
56-
],
55+
// videoLevelList: [
56+
// { level: 1, name: "标清", streamTypeIn: 2 }, // 需要保证支持子码流 (streamTypeIn=2)
57+
// { level: 2, name: "高清", streamTypeIn: 1 },
58+
// ],
5759
});
5860
}
5961
// });

demos/vue-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"core-js": "^3.6.5",
13-
"ezuikit-js": "^8.1.12",
13+
"ezuikit-js": "8.1.12-beta.2",
1414
"vue": "^2.7"
1515
},
1616
"devDependencies": {

demos/vue-demo/pnpm-lock.yaml

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)