From 4a318cf606410c3dceef6332e241b068fbc04973 Mon Sep 17 00:00:00 2001 From: yxw <17074267@qq.com> Date: Fri, 24 Nov 2023 11:29:39 +0800 Subject: [PATCH] fix --- ducking.html | 13 ++++++++----- eq.html | 29 ++++++++++++++++++++--------- home.html | 6 +++--- js/equalizer.js | 2 +- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ducking.html b/ducking.html index d66cec1..c1ea5bf 100644 --- a/ducking.html +++ b/ducking.html @@ -396,6 +396,7 @@ console.log('返回数据', typeof (res), res) if (res.success) { data = res.content + $("input[name='switch']").val([`${data.parameters.state}`]) } else { alert(res.message) @@ -460,6 +461,8 @@ console.log('返回数据', typeof (res), res) if (res.success) { data = res.content + $("#mic1").prop("checked", data.mic1 == 'open') + $("#mic2").prop("checked", data.mic2 == 'open') } else { alert(res.message) @@ -521,7 +524,7 @@ function attackSlider(number) { let element = $('#attack') let input = $("#attack .volume-slider input") - let value = (parseInt(number) - 10) / (490 / 100) + let value = (parseFloat(number) - 10) / (490 / 100) input.val(value) updateAttackSlider(element, false); @@ -564,7 +567,7 @@ function thresholdSlider(number) { let element = $('#threshold') let input = $("#threshold .volume-slider input") - let value = (parseInt(number) + 60) / (60 / 100) + let value = (parseFloat(number) + 60) / (60 / 100) input.val(value) updateThresholdSlider(element, false); @@ -608,7 +611,7 @@ function ducklevelSlider(number) { let element = $('#ducklevel') let input = $("#ducklevel .volume-slider input") - let value = (parseInt(number) + 100) / (100 / 100) + let value = (parseFloat(number) + 100) / (100 / 100) input.val(value) updateDucklevelSlider(element, false); @@ -653,7 +656,7 @@ console.log(number, releaseValue) let element = $('#release') let input = $("#release .volume-slider input") - let value = (parseInt(number) - 10) / (1990 / 100) + let value = (parseFloat(number) - 10) / (1990 / 100) input.val(value) console.log('value', number, value, input.val()) updateReleaseSlider(element, false); @@ -734,7 +737,7 @@ releaseSlider(releaseValue) releasePost = false } - bindData() + // bindData() } else { alert(res.message) diff --git a/eq.html b/eq.html index 5983977..0365bb9 100644 --- a/eq.html +++ b/eq.html @@ -893,7 +893,7 @@ function mic140HzSlider(number) { let element = $('#mic140Hz') let input = $("#mic140Hz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseFloat(number) + 10) / (20 / 100) input.val(value) updatemic140HzSlider(element, false); @@ -925,6 +925,7 @@ if (number == -0) { number = 0 } + console.log(number, mic140Value, typeof (number), typeof (mic140Value)) if (number != mic140Value && isInput == false) { if (mic140Post == false) { mic140Post = true @@ -982,7 +983,7 @@ function mic1500HzSlider(number) { let element = $('#mic1500Hz') let input = $("#mic1500Hz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic1500HzSlider(element, false); @@ -1026,7 +1027,7 @@ function mic12KHzSlider(number) { let element = $('#mic12KHz') let input = $("#mic12KHz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic12KHzSlider(element, false); @@ -1069,7 +1070,7 @@ function mic110KHzSlider(number) { let element = $('#mic110KHz') let input = $("#mic110KHz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic110KHzSlider(element, false); @@ -1117,7 +1118,7 @@ function mic240HzSlider(number) { let element = $('#mic240Hz') let input = $("#mic240Hz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic240HzSlider(element, false); @@ -1161,7 +1162,7 @@ function mic2150HzSlider(number) { let element = $('#mic2150Hz') let input = $("#mic2150Hz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic2150HzSlider(element, false); @@ -1206,7 +1207,7 @@ function mic2500HzSlider(number) { let element = $('#mic2500Hz') let input = $("#mic2500Hz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic2500HzSlider(element, false); @@ -1250,7 +1251,7 @@ function mic22KHzSlider(number) { let element = $('#mic22KHz') let input = $("#mic22KHz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic22KHzSlider(element, false); @@ -1296,7 +1297,7 @@ function mic210KHzSlider(number) { let element = $('#mic210KHz') let input = $("#mic210KHz .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseInt(number) + 10) / (20 / 100) input.val(value) updatemic210KHzSlider(element, false); @@ -1359,22 +1360,27 @@ if (module == 'mic240') { mic240Value = data.mic2.band1.toFixed(1) mic240HzSlider(mic240Value) + mic240Post = false } if (module == 'mic2150') { mic2150Value = data.mic2.band2.toFixed(1) mic2150HzSlider(mic2150Value) + mic2150Post = false } if (module == 'mic2500') { mic2500Value = data.mic2.band3.toFixed(1) mic2500HzSlider(mic2500Value) + mic2500Post = false } if (module == 'mic22k') { mic22kValue = data.mic2.band4.toFixed(1) mic22KHzSlider(mic22kValue) + mic22kPost = false } if (module == 'mic210k') { mic210kValue = data.mic2.band5.toFixed(1) mic210KHzSlider(mic210kValue) + mic210kPost = false } } @@ -1383,22 +1389,27 @@ if (module == 'mic140') { mic140Value = data.mic1.band1.toFixed(1) mic140HzSlider(mic140Value) + mic140Post = false } if (module == 'mic1150') { mic1150Value = data.mic1.band2.toFixed(1) mic1150HzSlider(mic1150Value) + mic1150Post = false } if (module == 'mic1500') { mic1500Value = data.mic1.band3.toFixed(1) mic1500HzSlider(mic1500Value) + mic1150Post = false } if (module == 'mic12k') { mic12kValue = data.mic1.band4.toFixed(1) mic12KHzSlider(mic12kValue) + mic12kPost = false } if (module == 'mic110k') { mic110kValue = data.mic1.band5.toFixed(1) mic110KHzSlider(mic110kValue) + mic110kPost = false } } // bindData() diff --git a/home.html b/home.html index f5202c3..2d9ae7c 100644 --- a/home.html +++ b/home.html @@ -1362,7 +1362,7 @@ let element = $('#lineinput') let input = $("#lineinput .volume-slider input") - let value = (parseInt(number) + 72) / (84 / 100) + let value = (parseFloat(number) + 72) / (84 / 100) // console.log('value', number, value, input.val()) input.val(value) // input.attr('value', value) @@ -1411,7 +1411,7 @@ let element = $("#microphone1") let input = $("#microphone1 .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseFloat(number) + 10) / (20 / 100) input.val(value) // input.attr('value', value) // console.log(number, value, input.val()) @@ -1459,7 +1459,7 @@ let element = $('#microphone2') let input = $("#microphone2 .volume-slider input") - let value = (parseInt(number) + 10) / (20 / 100) + let value = (parseFloat(number) + 10) / (20 / 100) input.val(value) // input.attr('value', value) // console.log(number, value, input.val()) diff --git a/js/equalizer.js b/js/equalizer.js index d1d89ec..3253da2 100644 --- a/js/equalizer.js +++ b/js/equalizer.js @@ -26,7 +26,7 @@ $(function () { // console.log(e.data); // console.log(typeof (e.data)) var eqData = $.parseJSON(e.data).content - if (eqData.action == '') { + if (eqData.action == 'home_get') { loadData() } else {