diff --git a/eq.html b/eq.html
index ca07039..4f80a1d 100644
--- a/eq.html
+++ b/eq.html
@@ -746,14 +746,14 @@
$("input[name='mic1switch']").on('change', function () {
let $value = $("input[name='mic1switch']:checked").val()
console.log($("input[name='mic1switch']:checked").val())
- changeInputValue('mic1state',$value)
+ changeInputValue('mic1state', $value)
})
$("input[name='mic2switch']").on('change', function () {
let $value = $("input[name='mic2switch']:checked").val()
console.log($("input[name='mic2switch']:checked").val())
- changeInputValue('mic2state',$value)
+ changeInputValue('mic2state', $value)
})
})
@@ -765,47 +765,47 @@
url: url,
success: function (res) {
data = res.content
- mic140Value = data.mic1.v40
- mic1150Value = data.mic1.v150
- mic1500Value = data.mic1.v500
- mic12kValue = data.mic1.v2k
- mic110kValue = data.mic1.v10k
- mic240Value = data.mic2.v40
- mic2150Value = data.mic2.v150
- mic2500Value = data.mic2.v500
- mic22kValue = data.mic2.v2k
- mic210kValue = data.mic2.v10k
+ mic140Value = data.mic1.band1
+ mic1150Value = data.mic1.band2
+ mic1500Value = data.mic1.band3
+ mic12kValue = data.mic1.band4
+ mic110kValue = data.mic1.band5
+ mic240Value = data.mic2.band1
+ mic2150Value = data.mic2.band2
+ mic2500Value = data.mic2.band3
+ mic22kValue = data.mic2.band4
+ mic210kValue = data.mic2.band5
bindData()
},
error: function () {
data = {
mic1: {
- v40: 9,
- v150: -1,
- v500: 3,
- v2k: -8,
- v10k: 5,
+ band1: 9,
+ band2: -1,
+ band3: 3,
+ band4: -8,
+ band5: 5,
state: "disable"
},
mic2: {
- v40: 9,
- v150: -1,
- v500: 3,
- v2k: -8,
- v10k: 5,
+ band1: 9,
+ band2: -1,
+ band3: 3,
+ band4: -8,
+ band5: 5,
state: "enable"
}
}
- mic140Value = data.mic1.v40
- mic1150Value = data.mic1.v150
- mic1500Value = data.mic1.v500
- mic12kValue = data.mic1.v2k
- mic110kValue = data.mic1.v10k
- mic240Value = data.mic2.v40
- mic2150Value = data.mic2.v150
- mic2500Value = data.mic2.v500
- mic22kValue = data.mic2.v2k
- mic210kValue = data.mic2.v10k
+ mic140Value = data.mic1.band1
+ mic1150Value = data.mic1.band2
+ mic1500Value = data.mic1.band3
+ mic12kValue = data.mic1.band4
+ mic110kValue = data.mic1.band5
+ mic240Value = data.mic2.band1
+ mic2150Value = data.mic2.band2
+ mic2500Value = data.mic2.band3
+ mic22kValue = data.mic2.band4
+ mic210kValue = data.mic2.band5
bindData()
}
})
@@ -815,31 +815,31 @@
$("input[name='mic1switch']").val([`${data.mic1.state}`])
$("input[name='mic2switch']").val([`${data.mic2.state}`])
- mic140HzSlider(data.mic1.v40);
- mic1150HzSlider(data.mic1.v150);
- mic1500HzSlider(data.mic1.v500);
- mic12KHzSlider(data.mic1.v2k);
- mic110KHzSlider(data.mic1.v10k);
+ mic140HzSlider(data.mic1.band1);
+ mic1150HzSlider(data.mic1.band2);
+ mic1500HzSlider(data.mic1.band3);
+ mic12KHzSlider(data.mic1.band4);
+ mic110KHzSlider(data.mic1.band5);
- mic240HzSlider(data.mic2.v40);
- mic2150HzSlider(data.mic2.v150);
- mic2500HzSlider(data.mic2.v500);
- mic22KHzSlider(data.mic2.v2k)
- mic210KHzSlider(data.mic2.v10k);
+ mic240HzSlider(data.mic2.band1);
+ mic2150HzSlider(data.mic2.band2);
+ mic2500HzSlider(data.mic2.band3);
+ mic22KHzSlider(data.mic2.band4)
+ mic210KHzSlider(data.mic2.band5);
}
function mic140HzSlider(number) {
let element = $('#mic140Hz')
let input = $("#mic140Hz .volume-slider input")
input.attr('value', (parseInt(number) + 10) / (20 / 100))
- updatemic140HzSlider(element,false);
+ updatemic140HzSlider(element, false);
input.on('input', function () {
- updatemic140HzSlider(element,true);
+ updatemic140HzSlider(element, true);
})
input.on('change', function () {
- updatemic140HzSlider(element,false);
+ updatemic140HzSlider(element, false);
})
}
@@ -868,14 +868,14 @@
let element = $('#mic1150Hz')
let input = $("#mic1150Hz .volume-slider input")
input.attr('value', (parseInt(number) + 10) / (20 / 100))
- updatemic1150HzSlider(element,false);
+ updatemic1150HzSlider(element, false);
input.on('input', function () {
- updatemic1150HzSlider(element,true);
+ updatemic1150HzSlider(element, true);
})
input.on('change', function () {
- updatemic1150HzSlider(element,false);
+ updatemic1150HzSlider(element, false);
})
}
@@ -907,14 +907,14 @@
let element = $('#mic1500Hz')
let input = $("#mic1500Hz .volume-slider input")
input.attr('value', (parseInt(number) + 10) / (20 / 100))
- updatemic1500HzSlider(element,false);
+ updatemic1500HzSlider(element, false);
input.on('input', function () {
- updatemic1500HzSlider(element,true);
+ updatemic1500HzSlider(element, true);
})
input.on('change', function () {
- updatemic1500HzSlider(element,false);
+ updatemic1500HzSlider(element, false);
})
}
@@ -943,13 +943,13 @@
let element = $('#mic12KHz')
let input = $("#mic12KHz .volume-slider input")
input.attr('value', (parseInt(number) + 10) / (20 / 100))
- updatemic12KHzSlider(element,false);
+ updatemic12KHzSlider(element, false);
input.on('input', function () {
- updatemic12KHzSlider(element,true);
+ updatemic12KHzSlider(element, true);
})
input.on('change', function () {
- updatemic12KHzSlider(element,false);
+ updatemic12KHzSlider(element, false);
})
}
@@ -1012,20 +1012,20 @@
-
+
function mic240HzSlider(number) {
let element = $('#mic240Hz')
let input = $("#mic240Hz .volume-slider input")
input.attr('value', (parseInt(number) + 10) / (20 / 100))
- updatemic240HzSlider(element,false);
+ updatemic240HzSlider(element, false);
input.on('input', function () {
- updatemic240HzSlider(element,true);
+ updatemic240HzSlider(element, true);
})
input.on('change', function () {
- updatemic240HzSlider(element,false);
+ updatemic240HzSlider(element, false);
})
}
@@ -1054,14 +1054,14 @@
let element = $('#mic2150Hz')
let input = $("#mic2150Hz .volume-slider input")
input.attr('value', (parseInt(number) + 10) / (20 / 100))
- updatemic2150HzSlider(element,false);
+ updatemic2150HzSlider(element, false);
input.on('input', function () {
- updatemic2150HzSlider(element,true);
+ updatemic2150HzSlider(element, true);
})
input.on('change', function () {
- updatemic2150HzSlider(element,false);
+ updatemic2150HzSlider(element, false);
})
}
@@ -1214,20 +1214,20 @@
if (res.success) {
if (module == 'mic2state' || module == 'mic210k' || module == 'mic22k' || module == 'mic2500' || module == 'mic2150' || module == 'mic240') {
data.mic2 = res.content.mic2
- mic240Value = data.mic2.v40
- mic2150Value = data.mic2.v150
- mic2500Value = data.mic2.v500
- mic22kValue = data.mic2.v2k
- mic210kValue = data.mic2.v10k
+ mic240Value = data.mic2.band1
+ mic2150Value = data.mic2.band2
+ mic2500Value = data.mic2.band3
+ mic22kValue = data.mic2.band4
+ mic210kValue = data.mic2.band5
}
else {
data.mic1 = res.content.mic1
- mic140Value = data.mic1.v40
- mic1150Value = data.mic1.v150
- mic1500Value = data.mic1.v500
- mic12kValue = data.mic1.v2k
- mic110kValue = data.mic1.v10k
+ mic140Value = data.mic1.band1
+ mic1150Value = data.mic1.band2
+ mic1500Value = data.mic1.band3
+ mic12kValue = data.mic1.band4
+ mic110kValue = data.mic1.band5
}
bindData()
}
diff --git a/js/equalizer.js b/js/equalizer.js
index 6a4ab70..3b7bd76 100644
--- a/js/equalizer.js
+++ b/js/equalizer.js
@@ -4,32 +4,44 @@ $(function () {
var supportsWebSockets = 'WebSocket' in window || 'MozWebSocket' in window;
if (supportsWebSockets) {
//建立WebSocket连接（ip地址换成自己主机ip）
- var ws = new WebSocket("wss://fat-hk-ws-sdk.szfiu.com/websocket");
+ // var ws = new WebSocket("wss://fat-hk-ws-sdk.szfiu.com/websocket");
+ var ws = new WebSocket("ws://192.168.0.116:13500");
ws.onopen = function () {
//当WebSocket创建成功时，触发onopen事件
- console.log("websocket连接成功");
- //ws.send("hello"); //将消息发送到服务端
- ws.send(
- JSON.stringify({
- symbols: "['00700.hk]",
- command: 0,
- version: '1.0.0',
- token: 'szfiu',
- heartBeat: 'heartBeat'
- })
- );
+ // console.log("websocket连接成功");
+ // //ws.send("hello"); //将消息发送到服务端
+ // ws.send(
+ // JSON.stringify({
+ // symbols: "['00700.hk]",
+ // command: 0,
+ // version: '1.0.0',
+ // token: 'szfiu',
+ // heartBeat: 'heartBeat'
+ // })
+ // );
}
ws.onmessage = function (e) {
//当客户端收到服务端发来的消息时，触发onmessage事件，参数e.data包含server传递过来的数据
console.log("收到数据");
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);
+ if (eqData.module == "linein_L") {
+ LineInputLeftRandomBar(eqData.value - 72)
+ }
+ else if (eqData.module == "linein_R") {
+ LineInputRightRandomBar(eqData.value - 72)
+ } else if (eqData.module == "output_L") {
+ OutputVolumeLeftRandomBar(eqData.value - 72);
+ }
+ else if (eqData.module == "output_R") {
+ OutputVolumeRightRandomBar(eqData.value - 72);
+ }
+ else if (eqData.module == "mic1") {
+ Microphone1LeftRandomBar(eqData.value - 72)
+ }
+ else {
+ Microphone2LeftRandomBar(eqData.value - 72)
+ }
}
ws.onclose = function (e) {
//当客户端收到服务端发送的关闭连接请求时，触发onclose事件
@@ -39,8 +51,6 @@ $(function () {
//如果出现连接、处理、接收、发送数据失败的时候触发onerror事件
console.log("websocket发生错误" + e);
}
-
-
} else {
layer.alert("您的浏览器不支持 WebSocket!");