周伟鹏 / cnlive_shenhe · Commits

Commit 46d4c6c1228e7050a994f8894d9b3d9c61bd9a8f

Authored by liwei2917
1 parent 964e7cb9

直播页面修改

Inline Side-by-side
Showing 1 changed file with 29 additions and 11 deletions
src/main/resources/templates/page/live.html
  View file @46d4c6c
@@ -186,15 +186,33 @@ @@ -186,15 +186,33 @@
186 <div class="fixed-table-body"> 186 <div class="fixed-table-body">
187 <table id="table"> 187 <table id="table">
188 <div> 188 <div>
189 - <div class="col-xs-2 col-lg-2 margin-bottom action" th:each="live : ${livePage.list}">  
190 - <a href="#" class="thumbnail margin-bottom"  
191 - th:onclick="@{'preview(\''+${live.rtmp_url}+'\')'}">  
192 - <div style="text-align: center"> 189 + <div class="col-xs-3 col-lg-3 margin-bottom action" th:each="live : ${livePage.list}">
  190 +<!-- <a href="#" class="thumbnail margin-bottom" -->
  191 +<!-- th:onclick="@{'preview(\''+${live.rtmp_url}+'\')'}"> -->
  192 +<!-- <div style="text-align: center"> -->
  193 +<!-- <img th:src='@{${live.cover_img_url}}' -->
  194 +<!-- alt="封面图" width="134px" height="100px"> -->
  195 +<!-- </div> -->
  196 +
  197 +<!-- </a> -->
  198 + <div class="form-group" th:if="${live.activity_status != 1 }">
  199 + <div style="height: 200px">
193 <img th:src='@{${live.cover_img_url}}' 200 <img th:src='@{${live.cover_img_url}}'
194 - alt="封面图" width="134px" height="100px"> 201 + alt="封面图" width="100%" height="100%">
195 </div> 202 </div>
196 203
197 - </a> 204 + </div>
  205 + <div class="form-group" th:if="${live.activity_status== 1 }">
  206 + <div class="modal-body" style="height: 200px">
  207 + <embed name="cnlive" width="100%" height="100%" id="cnlive"
  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}}"
  210 + type="application/x-shockwave-flash" wmode="window"
  211 + quility="high" allowscriptaccess="always"
  212 + allowfullscreen="true">
  213 + </div>
  214 +
  215 + </div>
198 <div> 216 <div>
199 <p style="line-height: 0"> 217 <p style="line-height: 0">
200 <span class="text-success" th:text="${live.shenhe_state==2?'已审':'待审'}">待审</span> 218 <span class="text-success" th:text="${live.shenhe_state==2?'已审':'待审'}">待审</span>
@@ -208,11 +226,11 @@ @@ -208,11 +226,11 @@
208 <p class="info-box-text"> 226 <p class="info-box-text">
209 <span style="float: left;">id:<span th:text="${live.id}">10225</span></span> 227 <span style="float: left;">id:<span th:text="${live.id}">10225</span></span>
210 <span style="float: right;"> <span style="margin-left: 40px;">&nbsp;&nbsp; 228 <span style="float: right;"> <span style="margin-left: 40px;">&nbsp;&nbsp;
211 - <span th:if="${live.activity_status==0}">直播撤销</span>  
212 - <span th:if="${live.activity_status==1}">正在直播</span>  
213 - <span th:if="${live.activity_status==2}">直播完成</span>  
214 - <span th:if="${live.activity_status==3}">等待直播</span>  
215 - <span th:if="${live.activity_status==4}">直播下线</span> 229 + <span th:if="${live.activity_status==0}" style="color:green;">直播撤销</span>
  230 + <span th:if="${live.activity_status==1}" style="color:blue;">正在直播</span>
  231 + <span th:if="${live.activity_status==2}" style="color:black;">直播完成</span>
  232 + <span th:if="${live.activity_status==3}" style="color:brown;">等待直播</span>
  233 + <span th:if="${live.activity_status==4}" style="color:red;">直播下线</span>
216 </span><span></span> 234 </span><span></span>
217 </span> 235 </span>
218 </p> 236 </p>