jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jiangyq:6417d07c7a710574d8a71b33d910cd53461f7472
Branches Tags
jiangyq:dev_xd
jiangyq:main
..
compare: jiangyq:2f324e08658671aca3fac0cfad1a31289cbd8dc3
Branches Tags
jiangyq:dev_xd
jiangyq:main

No commits in common. "6417d07c7a710574d8a71b33d910cd53461f7472" and "2f324e08658671aca3fac0cfad1a31289cbd8dc3" have entirely different histories.
6417d07c7a ... 2f324e0865

4 changed files with 3 additions and 295 deletions
Show Stats Expand all files Collapse all files

7
yanzhu-bigscreen/public/index.html
View File

@ -14,16 +14,9 @@
<link rel="stylesheet" href="css/sichuanTibet.css?v=2024103201" /> <link rel="stylesheet" href="css/sichuanTibet.css?v=2024103201" />
<<<<<<< HEAD
<script
type="text/javascript"
src="https://api.map.baidu.com/api?type=webgl&v=1.0&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"
></script>
=======
<script <script
type="text/javascript" type="text/javascript"
src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"></script> src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"></script>
>>>>>>> 2f324e08658671aca3fac0cfad1a31289cbd8dc3
<script src="/cdn/vue/dist/vue.js"></script> <script src="/cdn/vue/dist/vue.js"></script>
<script src="/cdn/element-ui/lib/index.js"></script> <script src="/cdn/element-ui/lib/index.js"></script>
<script src="/cdn/jquery/3.5.1/jquery.min.js"></script> <script src="/cdn/jquery/3.5.1/jquery.min.js"></script>

283
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/TestBsController.java
View File

File diff suppressed because one or more lines are too long

4
yanzhu-ui-app/miniprogram/pageage/project_video/info/index.js
View File

@ -14,7 +14,6 @@ Page({
ysToken: '', ysToken: '',
palyUrl: '', palyUrl: '',
channelNo: 0, channelNo: 0,
loginName: '',
}, },
/** /**
@ -32,8 +31,7 @@ Page({
let _url = "rtmp://open.ys7.com/"+_dat[0]+"/"+_cha+"/live"; let _url = "rtmp://open.ys7.com/"+_dat[0]+"/"+_cha+"/live";
this.setData({ this.setData({
palyUrl: _url, palyUrl: _url,
channelNo: _cha, channelNo: _cha
loginName: app.globalData.userData.userName,
}); });
}, },

4
yanzhu-ui-app/miniprogram/pageage/project_video/info/index.wxml
View File

@ -19,10 +19,10 @@
id="ezplayer" id="ezplayer"
accessToken="{{ysToken}}" accessToken="{{ysToken}}"
url="{{palyUrl}}" url="{{palyUrl}}"
plugins="talk,voice,capture,ptz" plugins="talk,voice,capture"
width="360" width="360"
height="300" height="300"
watermark="{{loginName}}" watermark="shuiyin"
themeData="{'poster':'','controls':{fullScreenBtn:false,hdBtn:true}}" themeData="{'poster':'','controls':{fullScreenBtn:false,hdBtn:true}}"
channelNo="{{channelNo}}" channelNo="{{channelNo}}"
bind:handleError="handleError" bind:handleError="handleError"