Merge branch 'master' into dev/abl支持

648540858

2024-03-28 dae67453c4449fbdd9afebd87de049c70c72418d

 src/main/java/com/genersoft/iot/vmp/common/InviteInfo.java

@@ -28,7 +28,7 @@
    private StreamInfo streamInfo;


    public static InviteInfo getinviteInfo(String deviceId, String channelId, String stream, SSRCInfo ssrcInfo,
    public static InviteInfo getInviteInfo(String deviceId, String channelId, String stream, SSRCInfo ssrcInfo,
                                           String receiveIp, Integer receivePort, String streamMode,
                                           InviteSessionType type, InviteSessionStatus status) {
        InviteInfo inviteInfo = new InviteInfo();
@@ -123,4 +123,5 @@
    public void setStreamMode(String streamMode) {
        this.streamMode = streamMode;
    }

}