Commit 246f6c1e4d5a95ff5c472b58fa35d0716a0aca16

Authored by liwei2917
2 parents 7af2a6df 87397f35

Merge branch 'dev'

src/main/resources/templates/page/live.html
@@ -203,7 +203,7 @@ @@ -203,7 +203,7 @@
203 203
204 </div> 204 </div>
205 <div class="form-group" th:if="${live.activity_status== 1 }"> 205 <div class="form-group" th:if="${live.activity_status== 1 }">
206 - <div class="modal-body" style="height: 200px"> 206 + <div style="height: 200px">
207 <embed name="cnlive" width="100%" height="100%" id="cnlive" 207 <embed name="cnlive" width="100%" height="100%" id="cnlive"
208 src="http://data.cnlive.com/export/UuidPlayerMain.swf" 208 src="http://data.cnlive.com/export/UuidPlayerMain.swf"
209 th:flashVars="@{'hasBorder=false&appid=82_irej0pbo53&type=live&model=2&videoURL='+${live.rtmp_url}}" 209 th:flashVars="@{'hasBorder=false&appid=82_irej0pbo53&type=live&model=2&videoURL='+${live.rtmp_url}}"