fix
parent
60c1ca66d0
commit
c604cb8c8c
65
ducking.html
65
ducking.html
|
@ -357,6 +357,10 @@
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
var data = {}
|
var data = {}
|
||||||
|
let thresholdValue = 0
|
||||||
|
let duckLevelValue = 0
|
||||||
|
let attackValue = 0
|
||||||
|
let releaseValue = 0
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", function () {
|
document.addEventListener("DOMContentLoaded", function () {
|
||||||
//初始化配置
|
//初始化配置
|
||||||
|
@ -448,6 +452,10 @@
|
||||||
url: url,
|
url: url,
|
||||||
success: function (res) {
|
success: function (res) {
|
||||||
data = res.content
|
data = res.content
|
||||||
|
thresholdValue = data.parameters.threshold
|
||||||
|
attackValue = data.parameters.attack
|
||||||
|
duckLevelValue = data.parameters.ducklevel
|
||||||
|
releaseValue = data.parameters.release
|
||||||
bindData()
|
bindData()
|
||||||
},
|
},
|
||||||
error: function () {
|
error: function () {
|
||||||
|
@ -456,12 +464,16 @@
|
||||||
threshold: -30,
|
threshold: -30,
|
||||||
attack: 200,
|
attack: 200,
|
||||||
ducklevel: -3,
|
ducklevel: -3,
|
||||||
release: 1000,
|
release: 1001,
|
||||||
state: "enable"
|
state: "enable"
|
||||||
},
|
},
|
||||||
mic1: "close",
|
mic1: "close",
|
||||||
mic2: "open"
|
mic2: "open"
|
||||||
}
|
}
|
||||||
|
thresholdValue = data.parameters.threshold
|
||||||
|
attackValue = data.parameters.attack
|
||||||
|
duckLevelValue = data.parameters.ducklevel
|
||||||
|
releaseValue = data.parameters.release
|
||||||
bindData()
|
bindData()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -477,24 +489,25 @@
|
||||||
thresholdSlider(data.parameters.threshold);
|
thresholdSlider(data.parameters.threshold);
|
||||||
ducklevelSlider(data.parameters.ducklevel);
|
ducklevelSlider(data.parameters.ducklevel);
|
||||||
releaseSlider(data.parameters.release);
|
releaseSlider(data.parameters.release);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function attackSlider(number) {
|
function attackSlider(number) {
|
||||||
let element = $('#attack')
|
let element = $('#attack')
|
||||||
let input = $("#attack .volume-slider input")
|
let input = $("#attack .volume-slider input")
|
||||||
input.attr('value', (parseInt(number) - 10) / (490 / 100))
|
input.attr('value', (parseInt(number) - 10) / (490 / 100))
|
||||||
updateAttackSlider(element);
|
updateAttackSlider(element, false);
|
||||||
|
|
||||||
|
|
||||||
input.on('input', function () {
|
input.on('input', function () {
|
||||||
updateAttackSlider(element);
|
updateAttackSlider(element, true);
|
||||||
})
|
})
|
||||||
input.on('change', function () {
|
input.on('change', function () {
|
||||||
updateAttackSlider(element);
|
updateAttackSlider(element, false);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateAttackSlider(element) {
|
function updateAttackSlider(element, isInput) {
|
||||||
|
|
||||||
let box = element.children().find(".volume-slider")
|
let box = element.children().find(".volume-slider")
|
||||||
let input = element.children().find(".volume-slider input")
|
let input = element.children().find(".volume-slider input")
|
||||||
|
@ -510,25 +523,27 @@
|
||||||
let number = ((input.val() * (490 / 100)) + 10).toFixed(1)
|
let number = ((input.val() * (490 / 100)) + 10).toFixed(1)
|
||||||
$value.val(`${number}`);
|
$value.val(`${number}`);
|
||||||
//调用接口提交数据
|
//调用接口提交数据
|
||||||
|
if (number != attackValue && isInput == false) {
|
||||||
changeInputValue('attack', number)
|
changeInputValue('attack', number)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function thresholdSlider(number) {
|
function thresholdSlider(number) {
|
||||||
let element = $('#threshold')
|
let element = $('#threshold')
|
||||||
let input = $("#threshold .volume-slider input")
|
let input = $("#threshold .volume-slider input")
|
||||||
input.attr('value', (parseInt(number) + 60) / (60 / 100))
|
input.attr('value', (parseInt(number) + 60) / (60 / 100))
|
||||||
updateThresholdSlider(element);
|
updateThresholdSlider(element, false);
|
||||||
|
|
||||||
|
|
||||||
input.on('input', function () {
|
input.on('input', function () {
|
||||||
updateThresholdSlider(element);
|
updateThresholdSlider(element, true);
|
||||||
})
|
})
|
||||||
input.on('change', function () {
|
input.on('change', function () {
|
||||||
updateThresholdSlider(element);
|
updateThresholdSlider(element, false);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateThresholdSlider(element) {
|
function updateThresholdSlider(element, isInput) {
|
||||||
let box = element.children().find(".volume-slider")
|
let box = element.children().find(".volume-slider")
|
||||||
let input = element.children().find(".volume-slider input")
|
let input = element.children().find(".volume-slider input")
|
||||||
let $thumb = element.children().find(".range-slider-thumb")
|
let $thumb = element.children().find(".range-slider-thumb")
|
||||||
|
@ -544,25 +559,27 @@
|
||||||
let number = ((input.val() * (60 / 100)) - 60).toFixed(1)
|
let number = ((input.val() * (60 / 100)) - 60).toFixed(1)
|
||||||
$value.val(`${number}`);
|
$value.val(`${number}`);
|
||||||
//调用接口提交数据
|
//调用接口提交数据
|
||||||
|
if (number != thresholdValue && isInput == false) {
|
||||||
changeInputValue('threshold', number)
|
changeInputValue('threshold', number)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function ducklevelSlider(number) {
|
function ducklevelSlider(number) {
|
||||||
let element = $('#ducklevel')
|
let element = $('#ducklevel')
|
||||||
let input = $("#ducklevel .volume-slider input")
|
let input = $("#ducklevel .volume-slider input")
|
||||||
input.attr('value', (parseInt(number) + 100) / (100 / 100))
|
input.attr('value', (parseInt(number) + 100) / (100 / 100))
|
||||||
updateDucklevelSlider(element);
|
updateDucklevelSlider(element, false);
|
||||||
|
|
||||||
|
|
||||||
input.on('input', function () {
|
input.on('input', function () {
|
||||||
updateDucklevelSlider(element);
|
updateDucklevelSlider(element, true);
|
||||||
})
|
})
|
||||||
input.on('change', function () {
|
input.on('change', function () {
|
||||||
updateDucklevelSlider(element);
|
updateDucklevelSlider(element, false);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateDucklevelSlider(element) {
|
function updateDucklevelSlider(element, isInput) {
|
||||||
let box = element.children().find(".volume-slider")
|
let box = element.children().find(".volume-slider")
|
||||||
let input = element.children().find(".volume-slider input")
|
let input = element.children().find(".volume-slider input")
|
||||||
let $thumb = element.children().find(".range-slider-thumb")
|
let $thumb = element.children().find(".range-slider-thumb")
|
||||||
|
@ -578,25 +595,28 @@
|
||||||
let number = ((input.val() * (100 / 100)) - 100).toFixed(1)
|
let number = ((input.val() * (100 / 100)) - 100).toFixed(1)
|
||||||
$value.val(`${number}`);
|
$value.val(`${number}`);
|
||||||
//调用接口提交数据
|
//调用接口提交数据
|
||||||
|
if (number != duckLevelValue && isInput == false) {
|
||||||
changeInputValue('ducklevel', number)
|
changeInputValue('ducklevel', number)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function releaseSlider(number) {
|
function releaseSlider(number) {
|
||||||
|
console.log(number,releaseValue)
|
||||||
let element = $('#release')
|
let element = $('#release')
|
||||||
let input = $("#release .volume-slider input")
|
let input = $("#release .volume-slider input")
|
||||||
input.attr('value', (parseInt(number) - 10) / (2000 / 100))
|
input.attr('value', (parseInt(number) - 10) / (1990 / 100))
|
||||||
updateReleaseSlider(element);
|
updateReleaseSlider(element, false);
|
||||||
|
|
||||||
|
|
||||||
input.on('input', function () {
|
input.on('input', function () {
|
||||||
updateReleaseSlider(element);
|
updateReleaseSlider(element, true);
|
||||||
})
|
})
|
||||||
input.on('change', function () {
|
input.on('change', function () {
|
||||||
updateReleaseSlider(element);
|
updateReleaseSlider(element, false);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateReleaseSlider(element) {
|
function updateReleaseSlider(element, isInput) {
|
||||||
let box = element.children().find(".volume-slider")
|
let box = element.children().find(".volume-slider")
|
||||||
let input = element.children().find(".volume-slider input")
|
let input = element.children().find(".volume-slider input")
|
||||||
let $thumb = element.children().find(".range-slider-thumb")
|
let $thumb = element.children().find(".range-slider-thumb")
|
||||||
|
@ -609,11 +629,14 @@
|
||||||
let barHeight = `calc(${pct}% + ${$thumb[0].clientHeight / 2}px)`;
|
let barHeight = `calc(${pct}% + ${$thumb[0].clientHeight / 2}px)`;
|
||||||
$bar.attr('style', `height:${barHeight}`)
|
$bar.attr('style', `height:${barHeight}`)
|
||||||
|
|
||||||
let number = ((input.val() * (2000 / 100)) - 10).toFixed(1)
|
let number = ((input.val() * (1990 / 100)) + 10).toFixed(1)
|
||||||
$value.val(`${number}`);
|
$value.val(`${number}`);
|
||||||
//调用接口提交数据
|
//调用接口提交数据
|
||||||
|
console.log(number,releaseValue)
|
||||||
|
if (number != releaseValue && isInput == false) {
|
||||||
changeInputValue('release', number)
|
changeInputValue('release', number)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function changeInputValue(module, number) {
|
function changeInputValue(module, number) {
|
||||||
|
@ -632,6 +655,10 @@
|
||||||
success: function (res) {
|
success: function (res) {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
data = res.content
|
data = res.content
|
||||||
|
thresholdValue = data.parameters.threshold
|
||||||
|
attackValue = data.parameters.attack
|
||||||
|
duckLevelValue = data.parameters.ducklevel
|
||||||
|
releaseValue = data.parameters.release
|
||||||
bindData()
|
bindData()
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -1512,9 +1512,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
setInterval(() => {
|
// setInterval(() => {
|
||||||
setRandomBars();
|
// setRandomBars();
|
||||||
}, 200);
|
// }, 200);
|
||||||
|
|
||||||
function setRandomBars() {
|
function setRandomBars() {
|
||||||
let num = getRandomIntInclusive(0, 72)
|
let num = getRandomIntInclusive(0, 72)
|
||||||
|
|
|
@ -23,6 +23,13 @@ $(function () {
|
||||||
//当客户端收到服务端发来的消息时,触发onmessage事件,参数e.data包含server传递过来的数据
|
//当客户端收到服务端发来的消息时,触发onmessage事件,参数e.data包含server传递过来的数据
|
||||||
console.log("收到数据");
|
console.log("收到数据");
|
||||||
console.log(e.data);
|
console.log(e.data);
|
||||||
|
var eqData = e.data.content
|
||||||
|
LineInputLeftRandomBar(30 - 72)
|
||||||
|
LineInputRightRandomBar(66 - 72)
|
||||||
|
Microphone1LeftRandomBar(34 - 72)
|
||||||
|
Microphone2LeftRandomBar(67 - 72)
|
||||||
|
OutputVolumeLeftRandomBar(39 - 72);
|
||||||
|
OutputVolumeRightRandomBar(87 - 72);
|
||||||
}
|
}
|
||||||
ws.onclose = function (e) {
|
ws.onclose = function (e) {
|
||||||
//当客户端收到服务端发送的关闭连接请求时,触发onclose事件
|
//当客户端收到服务端发送的关闭连接请求时,触发onclose事件
|
||||||
|
|
23
js/main.js
23
js/main.js
|
@ -1,5 +1,26 @@
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$("#blink").on('click',function(){
|
$("#blink").on('click',function(){
|
||||||
alert('a')
|
|
||||||
|
let url = '/cgi-bin/test.cgi?action=blink';
|
||||||
|
let postData = {
|
||||||
|
}
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
type: 'POST',
|
||||||
|
url: url,
|
||||||
|
data: postData,
|
||||||
|
dataType: "json",
|
||||||
|
contentType: "application/json; charset=utf-8",
|
||||||
|
success: function (res) {
|
||||||
|
if (res.success) {
|
||||||
|
data = res.content
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
alert(res.message)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (res) {
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
55
system.html
55
system.html
|
@ -30,8 +30,8 @@
|
||||||
<div class="">
|
<div class="">
|
||||||
<a href="security.html">SECURITY</a>
|
<a href="security.html">SECURITY</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="active"><a href="control.html">CONTROL</a></div>
|
<div class=""><a href="control.html">CONTROL</a></div>
|
||||||
<div class="last "><a href="system.html">SYSTEM</a></div>
|
<div class="last active"><a href="system.html">SYSTEM</a></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="d-flex float-end ps-5 align-items-center" style="position:absolute; right: 10px;top: 3px;">
|
<div class="d-flex float-end ps-5 align-items-center" style="position:absolute; right: 10px;top: 3px;">
|
||||||
<button class="btn btn-dark border-black" id="blink">
|
<button class="btn btn-dark border-black" id="blink">
|
||||||
|
@ -118,12 +118,35 @@
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var data = {}
|
var data = {}
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$('#reset').on('click', function (event) {
|
$('#reset').on('click', function (event) {
|
||||||
alert('a')
|
let url = '/cgi-bin/test.cgi?action=reset';
|
||||||
|
let postData = {
|
||||||
|
}
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
type: 'POST',
|
||||||
|
url: url,
|
||||||
|
data: postData,
|
||||||
|
dataType: "json",
|
||||||
|
contentType: "application/json; charset=utf-8",
|
||||||
|
success: function (res) {
|
||||||
|
if (res.success) {
|
||||||
|
data = res.content
|
||||||
|
alert('reseting')
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
alert(res.message)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (res) {
|
||||||
|
}
|
||||||
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#selectFile').on('click', function () {
|
$('#selectFile').on('click', function () {
|
||||||
|
@ -135,7 +158,29 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#upgrade").on("click", function () {
|
$("#upgrade").on("click", function () {
|
||||||
alert('aaa')
|
|
||||||
|
let url = '/cgi-bin/test.cgi?action=upgrade';
|
||||||
|
var formData = new FormData();
|
||||||
|
formData.append('file', $('#fileName')[0].file[0])
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
type: 'POST',
|
||||||
|
url: url,
|
||||||
|
data: formData,
|
||||||
|
dataType: "json",
|
||||||
|
contentType: "application/json; charset=utf-8",
|
||||||
|
success: function (res) {
|
||||||
|
if (res.success) {
|
||||||
|
data = res.content
|
||||||
|
alert('upgrade')
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
alert(res.message)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: function (res) {
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -176,5 +221,7 @@
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script src="js/main.js"></script>
|
<script src="js/main.js"></script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
Loading…
Reference in New Issue