Merge branch '648540858:master' into develop-add-api-key

ancienter

2024-04-09 25ff2fc4ef2ad4bfccf6d2059d0159608ad71f8f

 src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java

@@ -49,7 +49,7 @@
    /**
     * 设备推流的streamId
     */
    private String streamId;
    private String stream;

    /**
     * 是否为tcp
@@ -117,6 +117,11 @@
     */
    private InviteStreamType playType;

    /**
     * 发流的同时收流
     */
    private String receiveStream;

    public String getIp() {
        return ip;
    }
@@ -181,12 +186,12 @@
        this.app = app;
    }

    public String getStreamId() {
        return streamId;
    public String getStream() {
        return stream;
    }

    public void setStreamId(String streamId) {
        this.streamId = streamId;
    public void setStream(String stream) {
        this.stream = stream;
    }

    public boolean isTcp() {
@@ -292,4 +297,41 @@
    public void setRtcp(boolean rtcp) {
        this.rtcp = rtcp;
    }

    public String getReceiveStream() {
        return receiveStream;
    }

    public void setReceiveStream(String receiveStream) {
        this.receiveStream = receiveStream;
    }

    @Override
    public String toString() {
        return "SendRtpItem{" +
                "ip='" + ip + '\'' +
                ", port=" + port +
                ", ssrc='" + ssrc + '\'' +
                ", platformId='" + platformId + '\'' +
                ", deviceId='" + deviceId + '\'' +
                ", app='" + app + '\'' +
                ", channelId='" + channelId + '\'' +
                ", status=" + status +
                ", stream='" + stream + '\'' +
                ", tcp=" + tcp +
                ", tcpActive=" + tcpActive +
                ", localPort=" + localPort +
                ", mediaServerId='" + mediaServerId + '\'' +
                ", serverId='" + serverId + '\'' +
                ", CallId='" + CallId + '\'' +
                ", fromTag='" + fromTag + '\'' +
                ", toTag='" + toTag + '\'' +
                ", pt=" + pt +
                ", usePs=" + usePs +
                ", onlyAudio=" + onlyAudio +
                ", rtcp=" + rtcp +
                ", playType=" + playType +
                ", receiveStream='" + receiveStream + '\'' +
                '}';
    }
}