diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html index b37b35a2..6493d247 100644 --- a/yanzhu-bigscreen/public/index.html +++ b/yanzhu-bigscreen/public/index.html @@ -16,7 +16,7 @@ diff --git a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js index a97a6a6c..adc21091 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js +++ b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js @@ -14,6 +14,7 @@ Page({ ysToken: '', palyUrl: '', channelNo: 0, + loginName: '', }, /** @@ -31,7 +32,8 @@ Page({ let _url = "rtmp://open.ys7.com/"+_dat[0]+"/"+_cha+"/live"; this.setData({ palyUrl: _url, - channelNo: _cha + channelNo: _cha, + loginName: app.globalData.userData.userName, }); }, diff --git a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml index ba16115c..c09969a0 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml @@ -19,10 +19,10 @@ id="ezplayer" accessToken="{{ysToken}}" url="{{palyUrl}}" - plugins="talk,voice,capture" + plugins="talk,voice,capture,ptz" width="360" height="300" - watermark="shuiyin" + watermark="{{loginName}}" themeData="{'poster':'','controls':{fullScreenBtn:false,hdBtn:true}}" channelNo="{{channelNo}}" bind:handleError="handleError"