周伟鹏 / cnlive_shenhe · Commits

Commit 8c43ae01f66c0a80e5520fff08a457e839a7cfbb

Authored by liwei2917
1 parent 13a6325d

直播测试

Inline Side-by-side
Showing 2 changed files with 19 additions and 8 deletions
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
  View file @8c43ae0
@@ -86,17 +86,22 @@ public class LiveControllerApi { @@ -86,17 +86,22 @@ public class LiveControllerApi {
86 shylive1.setSp_id(spId);//设置spid 86 shylive1.setSp_id(spId);//设置spid
87 shyLive.setActivity_name(activityName);//设置直播活动名称 87 shyLive.setActivity_name(activityName);//设置直播活动名称
88 shyLive.setActivity_status(activityStatus);//设置直播活动状态 88 shyLive.setActivity_status(activityStatus);//设置直播活动状态
89 - shyLive.setIs_hot(2);//是否是热点: 1:不是 ,2: 是  
90 if(activityStatus==3){//发布直播 89 if(activityStatus==3){//发布直播
91 shyLive.setActivity_start_time(timestamp_start); 90 shyLive.setActivity_start_time(timestamp_start);
92 shyLive.setActivity_end_time(timestamp_end); 91 shyLive.setActivity_end_time(timestamp_end);
  92 + shyLive.setIs_hot(2);//是否是热点: 1:不是 ,2: 是
93 }else if(activityStatus==1){//启动直播 93 }else if(activityStatus==1){//启动直播
94 - shyLive.setActivity_start_time(CommonUtils.getCurrentTime()); 94 + shyLive.setActivity_start_time(CommonUtils.getCurrentTime());
  95 + shyLive.setIs_hot(2);//是否是热点: 1:不是 ,2: 是
95 }else if(activityStatus==2){//停止直播 96 }else if(activityStatus==2){//停止直播
96 - shyLive.setActivity_end_time(CommonUtils.getCurrentTime());  
97 - shyLive.setPlayback_url(playbackUrl);//回放地址  
98 - shyLive.setShenhe_state(2);//状态 0:未认领 1.已领未审,2:已审  
99 - shyLive.setIs_hot(1);//是否是热点: 1:不是 ,2: 是 97 + shyLive.setActivity_end_time(CommonUtils.getCurrentTime());
  98 + shyLive.setPlayback_url(playbackUrl);//回放地址
  99 + shyLive.setShenhe_state(2);//状态 0:未认领 1.已领未审,2:已审
  100 + shyLive.setIs_hot(1);//是否是热点: 1:不是 ,2: 是
  101 + }else if(activityStatus==4){//审核强制下线
  102 + shyLive.setActivity_end_time(CommonUtils.getCurrentTime());
  103 + shyLive.setPlayback_url(playbackUrl);//回放地址
  104 + shyLive.setIs_hot(1);//是否是热点: 1:不是 ,2: 是
100 } 105 }
101 shyLive.setActivity_intro(activityIntro);//直播活动简介 106 shyLive.setActivity_intro(activityIntro);//直播活动简介
102 shyLive.setM3u8_url(hlsUrl);//m3u8直播流 107 shyLive.setM3u8_url(hlsUrl);//m3u8直播流
@@ -135,6 +140,12 @@ public class LiveControllerApi { @@ -135,6 +140,12 @@ public class LiveControllerApi {
135 shylive1.setPlayback_url(playbackUrl);//回放地址 140 shylive1.setPlayback_url(playbackUrl);//回放地址
136 shylive1.setShenhe_state(2); //状态 0:未认领 1.已领未审,2:已审 141 shylive1.setShenhe_state(2); //状态 0:未认领 1.已领未审,2:已审
137 shylive1.setIs_hot(1);//是否是热点: 1:不是 ,2: 是 142 shylive1.setIs_hot(1);//是否是热点: 1:不是 ,2: 是
  143 + }else if(activityStatus==4){//审核强制下线
  144 + shylive1.setActivity_start_time(timestamp_start);
  145 + shylive1.setActivity_end_time(CommonUtils.getCurrentTime());
  146 + shylive1.setPlayback_url(playbackUrl);//回放地址
  147 + shylive1.setShenhe_state(2); //状态 0:未认领 1.已领未审,2:已审
  148 + shylive1.setIs_hot(1);//是否是热点: 1:不是 ,2: 是
138 } 149 }
139 shylive1.setActivity_intro(activityIntro);//直播活动简介 150 shylive1.setActivity_intro(activityIntro);//直播活动简介
140 shylive1.setM3u8_url(hlsUrl);//m3u8直播流 151 shylive1.setM3u8_url(hlsUrl);//m3u8直播流
src/main/resources/templates/page/live.html
  View file @8c43ae0
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 238
239 </div> 239 </div>
240 <div class="width-10p pull-left padding-r-5" 240 <div class="width-10p pull-left padding-r-5"
241 - th:if="${live.activity_status==1 and live.shenhe_state==0}"> 241 + th:if="${live.shenhe_state==0}">
242 <button class="btn btn-primary btn-xs btn-block" title="认领" 242 <button class="btn btn-primary btn-xs btn-block" title="认领"
243 th:onclick="'applyReceive('+${live.id}+')'" data-field="action" 243 th:onclick="'applyReceive('+${live.id}+')'" data-field="action"
244 data-formatter="actionFormatter" data-events="actionEvents" 244 data-formatter="actionFormatter" data-events="actionEvents"
@@ -256,7 +256,7 @@ @@ -256,7 +256,7 @@
256 </button> 256 </button>
257 </div> 257 </div>
258 <div class="width-10p pull-left padding-r-5" 258 <div class="width-10p pull-left padding-r-5"
259 - th:if="${live.activity_status==1 and live.shenhe_state==1 and session.sessionUser.userId==live.auditor}"> 259 + th:if="${live.activity_status!=4 and live.activity_status!=2 and live.shenhe_state==1 and session.sessionUser.userId==live.auditor}">
260 <button class="btn btn-danger btn-xs btn-block" 260 <button class="btn btn-danger btn-xs btn-block"
261 title="退领" th:onclick="'applyRetReceive('+${live.id}+')'" 261 title="退领" th:onclick="'applyRetReceive('+${live.id}+')'"
262 data-toggle="tooltip" data-placement="top"> 262 data-toggle="tooltip" data-placement="top">