Commit b6bcb5f2f40bd08c68ea14e315473bb5e6dadf88
1 parent
b64d701f
隐藏liveplayer
Showing
2 changed files
with
7 additions
and
11 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
| @@ -439,12 +439,8 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements | @@ -439,12 +439,8 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements | ||
| 439 | redisCatchStorage.deleteSendRTPServer(platform.getServerGBId(), channelId, callIdHeader.getCallId(), null); | 439 | redisCatchStorage.deleteSendRTPServer(platform.getServerGBId(), channelId, callIdHeader.getCallId(), null); |
| 440 | try { | 440 | try { |
| 441 | responseAck(request, Response.REQUEST_TIMEOUT); | 441 | responseAck(request, Response.REQUEST_TIMEOUT); |
| 442 | - } catch (SipException e) { | ||
| 443 | - e.printStackTrace(); | ||
| 444 | - } catch (InvalidArgumentException e) { | ||
| 445 | - e.printStackTrace(); | ||
| 446 | - } catch (ParseException e) { | ||
| 447 | - e.printStackTrace(); | 442 | + } catch (SipException | InvalidArgumentException | ParseException e) { |
| 443 | + logger.error("[命令发送失败] 国标级联 录像回放 发送REQUEST_TIMEOUT: {}", e.getMessage()); | ||
| 448 | } | 444 | } |
| 449 | } else { | 445 | } else { |
| 450 | if (result.getMediaServerItem() != null) { | 446 | if (result.getMediaServerItem() != null) { |
web_src/src/components/dialog/devicePlayer.vue
| @@ -4,9 +4,9 @@ | @@ -4,9 +4,9 @@ | ||
| 4 | <el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()"> | 4 | <el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()"> |
| 5 | <div style="width: 100%; height: 100%"> | 5 | <div style="width: 100%; height: 100%"> |
| 6 | <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1"> | 6 | <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1"> |
| 7 | - <el-tab-pane label="LivePlayer" name="livePlayer"> | ||
| 8 | - <LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer> | ||
| 9 | - </el-tab-pane> | 7 | +<!-- <el-tab-pane label="LivePlayer" name="livePlayer">--> |
| 8 | +<!-- <LivePlayer v-if="showVideoDialog" ref="livePlayer" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :hasaudio="hasAudio" fluent autoplay live></LivePlayer>--> | ||
| 9 | +<!-- </el-tab-pane>--> | ||
| 10 | <el-tab-pane label="Jessibuca" name="jessibuca"> | 10 | <el-tab-pane label="Jessibuca" name="jessibuca"> |
| 11 | <jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer> | 11 | <jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px" :hasAudio="hasAudio" fluent autoplay live ></jessibucaPlayer> |
| 12 | </el-tab-pane> | 12 | </el-tab-pane> |
| @@ -317,11 +317,11 @@ export default { | @@ -317,11 +317,11 @@ export default { | ||
| 317 | return { | 317 | return { |
| 318 | video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4', | 318 | video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4', |
| 319 | videoUrl: '', | 319 | videoUrl: '', |
| 320 | - activePlayer: "livePlayer", | 320 | + activePlayer: "jessibuca", |
| 321 | // 如何你只是用一种播放器,直接注释掉不用的部分即可 | 321 | // 如何你只是用一种播放器,直接注释掉不用的部分即可 |
| 322 | player: { | 322 | player: { |
| 323 | jessibuca : ["ws_flv", "wss_flv"], | 323 | jessibuca : ["ws_flv", "wss_flv"], |
| 324 | - // livePlayer : ["ws_flv", "wss_flv"], | 324 | + livePlayer : ["ws_flv", "wss_flv"], |
| 325 | webRTC: ["rtc", "rtc"], | 325 | webRTC: ["rtc", "rtc"], |
| 326 | }, | 326 | }, |
| 327 | videoHistory: { | 327 | videoHistory: { |