Skip to content

Commit 925c805

Browse files
committed
update
1 parent a60beb8 commit 925c805

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+21492
-2727
lines changed

.github/workflows/build-demos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ jobs:
5252
working-directory: ./demos/with-vue2.6
5353
run: |
5454
pnpm install --no-frozen-lockfile
55-
pnpm run build
55+
pnpm run build
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: build-uniapp-vue2
2+
3+
on:
4+
push:
5+
branches: ["main", "develop"]
6+
pull_request:
7+
branches: ["main"]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [16.x, 18.x, 20.x, 21.x, 22.x] # not support node >= 23.x and node<=16.x
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
24+
- name: Build with-uniapp-vue2
25+
working-directory: ./demos/with-uniapp-vue2
26+
run: |
27+
yarn install
28+
yarn run build:h5
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: build-uniapp-vue3
2+
3+
on:
4+
push:
5+
branches: ["main", "develop"]
6+
pull_request:
7+
branches: ["main"]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [18.x, 20.x, 21.x, 22.x, 23.x, 24.x] # node>=18.x
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
24+
- name: Build with-uniapp-vue3
25+
working-directory: ./demos/with-uniapp-vue3
26+
run: |
27+
yarn install
28+
yarn run build:h5

.github/workflows/relese.yml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,44 @@ jobs:
1111
name: Release
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
15+
16+
- name: Check file versions
17+
run: |
18+
files="ezuikit.js index.js index.mjs package.json"
19+
20+
version=""
21+
inconsistent=false
22+
23+
for file in $files; do
24+
if [ ! -f "$file" ]; then
25+
echo "缺少文件: $file"
26+
inconsistent=true
27+
continue
28+
fi
29+
v=$(head -3 "$file" | grep -Eo '([0-9]+\.[0-9]+\.[0-9]+)+(-[a-z]+\.[0-9]+)?')
30+
if [ -z "$v" ]; then
31+
echo "文件 $file 未检测到版本号"
32+
inconsistent=true
33+
continue
34+
fi
35+
if [ -z "$version" ]; then
36+
version="$v"
37+
else
38+
if [ "$version" != "$v" ]; then
39+
echo "文件 $file 的版本号 $v 与其它文件版本号 $version 不一致"
40+
inconsistent=true
41+
fi
42+
fi
43+
done
44+
45+
if [ "$inconsistent" = true ]; then
46+
echo "版本号不一致,禁止推送!"
47+
exit 1
48+
fi
49+
50+
echo "所有文件版本号一致: $version"
51+
1552
# # 设置 pnpm
1653
# - name: Setup PNPM
1754
# uses: pnpm/action-setup@v2

.gitignore

Lines changed: 2 additions & 3 deletions
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
@@ -22,5 +21,5 @@ npm-debug.log*
2221
npm-error.log*
2322
yarn-debug.log*
2423
demos/with-electron/release
25-
26-
24+
demos/with-electron/dist
25+

README.md

Lines changed: 16 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ import EZUIKit from "ezuikit-js";
4040
#### 不支持 ESM (not support ESM)
4141

4242
```js
43+
// UMD
44+
import EZUIKit from "ezuikit-js/ezuikit.js";
45+
4346
// >= v8.1.2 CommonJS
4447
import { EZUIKitPlayer } from "ezuikit-js/index.js";
4548

@@ -122,6 +125,10 @@ alpha(功能测试)、beta(集成测试)为我们的非正式版本,
122125
> 如果使用 vue2.7,可参考 demos => [vue-demo](https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/tree/master/demos/vue-demo)
123126
124127
> 如果使用 vue2.6,可参考 demos => [with-vue2.6](https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/tree/master/demos/with-vue2.6)
128+
>
129+
> 如果使用 uniapp + vue3 ,可参考 demos => [with-uniapp-vue3](https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/tree/master/demos/with-uniapp-vue3)
130+
>
131+
> 如果使用 uniapp + vue2 ,可参考 demos => [with-uniapp-vue2](https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/tree/master/demos/with-uniapp-vue2)
125132
126133
#### tips
127134

@@ -176,19 +183,19 @@ const player = new EZUIKitPlayer({
176183
177184
### 使用示例
178185

179-
> 1. 快速创建视频播放页面
186+
#### 快速创建视频播放页面
180187

181188
&emsp;&emsp;&emsp;&emsp;<b>基本使用:</b> <a href="https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/demos/base-demo/index.html" target="_blank">基本使用示例</a>
182189

183-
> 2. 前往[开放平台轻应用模板管理页](https://open.ys7.com/console/ezuikit/template.html)创建一个主题,可以动态配置你的播放主题,控件,示例展示了获取一个主题后使用示例。
190+
#### 前往[开放平台轻应用模板管理页](https://open.ys7.com/console/ezuikit/template.html)创建一个主题,可以动态配置你的播放主题,控件,示例展示了获取一个主题后使用示例。
184191

185192
&emsp;&emsp;&emsp;&emsp;<b>自定义主题:</b> <a href="https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/demos/base-demo/template.html" target="_blank">自定义主题示例</a>
186193

187-
> 3. 你可以本地创建一个主题配置,可以本地配置你的播放主题,控件,示例展示了本地配置项使用示例。
194+
#### 你可以本地创建一个主题配置,可以本地配置你的播放主题,控件,示例展示了本地配置项使用示例。
188195

189196
&emsp;&emsp;&emsp;&emsp;<b>本地主题配置:</b> <a href="https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/demos/base-demo/themeData.html" target="_blank">本地主题配置示例</a>
190197

191-
> 4. 我们提供了一些通用场景的主题,PC 端预览,PC 端回放,移动端预览,移动端回放,你也可以直接使用。
198+
#### 我们提供了一些通用场景的主题,PC 端预览,PC 端回放,移动端预览,移动端回放,你也可以直接使用。
192199

193200
&emsp;&emsp;&emsp;&emsp;<b>PC 端预览-固定主题:</b> <a href="https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/demos/base-demo/pcLive.html" target="_blank">PC 端预览-固定主题示例</a>
194201

@@ -198,7 +205,7 @@ const player = new EZUIKitPlayer({
198205

199206
&emsp;&emsp;&emsp;&emsp;<b>移动端回放-固定主题:</b> <a href="https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/demos/base-demo/mobileRec.html" target="_blank">移动端回放-固定主题示例</a>
200207

201-
> 同一个页面播放多个视频,可以参考:
208+
#### 同一个页面播放多个视频,可以参考:
202209

203210
&emsp;&emsp;&emsp;&emsp;<b>单页面多实例(视频多窗口):</b> <a href="https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/demos/base-demo/multi.html" target="_blank">单页面多实例(视频多窗口)示例</a>
204211

@@ -253,131 +260,11 @@ ezopen://open.ys7.com/${设备序列号}/{通道号}.hd.live<br/>
253260
</table>
254261

255262
</td><td>N</td></tr>
256-
<tr><td>themeData</td><td>Object</td><td>
263+
<tr><td><a href="./themeData.md" target="_blank">themeData</a></td><td><a href="./themeData.md" target="_blank">ThemeData</a></td><td>
257264
themeData将主题数据本地化,设置本地数据,需要删除template参数 <br />
258265
你可以通过themeData修改按钮位置,颜色,头部底部颜色等配置。
259266

260-
配置示例:
261-
262-
<pre><code>
263-
264-
{
265-
"autoFocus": 5,
266-
"poster":"https://resource.eziot.com/group1/M00/00/89/CtwQEmLl8r-AZU7wAAETKlvgerU237.png",
267-
"header": {
268-
"color": "#1890ff",
269-
"activeColor": "#FFFFFF",
270-
"backgroundColor": "#000000",
271-
"btnList": [
272-
{
273-
"iconId": "deviceID",
274-
"part": "left",
275-
"defaultActive": 0,
276-
"memo": "顶部设备名称",
277-
"isrender": 1
278-
},
279-
{
280-
"iconId": "deviceName",
281-
"part": "left",
282-
"defaultActive": 0,
283-
"memo": "顶部设备ID",
284-
"isrender": 1
285-
},
286-
{
287-
"iconId": "cloudRec",
288-
"part": "right",
289-
"defaultActive": 0,
290-
"memo": "头部云存储回放",
291-
"isrender": 0
292-
},
293-
{
294-
"iconId": "rec",
295-
"part": "right",
296-
"defaultActive": 0,
297-
"memo": "头部本地回放",
298-
"isrender": 0
299-
}
300-
]
301-
},
302-
"footer": {
303-
"color": "#FFFFFF",
304-
"activeColor": "#1890FF",
305-
"backgroundColor": "#00000021",
306-
"btnList": [
307-
{
308-
"iconId": "play",
309-
"part": "left",
310-
"defaultActive": 1,
311-
"memo": "播放",
312-
"isrender": 1
313-
},
314-
{
315-
"iconId": "capturePicture",
316-
"part": "left",
317-
"defaultActive": 0,
318-
"memo": "截屏按钮",
319-
"isrender": 1
320-
},
321-
{
322-
"iconId": "sound",
323-
"part": "left",
324-
"defaultActive": 0,
325-
"memo": "声音按钮",
326-
"isrender": 1
327-
},
328-
{
329-
"iconId": "pantile",
330-
"part": "left",
331-
"defaultActive": 0,
332-
"memo": "云台控制按钮",
333-
"isrender": 1
334-
},
335-
{
336-
"iconId": "recordvideo",
337-
"part": "left",
338-
"defaultActive": 0,
339-
"memo": "录制按钮",
340-
"isrender": 1
341-
},
342-
{
343-
"iconId": "talk",
344-
"part": "left",
345-
"defaultActive": 0,
346-
"memo": "对讲按钮",
347-
"isrender": 1
348-
},
349-
{
350-
"iconId": "zoom",
351-
"part": "left",
352-
"defaultActive": 0,
353-
"memo": "电子放大",
354-
"isrender": 1
355-
},
356-
{
357-
"iconId": "hd",
358-
"part": "right",
359-
"defaultActive": 0,
360-
"memo": "清晰度切换按钮",
361-
"isrender": 1
362-
},
363-
{
364-
"iconId": "webExpend",
365-
"part": "right",
366-
"defaultActive": 0,
367-
"memo": "网页全屏按钮",
368-
"isrender": 1
369-
},
370-
{
371-
"iconId": "expend",
372-
"part": "right",
373-
"defaultActive": 0,
374-
"memo": "全局全屏按钮",
375-
"isrender": 1
376-
}
377-
]
378-
}
379-
}
380-
</code></pre>
267+
配置示例:<a href="https://github.com/Ezviz-OpenBiz/EZUIKit-JavaScript-npm/blob/master/demos/base-demo/themeData.html" target="_blank">本地主题配置示例</a>
381268

382269
</td><td>N</td></tr>
383270
<tr><td>plugin</td><td>String</td><td>按需加载插件,可选值: talk:对讲,示例:plugin:["talk"] </td><td>N</td></tr>
@@ -387,11 +274,11 @@ themeData将主题数据本地化,设置本地数据,需要删除template参
387274
<tr><td>language</td><td>String</td><td>多语言 (zh | en), 默认zh (v8.0.8版本及以上支持)</td><td>N</td></tr>
388275
<tr><td>debugDownloadData</td><td>boolean</td><td>下载原始码流, 调试码流使用, 默认 false (v8.1.1版本及以上支持)</td><td>N</td></tr>
389276
<tr><td>disableRenderPrivateData</td><td>boolean</td><td>禁止渲染私有数据(如智能分析, 移动侦测, 火点信息等), 默认 false (v8.1.1版本及以上支持)</td><td>N</td></tr>
390-
<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>
277+
<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>
391278
<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>
392279
<tr><td>streamInfoCBType</td><td> 0 | 1 </td><td> 流信息回调类型,监听 streamInfoCB 事件, 0 : 每次都回调(会影响性能), 1 : 只回调一次, 默认值 1 (v8.1.9版本及以上支持)</td><td>N</td></tr>
393280

394-
<tr><td>videoLevelList</td><td> <span>Array<{ </br>/** 清晰度 */</br>level: number, </br>/** 名称 */ </br>name: string, </br> /**1: 主码流,2: 子码流*/</br>streamTypeIn: 1 | 2 }> <span>| null </td><td> 自定义清晰度列表,默认null, 如果有值 sdk 内部不在进行获取, 为 null 使用接口获取的清晰度列表, videoLevelList.length === 0 不展示清晰度控件 sdk 内部不在进行获取, videoLevelList.length > 0 展示控件 sdk 内部不在进行获取 (v8.1.10版本及以上支持)</td><td>N</td></tr>
281+
<tr><td><a href="./videoLevelList.md" target="_blank">videoLevelList</a></td><td> <span>Array<{ </br>/** 清晰度 */</br>level: number, </br>/** 名称 */ </br>name: string, </br> /**1: 主码流,2: 子码流*/</br>streamTypeIn: 1 | 2 }> <span>| null </td><td> 自定义清晰度列表,默认null, 如果有值 sdk 内部不在进行获取, 为 null 使用接口获取的清晰度列表, videoLevelList.length === 0 不展示清晰度控件 sdk 内部不在进行获取, videoLevelList.length > 0 展示控件 sdk 内部不在进行获取 (v8.1.10版本及以上支持)</td><td>N</td></tr>
395282
</table>
396283

397284
### 方法调用

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: 28 additions & 13 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",
6+
"ezuikit-js": "8.1.12-beta.2",
77
"react": "^17",
88
"react-dom": "^17",
99
"react-scripts": "5.0.1",

0 commit comments

Comments
 (0)