Pre Merge pull request !42 from 樊冲/fix-bug-fanchong

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -217,7 +217,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                         if (sendRtpItem.isTcpActive()) {
                             MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
                             try {
-                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5);
+                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5*1000);
                                 DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(sendRtpItem.getChannelId());
                                 if (deviceChannel != null) {
                                     redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, deviceChannel, platform);

web/src/store/modules/play.js

@@ -11,7 +11,7 @@ const actions = {
       })
     })
   },
-  stop({ commit }, [deviceId, channelId]) {
+  stop({ commit }, { deviceId, channelId }) {
     return new Promise((resolve, reject) => {
       stop(deviceId, channelId).then(response => {
         const { data } = response

web/src/views/device/channel/index.vue

@@ -422,7 +422,10 @@ export default {
       })
     },
     stopDevicePush: function(itemData) {
-      this.$store.dispatch('play/stop', [this.deviceId, itemData.deviceId]).then(data => {
+      this.$store.dispatch('play/stop', {
+        deviceId: this.deviceId,
+        channelId: itemData.deviceId
+      }).then(data => {
         this.initData()
       }).catch((error) => {
         if (error.response.status === 402) { // 已经停止过