合并分支

smsb-modules/smsb-netty/src/main/java/com/inspur/netty/stream/service/impl/StreamServiceImpl.java

@@ -63,8 +63,7 @@ public class StreamServiceImpl implements IStreamService {
         smsbDeviceTaskService.createNewDeviceTask(DeviceTaskConstants.DEVICE_TASK_STREAM_START, smsbDeviceVo, taskParam);
         // 5 发送netty消息，通知设备开始推流
         String nettyMessage = PushMessageType.CONTROL_START_STREAM.getValue() + "|" + streamUrl;
-        // boolean pushResult = PushMsgUtil.sendV2(smsbDeviceVo.getIdentifier(), nettyMessage);
-        boolean pushResult = true;
+        boolean pushResult = PushMsgUtil.sendV2(smsbDeviceVo.getIdentifier(), nettyMessage);
         resultVo.setPushResult(pushResult);
         resultVo.setViewUrl(viewUrl);
         return resultVo;