Skip to content

J
jensen
Commit dbc24bdd authored by martin hou's avatar martin hou
Browse files
Options

Merge branch 'v2.2.10-bluetooth' into v2.2.11-live

parents 9a6ef089 822f6b05
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
jensen.d.ts
View file @ dbc24bdd
...@@ -58,6 +58,7 @@ export type BluetoothDevice = { ...@@ -58,6 +58,7 @@ export type BluetoothDevice = {
rssi?: number; // 设备信号强度 rssi?: number; // 设备信号强度
cod?: number; // 设备类型编码 cod?: number; // 设备类型编码
sequence?: number; // 设备序号 sequence?: number; // 设备序号
audio?: boolean; // 是否音频设备
}; };
// 操作系统枚举 // 操作系统枚举
......
src/utils/jensen.js
View file @ dbc24bdd
...@@ -1576,7 +1576,8 @@ Jensen.registerHandler(BLUETOOTH_SCAN, (msg, jensen) => { ...@@ -1576,7 +1576,8 @@ Jensen.registerHandler(BLUETOOTH_SCAN, (msg, jensen) => {
if (len == 0) continue; if (len == 0) continue;
devices.push({ devices.push({
name: decoder.decode(jensen.truncateIncompleteUtf8(sname)), name: decoder.decode(jensen.truncateIncompleteUtf8(sname)),
mac: mac.join('-') mac: mac.join('-'),
audio: true
}); });
} }
return devices; return devices;
...@@ -1698,7 +1699,7 @@ Jensen.registerHandler(BT_DEV_LIST, (msg, jensen) => { ...@@ -1698,7 +1699,7 @@ Jensen.registerHandler(BT_DEV_LIST, (msg, jensen) => {
let isAudio = __is_headset_or_mic(cod); let isAudio = __is_headset_or_mic(cod);
if (len == 0) continue; if (len == 0) continue;
devices.push({ devices.push({
name: (isAudio ? '🎧' : '🚫') + decoder.decode(jensen.truncateIncompleteUtf8(sname)), name: decoder.decode(jensen.truncateIncompleteUtf8(sname)),
mac: mac.join('-'), mac: mac.join('-'),
rssi: rssi, rssi: rssi,
cod: cod, cod: cod,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment