合并主线

src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -89,12 +89,6 @@ public class MediaServerServiceImpl implements IMediaServerService {
     private ZLMRTPServerFactory zlmrtpServerFactory;
 
 
-    @Autowired
-    private IVideoManagerStorage storager;
-
-    @Autowired
-    private IStreamProxyService streamProxyService;
-
     @Autowired
     private EventPublisher publisher;
 
@@ -288,6 +282,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
         return (MediaServerItem)RedisUtil.get(key);
     }
 
+
     @Override
     public MediaServerItem getDefaultMediaServer() {
 

src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java

@@ -24,13 +24,9 @@ public class MediaServiceImpl implements IMediaService {
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
 
-    @Autowired
-    private IVideoManagerStorage storager;
-
     @Autowired
     private IMediaServerService mediaServerService;
 
-
     @Autowired
     private MediaConfig mediaConfig;
 

src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 
+import javax.sip.InvalidArgumentException;
 import javax.sip.ResponseEvent;
 
 import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -745,7 +746,7 @@ public class PlayServiceImpl implements IPlayService {
                     zlmresTfulUtils.closeStreams(mediaInfo, sendRtpItem.getApp(), sendRtpItem.getStreamId());
                 }
                 if (audioBroadcastCatch.getStatus() == AudioBroadcastCatchStatus.Ok) {
-                    cmder.streamByeCmd(audioBroadcastCatch.getDialog(), audioBroadcastCatch.getRequest(), null);
+                    cmder.streamByeCmd(audioBroadcastCatch.getDialog(), audioBroadcastCatch.getChannelId(), audioBroadcastCatch.getRequest(), null);
                 }
                 audioBroadcastManager.del(deviceId, channelId);
 
@@ -753,6 +754,8 @@ public class PlayServiceImpl implements IPlayService {
                 throw new RuntimeException(e);
             } catch (ParseException e) {
                 throw new RuntimeException(e);
+            } catch (InvalidArgumentException e) {
+                throw new RuntimeException(e);
             }
         }
 

src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java

@@ -76,12 +76,6 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
     @Autowired
     private PlatformGbStreamMapper platformGbStreamMapper;
 
-    @Autowired
-    private EventPublisher eventPublisher;
-
-    @Autowired
-    private ParentPlatformMapper parentPlatformMapper;
-
     @Autowired
     private IGbStreamService gbStreamService;