From bb22ca2e9b9c60b0138a322ad49cab7ea8aa06e1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 25 十月 2023 17:12:54 +0800
Subject: [PATCH] 修复雷达引导2个相机引导录像重复问题；

---
 ard-work/src/main/java/com/ruoyi/media/domain/Conf.java |  122 ++--------------------------------------
 1 files changed, 7 insertions(+), 115 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/media/domain/Conf.java b/ard-work/src/main/java/com/ruoyi/media/domain/Conf.java
index 85480b8..791fba8 100644
--- a/ard-work/src/main/java/com/ruoyi/media/domain/Conf.java
+++ b/ard-work/src/main/java/com/ruoyi/media/domain/Conf.java
@@ -15,119 +15,11 @@
 @Data
 public class Conf {
     private String source;
-    @JsonProperty("sourceFingerprint")
-    private String sourcefingerprint;
-    @JsonProperty("sourceOnDemand")
-    private boolean sourceondemand;
-    @JsonProperty("sourceOnDemandStartTimeout")
-    private String sourceondemandstarttimeout;
-    @JsonProperty("sourceOnDemandCloseAfter")
-    private String sourceondemandcloseafter;
-    @JsonProperty("publishUser")
-    private String publishuser;
-    @JsonProperty("publishPass")
-    private String publishpass;
-    @JsonProperty("publishIPs")
-    private List<String> publiships;
-    @JsonProperty("readUser")
-    private String readuser;
-    @JsonProperty("readPass")
-    private String readpass;
-    @JsonProperty("readIPs")
-    private List<String> readips;
-    @JsonProperty("disablePublisherOverride")
-    private boolean disablepublisheroverride;
-    private String fallback;
-    @JsonProperty("sourceProtocol")
-    private String sourceprotocol;
-    @JsonProperty("sourceAnyPortEnable")
-    private boolean sourceanyportenable;
-    @JsonProperty("rtspRangeType")
-    private String rtsprangetype;
-    @JsonProperty("rtspRangeStart")
-    private String rtsprangestart;
-    @JsonProperty("sourceRedirect")
-    private String sourceredirect;
-    @JsonProperty("rpiCameraCamID")
-    private int rpicameracamid;
-    @JsonProperty("rpiCameraWidth")
-    private int rpicamerawidth;
-    @JsonProperty("rpiCameraHeight")
-    private int rpicameraheight;
-    @JsonProperty("rpiCameraHFlip")
-    private boolean rpicamerahflip;
-    @JsonProperty("rpiCameraVFlip")
-    private boolean rpicameravflip;
-    @JsonProperty("rpiCameraBrightness")
-    private int rpicamerabrightness;
-    @JsonProperty("rpiCameraContrast")
-    private int rpicameracontrast;
-    @JsonProperty("rpiCameraSaturation")
-    private int rpicamerasaturation;
-    @JsonProperty("rpiCameraSharpness")
-    private int rpicamerasharpness;
-    @JsonProperty("rpiCameraExposure")
-    private String rpicameraexposure;
-    @JsonProperty("rpiCameraAWB")
-    private String rpicameraawb;
-    @JsonProperty("rpiCameraDenoise")
-    private String rpicameradenoise;
-    @JsonProperty("rpiCameraShutter")
-    private int rpicamerashutter;
-    @JsonProperty("rpiCameraMetering")
-    private String rpicamerametering;
-    @JsonProperty("rpiCameraGain")
-    private int rpicameragain;
-    @JsonProperty("rpiCameraEV")
-    private int rpicameraev;
-    @JsonProperty("rpiCameraROI")
-    private String rpicameraroi;
-    @JsonProperty("rpiCameraTuningFile")
-    private String rpicameratuningfile;
-    @JsonProperty("rpiCameraMode")
-    private String rpicameramode;
-    @JsonProperty("rpiCameraFPS")
-    private int rpicamerafps;
-    @JsonProperty("rpiCameraIDRPeriod")
-    private int rpicameraidrperiod;
-    @JsonProperty("rpiCameraBitrate")
-    private int rpicamerabitrate;
-    @JsonProperty("rpiCameraProfile")
-    private String rpicameraprofile;
-    @JsonProperty("rpiCameraLevel")
-    private String rpicameralevel;
-    @JsonProperty("rpiCameraAfMode")
-    private String rpicameraafmode;
-    @JsonProperty("rpiCameraAfRange")
-    private String rpicameraafrange;
-    @JsonProperty("rpiCameraAfSpeed")
-    private String rpicameraafspeed;
-    @JsonProperty("rpiCameraLensPosition")
-    private int rpicameralensposition;
-    @JsonProperty("rpiCameraAfWindow")
-    private String rpicameraafwindow;
-    @JsonProperty("rpiCameraTextOverlayEnable")
-    private boolean rpicameratextoverlayenable;
-    @JsonProperty("rpiCameraTextOverlay")
-    private String rpicameratextoverlay;
-    @JsonProperty("runOnInit")
-    private String runoninit;
-    @JsonProperty("runOnInitRestart")
-    private boolean runoninitrestart;
-    @JsonProperty("runOnDemand")
-    private String runondemand;
-    @JsonProperty("runOnDemandRestart")
-    private boolean runondemandrestart;
-    @JsonProperty("runOnDemandStartTimeout")
-    private String runondemandstarttimeout;
-    @JsonProperty("runOnDemandCloseAfter")
-    private String runondemandcloseafter;
-    @JsonProperty("runOnReady")
-    private String runonready;
-    @JsonProperty("runOnReadyRestart")
-    private boolean runonreadyrestart;
-    @JsonProperty("runOnRead")
-    private String runonread;
-    @JsonProperty("runOnReadRestart")
-    private boolean runonreadrestart;
+    private boolean sourceOnDemand;
+    private String sourceProtocol;
+    private Integer maxReaders;
+    private String runOnDemand;
+    private boolean runOnDemandRestart;
+    private String runOnDemandStartTimeout;
+    private String runOnDemandCloseAfter;
 }

--
Gitblit v1.9.3