Merge pull request #778 from xiaoQQya/wvp-28181-2.0

648540858

2023-03-14 e3be796314346bcdcd94d819b2a1438d76dcf2d7

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java

@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.media.zlm;

import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson2.annotation.JSONField;

public class ZLMServerConfig {

@@ -32,7 +32,7 @@
    private String generalMaxStreamWaitMS;

    @JSONField(name = "general.streamNoneReaderDelayMS")
    private String generalStreamNoneReaderDelayMS;
    private int generalStreamNoneReaderDelayMS;

    @JSONField(name = "ip")
    private String ip;
@@ -64,6 +64,9 @@

    @JSONField(name = "hook.admin_params")
    private String hookAdminParams;

    @JSONField(name = "hook.alive_interval")
    private Float hookAliveInterval;

    @JSONField(name = "hook.enable")
    private String hookEnable;
@@ -191,6 +194,9 @@
    @JSONField(name = "rtp_proxy.port")
    private int rtpProxyPort;

    @JSONField(name = "rtp_proxy.port_range")
    private String portRange;

    @JSONField(name = "rtp_proxy.timeoutSec")
    private String rtpProxyTimeoutSec;

@@ -296,11 +302,11 @@
        this.generalMaxStreamWaitMS = generalMaxStreamWaitMS;
    }

    public String getGeneralStreamNoneReaderDelayMS() {
    public int getGeneralStreamNoneReaderDelayMS() {
        return generalStreamNoneReaderDelayMS;
    }

    public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
    public void setGeneralStreamNoneReaderDelayMS(int generalStreamNoneReaderDelayMS) {
        this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
    }

@@ -791,4 +797,20 @@
    public void setShellPhell(String shellPhell) {
        this.shellPhell = shellPhell;
    }

    public Float getHookAliveInterval() {
        return hookAliveInterval;
    }

    public void setHookAliveInterval(Float hookAliveInterval) {
        this.hookAliveInterval = hookAliveInterval;
    }

    public String getPortRange() {
        return portRange;
    }

    public void setPortRange(String portRange) {
        this.portRange = portRange;
    }
}