Commit ed6403555fc1c6527acc80913de4e9a0c550f203

Authored by 徐近程
2 parents 559f11fb c3096a29

Merge branch 'dev'

src/main/resources/templates/page/liveDetail.html
@@ -106,17 +106,27 @@ @@ -106,17 +106,27 @@
106 </div> 106 </div>
107 107
108 <div class="form-group" th:if="${live.activity_status!= 4 and live.activity_status!= 2}"> 108 <div class="form-group" th:if="${live.activity_status!= 4 and live.activity_status!= 2}">
109 - <div class="col-sm-10">  
110 - <div class="modal-body" style="height: 400px">  
111 - <embed name="cnlive" width="450" height="100%" id="cnlive"  
112 - src="http://data.cnlive.com/export/UuidPlayerMain.swf"  
113 - th:flashVars="@{'hasBorder=false&appid=82_irej0pbo53&type=live&model=2&videoURL='+${live.rtmp_url}}"  
114 - type="application/x-shockwave-flash" wmode="window"  
115 - quility="high" allowscriptaccess="always"  
116 - allowfullscreen="true">  
117 - </div>  
118 -  
119 - </div> 109 + <div class="col-sm-10">
  110 + <div class="modal-body" id="videoBox" style="height:400px">
  111 + <script type="text/javascript"
  112 + src="//resweb.cnliveimg.com/sites/common/cnlive_video.min.js"></script>
  113 + <script th:inline="javascript">
  114 + var videoUrl = [[${live.m3u8_url}]];
  115 + var cover = [[${live.cover_img_url}]];
  116 + cnliveVideo.init({
  117 + "eleId": "videoBox",
  118 + "width": 450,//指定放入指定ID元素内
  119 + "height": 400,
  120 + "model": 3,
  121 + "autoplay": 1,
  122 + "currRate": 3,
  123 + "cover": cover,
  124 + "videoUrl_3": videoUrl
  125 + });
  126 + </script>
  127 +
  128 + </div>
  129 + </div>
120 </div> 130 </div>
121 131
122 132