Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2d8a030

Browse files
yujianbohzyujianbohz
committed
[CHG]支持自定义选择解码库版本
1 parent 8353e93 commit 2d8a030

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

‎demos/base-demo/ezuikit.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
id: params.id,
145145
apiDomain: domain + '/api/lapp/live/talk/url',
146146
filePath: filePathDomain + '/assets/ezuikit_v2.6.4',
147+
decoderVersion: '',
147148
accessToken: '',
148149
url: '',
149150
deviceSerial: '',
@@ -177,6 +178,9 @@
177178
if (typeof params.audio !== 'undefined') {
178179
this.opt.audio = params.audio;
179180
}
181+
if (typeof params.decoderVersion !== 'undefined') {
182+
this.opt.decoderVersion = params.decoderVersion;
183+
}
180184
if (typeof params.env !== 'undefined') {
181185
if(typeof params.env.domain !== 'undefined'){
182186
domain = params.env.domain;
@@ -233,7 +237,7 @@
233237
function matchIframeUrl() {
234238
switch (_this.opt.template) {
235239
case 'simple':
236-
var iframeUrl = domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id;
240+
var iframeUrl = domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
237241
var controlsValue = "";
238242
if(typeof params.controls !== 'undefined' && params.controls){
239243
console.log("typeof" ,typeof params.controls)
@@ -248,13 +252,13 @@
248252
}
249253
return iframeUrl;
250254
case 'standard':
251-
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=1" + "&id=" + id;
255+
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=1" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
252256

253257
case 'security':
254-
return domain + "/ezopen/h5/iframe_se?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id;
258+
return domain + "/ezopen/h5/iframe_se?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
255259

256260
default:
257-
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id;
261+
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
258262
}
259263
}
260264

‎demos/base-demo/index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ <h2>视频模式使用示例：</h2>
3131
<script>
3232
var playr = new EZUIKit.EZUIKitPlayer({
3333
id: 'video-container', // 视频容器ID
34-
accessToken: 'xxx',
35-
url: 'ezopen://open.ys7.com/Cxxxxxxxx/1.live',
34+
accessToken: 'at.37xkb1049n2wcwwwdseys2bia0wpohl6-4n6euy2q2j-0k0eng6-yqmv5ipwp',
35+
url: 'ezopen://open.ys7.com/C69594192/1.live',
3636
template: 'simple', // simple - 极简版;standard-标准版;security - 安防版(预览回放);voice-语音版；
3737
autoplay: true,
3838
// 视频上方头部控件
@@ -53,6 +53,7 @@ <h2>视频模式使用示例：</h2>
5353
handleError: (data) => console.log("播放失败回调",data),
5454
handleTalkSuccess: () => console.log("对讲成功回掉"),
5555
handleTalkError: (data) = function(){console.log("对讲失败",data)},
56+
decoderVersion: "v2.6.4",
5657
width:375,
5758
height:400,
5859
});

‎ezuikit.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
id: params.id,
145145
apiDomain: domain + '/api/lapp/live/talk/url',
146146
filePath: filePathDomain + '/assets/ezuikit_v2.6.4',
147+
decoderVersion: '',
147148
accessToken: '',
148149
url: '',
149150
deviceSerial: '',
@@ -177,6 +178,9 @@
177178
if (typeof params.audio !== 'undefined') {
178179
this.opt.audio = params.audio;
179180
}
181+
if (typeof params.decoderVersion !== 'undefined') {
182+
this.opt.decoderVersion = params.decoderVersion;
183+
}
180184
if (typeof params.env !== 'undefined') {
181185
if(typeof params.env.domain !== 'undefined'){
182186
domain = params.env.domain;
@@ -233,7 +237,7 @@
233237
function matchIframeUrl() {
234238
switch (_this.opt.template) {
235239
case 'simple':
236-
var iframeUrl = domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id;
240+
var iframeUrl = domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
237241
var controlsValue = "";
238242
if(typeof params.controls !== 'undefined' && params.controls){
239243
console.log("typeof" ,typeof params.controls)
@@ -248,13 +252,13 @@
248252
}
249253
return iframeUrl;
250254
case 'standard':
251-
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=1" + "&id=" + id;
255+
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=1" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
252256

253257
case 'security':
254-
return domain + "/ezopen/h5/iframe_se?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id;
258+
return domain + "/ezopen/h5/iframe_se?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
255259

256260
default:
257-
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id;
261+
return domain + "/ezopen/h5/iframe?bSupporDoubleClickFull=0&url=" + _this.opt.url.replace("?","&") + "&autoplay=" + _this.opt.autoplay + "&audio=" + _this.opt.audio + "&accessToken=" + params.accessToken + "&templete=0" + "&id=" + id + "&decoderVersion=" + _this.opt.decoderVersion;
258262
}
259263
}
260264

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ezuikit-js",
3-
"version": "0.2.4",
3+
"version": "0.2.5",
44
"description": "ezuikit javascript for npm",
55
"main": "ezuikit.js",
66
"scripts": {

0 commit comments

Comments
 (0)