修复雷达引导2个相机引导录像重复问题；

‘liusuyi’

2023-10-25 bb22ca2e9b9c60b0138a322ad49cab7ea8aa06e1

 ard-work/src/main/resources/templates/test.html

@@ -136,7 +136,7 @@
    window.onload = function () {
        console.log(RTCRtpReceiver.getCapabilities('video').codecs)
        $.ajax({
            url: "../hik/list",
            url: "../cameraSdk/list",
            type: "get",
            success: function (data) {
                console.log(data);
@@ -144,7 +144,8 @@
                for (var i = 0; i < arr.length; i++) {
                    console.log(arr[i].id);
                    var camera = {
                        type: arr[i].gdtype,
                        name: arr[i].name,
                        factory: arr[i].factory,
                        ipaddr: arr[i].ip,
                        username: arr[i].username,
                        password: arr[i].password,
@@ -183,125 +184,125 @@
    }
    //云台上下左右
    $("#up").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 2;
        var enable = true;
        commondMethod(url, code, enable);

    })
    $("#up").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 2;
        var enable = false;
        commondMethod(url, code, enable);
    })
    $("#down").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 8;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#down").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 8;
        var enable = false;
        commondMethod(url, code, enable);
    })
    $("#left").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 4;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#left").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 4;
        var enable = false;
        commondMethod(url, code, enable);
    })
    $("#right").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 6;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#right").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 6;
        var enable = false;
        commondMethod(url, code, enable);
    })
    //变倍
    $("#controlZoomIn").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 10;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#controlZoomIn").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 10;
        var enable = false;
        commondMethod(url, code, enable);
    })
    $("#controlZoomOut").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 11;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#controlZoomOut").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 11;
        var enable = false;
        commondMethod(url, code, enable);
    })
    //变焦
    $("#controlFocusNear").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 12;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#controlFocusNear").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 12;
        var enable = false;
        commondMethod(url, code, enable);
    })
    $("#controlFocusFar").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 13;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#controlFocusFar").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 13;
        var enable = false;
        commondMethod(url, code, enable);
    })
    //光圈
    $("#controlIrisOpen").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 14;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#controlIrisOpen").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 14;
        var enable = false;
        commondMethod(url, code, enable);
    })
    $("#controlIrisClose").mousedown(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 15;
        var enable = true;
        commondMethod(url, code, enable);
    })
    $("#controlIrisClose").mouseup(function () {
        var url = "../hik/PTZControlWithSpeed";
        var url = "../cameraSdk/PTZControlWithSpeed";
        var code = 15;
        var enable = false;
        commondMethod(url, code, enable);
@@ -316,7 +317,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/setPreset",
            url: "../cameraSdk/setPreset",
            type: "post",
            dataType: "json",
            data: JSON.stringify(opt),
@@ -334,7 +335,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/gotoPreset",
            url: "../cameraSdk/gotoPreset",
            type: "post",
            dataType: "json",
            data: JSON.stringify(opt),
@@ -352,7 +353,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/getPTZ",
            url: "../cameraSdk/getPTZ",
            type: "post",
            dataType: "json",
            data: JSON.stringify(opt),
@@ -386,7 +387,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/setPTZ",
            url: "../cameraSdk/setPTZ",
            type: "post",
            dataType: "json",
            data: JSON.stringify(myEntity),
@@ -414,7 +415,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/setTargetPosition",
            url: "../cameraSdk/setTargetPosition",
            type: "post",
            dataType: "json",
            data: JSON.stringify(myEntity),
@@ -432,7 +433,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/setZeroPTZ",
            url: "../cameraSdk/setZeroPTZ",
            type: "post",
            dataType: "json",
            data: JSON.stringify(opt),
@@ -450,7 +451,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/PTZControlWithSpeed",
            url: "../cameraSdk/PTZControlWithSpeed",
            type: "post",
            dataType: "json",
            data: JSON.stringify(opt),
@@ -473,7 +474,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/defogcfg",
                url: "../cameraSdk/defogcfg",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optOpen),
@@ -490,7 +491,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/defogcfg",
                url: "../cameraSdk/defogcfg",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optClose),
@@ -515,7 +516,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/infrarecfg",
                url: "../cameraSdk/infrarecfg",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optOpen),
@@ -533,7 +534,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/infrarecfg",
                url: "../cameraSdk/infrarecfg",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optClose),
@@ -557,7 +558,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/focusMode",
                url: "../cameraSdk/focusMode",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optOpen),
@@ -574,7 +575,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/focusMode",
                url: "../cameraSdk/focusMode",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optClose),
@@ -593,13 +594,13 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/getFocusPos",
                url: "../cameraSdk/getFocusPos",
                type: "post",
                dataType: "json",
                data: JSON.stringify(opt),
                success: function (datas) {
                    console.log(datas);
                    $("#focus").val(datas.data.dwFocus);
                    $("#focus").val(datas.data);
                }
            })
    })
@@ -617,7 +618,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/heateRpwron",
                url: "../cameraSdk/heateRpwron",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optOpen),
@@ -634,7 +635,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/heateRpwron",
                url: "../cameraSdk/heateRpwron",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optClose),
@@ -657,7 +658,7 @@
                    'Accept': 'application/json',
                    'Content-Type': 'application/json'
                },
                url: "../hik/cameraDeicing",
                url: "../cameraSdk/cameraDeicing",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optOpen),
@@ -674,7 +675,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/cameraDeicing",
                url: "../cameraSdk/cameraDeicing",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optClose),
@@ -693,7 +694,7 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/captureJPEGPicture",
            url: "../cameraSdk/captureJPEGPicture",
            type: "post",
            dataType: "json",
            data: JSON.stringify(opt),
@@ -712,13 +713,16 @@
                'Content-Type': 'application/json',
                'Authorization': token
            },
            url: "../hik/picCutCate",
            url: "../cameraSdk/picCutCate",
            type: "post",
            dataType: "json",
            data: JSON.stringify(opt),
            success: function (data) {
                console.log(data.data);
                $('#imgContainer').attr('src', data.data);
                setTimeout(() => {
                    $('#imgContainer').attr('src', data.data);
                }, 1000 )

            }
        })
    })
@@ -736,7 +740,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/record",
                url: "../cameraSdk/record",
                type: "post",
                dataType: "json",
                data: JSON.stringify(optOpen),
@@ -753,7 +757,7 @@
                    'Content-Type': 'application/json',
                    'Authorization': token
                },
                url: "../hik/record",
                url: "../cameraSdk/record",
                dataType: "json",
                data: JSON.stringify(optClose),
                type: "post",
@@ -769,7 +773,7 @@
    /*云台公共方法*/
    function commondMethod(url, code, enable) {
        cameraId = $('#select option:selected').val();
        opt = {"cameraId": cameraId, "chanNo": 1, "speed": 8, "enable": enable, "code": code};
        opt = {"cameraId": cameraId, "chanNo": 1, "speed": 4, "enable": enable, "code": code};
        $.ajax({
            headers: {
                'Accept': 'application/json',
@@ -797,9 +801,9 @@
            var cameraId = $('#select option:selected').val();
            let camera = cameraMap.get(cameraId);
            console.log(camera);
            if (camera.type == "ys") {
            if (camera.factory == "3") {
                realViewYs("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
            } else if (camera.type == "dh") {
            } else if (camera.factory == "2") {
                realViewDh("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
            } else {
                realViewHik("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);