Merge branch 'master' into 2.7.0

648540858

2024-03-28 53d4d10e1c5b346f01501b3ba5f10beccb2f3864

 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;
    }

}