From d369300ad223b016ae8302badb6f0b8a690bd2ee Mon Sep 17 00:00:00 2001 From: yxw <17074267@qq.com> Date: Tue, 21 Nov 2023 17:17:14 +0800 Subject: [PATCH] fix --- filter.html | 10 +++++----- js/equalizer.js | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/filter.html b/filter.html index 39e38cf..b14907f 100644 --- a/filter.html +++ b/filter.html @@ -192,7 +192,7 @@ url: url, data: postData, dataType: "json", - contentType: "application/json; charset=utf-8", + // contentType: "application/json; charset=utf-8", success: function (res) { if (res.success) { data.mic1 = res.content.mic1 @@ -222,7 +222,7 @@ url: url, data: postData, dataType: "json", - contentType: "application/json; charset=utf-8", + // contentType: "application/json; charset=utf-8", success: function (res) { if (res.success) { data.mic2 = res.content.mic2 @@ -250,7 +250,7 @@ url: url, data: postData, dataType: "json", - contentType: "application/json; charset=utf-8", + // contentType: "application/json; charset=utf-8", success: function (res) { if (res.success) { data.mic1 = res.content.mic1 @@ -278,7 +278,7 @@ url: url, data: postData, dataType: "json", - contentType: "application/json; charset=utf-8", + // contentType: "application/json; charset=utf-8", success: function (res) { if (res.success) { data.mic2 = res.content.mic2 @@ -307,7 +307,7 @@ url: url, data: postData, dataType: "json", - contentType: "application/json; charset=utf-8", + // contentType: "application/json; charset=utf-8", success: function (res) { if (res.success) { if (module == 'mic1') { diff --git a/js/equalizer.js b/js/equalizer.js index 9ec09b0..cbf5aac 100644 --- a/js/equalizer.js +++ b/js/equalizer.js @@ -24,24 +24,31 @@ $(function () { //当客户端收到服务端发来的消息时,触发onmessage事件,参数e.data包含server传递过来的数据 console.log("收到数据"); console.log(e.data); - console.log(typeof(e.data)) + console.log(typeof (e.data)) var eqData = $.parseJSON(e.data).content + let number = eqData.value + if (eqData.value < -72) { + number = -72 + } + if (eqData.value > 0) { + number = 0 + } if (eqData.module == "linein_L") { - LineInputLeftRandomBar(eqData.value + 72) + LineInputLeftRandomBar(number) } else if (eqData.module == "linein_R") { - LineInputRightRandomBar(eqData.value + 72) + LineInputRightRandomBar(number) } else if (eqData.module == "output_L") { - OutputVolumeLeftRandomBar(eqData.value + 72); + OutputVolumeLeftRandomBar(number); } else if (eqData.module == "output_R") { - OutputVolumeRightRandomBar(eqData.value + 72); + OutputVolumeRightRandomBar(number); } else if (eqData.module == "mic1") { - Microphone1LeftRandomBar(eqData.value + 72) + Microphone1LeftRandomBar(number) } else { - Microphone2LeftRandomBar(eqData.value + 72) + Microphone2LeftRandomBar(number) } } ws.onclose = function (e) {