Autli/BluetoothTracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix background timer runloop mode and remove '...' placeholder

Browse source
This commit is contained in:
Nikita 2026-10-06 12:30:15 +05:00
parent 3a6379b178
commit 353e1da2fe
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Sources/blts_tracker/BLTSTrackerApp.swift
View file

@ -25,9 +25,6 @@ struct BLTSTrackerApp: App {
if isConn, let p = percent { if isConn, let p = percent {
Label(" \(p)%", systemImage: "headphones") Label(" \(p)%", systemImage: "headphones")
.labelStyle(.titleAndIcon) .labelStyle(.titleAndIcon)
} else if isConn {
Label(" ...", systemImage: "headphones")
.labelStyle(.titleAndIcon)
} else { } else {
Label("", systemImage: "headphones") Label("", systemImage: "headphones")
.labelStyle(.iconOnly) .labelStyle(.iconOnly)
@ -37,7 +34,7 @@ struct BLTSTrackerApp: App {
@ViewBuilder @ViewBuilder
private var menuContent: some View { private var menuContent: some View {
if let dev = tracker.activeHeadphone, dev.isConnected { if let dev = tracker.activeHeadphone, dev.isConnected {
let percentStr = dev.primaryBatteryPercent != nil ? "\(dev.primaryBatteryPercent!)%" : "Определение..." let percentStr = dev.primaryBatteryPercent != nil ? "\(dev.primaryBatteryPercent!)%" : "Подключено"
Text("🎧 \(dev.name): \(percentStr)") Text("🎧 \(dev.name): \(percentStr)")
.font(.headline) .font(.headline)

19
Sources/blts_tracker/Services/BluetoothTracker.swift
View file

@ -11,6 +11,8 @@ public final class BluetoothTracker: ObservableObject {
@Published public var devices: [BluetoothDeviceModel] = [] @Published public var devices: [BluetoothDeviceModel] = []
private var timer: Timer? private var timer: Timer?
private var lastValidBattery: [String: Int] = [:]
private typealias IntBatteryGetter = @convention(c) (AnyObject, Selector) -> Int private typealias IntBatteryGetter = @convention(c) (AnyObject, Selector) -> Int
private typealias BoolGetter = @convention(c) (AnyObject, Selector) -> Bool private typealias BoolGetter = @convention(c) (AnyObject, Selector) -> Bool
@ -26,10 +28,13 @@ public final class BluetoothTracker: ObservableObject {
public func startTracking() { public func startTracking() {
stopTracking() stopTracking()
updateDeviceList() updateDeviceList()
// Fast 1.5s real-time poll
timer = Timer.scheduledTimer(withTimeInterval: 1.5, repeats: true) { [weak self] _ in // Use .common mode so timer runs continuously without pausing
let t = Timer(timeInterval: 1.5, repeats: true) { [weak self] _ in
self?.updateDeviceList() self?.updateDeviceList()
} }
RunLoop.main.add(t, forMode: .common)
self.timer = t
} }
public func stopTracking() { public func stopTracking() {
@ -60,7 +65,7 @@ public final class BluetoothTracker: ObservableObject {
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
self?.updateDeviceList() self?.updateDeviceList()
} }
for delay in [0.3, 0.8, 1.5, 2.5] { for delay in [0.2, 0.6, 1.2, 2.0] {
DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
self?.updateDeviceList() self?.updateDeviceList()
} }
@ -118,7 +123,7 @@ public final class BluetoothTracker: ObservableObject {
// 2. IOKit Registry enrich // 2. IOKit Registry enrich
enrichFromIORegistry(devices: &updatedList) enrichFromIORegistry(devices: &updatedList)
// 3. Sort: Connected audio first, then connected other, then paired audio // 3. Sort: Connected audio first
updatedList.sort { d1, d2 in updatedList.sort { d1, d2 in
if d1.isConnected != d2.isConnected { if d1.isConnected != d2.isConnected {
return d1.isConnected && !d2.isConnected return d1.isConnected && !d2.isConnected
@ -208,13 +213,14 @@ public final class BluetoothTracker: ObservableObject {
let imp = device.method(for: sel) let imp = device.method(for: sel)
let fn = unsafeBitCast(imp, to: IntBatteryGetter.self) let fn = unsafeBitCast(imp, to: IntBatteryGetter.self)
let val = fn(device, sel) let val = fn(device, sel)
// Valid battery percentages are 1 to 100
if val > 0 && val <= 100 { if val > 0 && val <= 100 {
return val return val
} }
return nil return nil
} }
let addr = model.address
if isMulti { if isMulti {
model.leftBattery = getBatteryValue(selectorName: "batteryPercentLeft") model.leftBattery = getBatteryValue(selectorName: "batteryPercentLeft")
model.rightBattery = getBatteryValue(selectorName: "batteryPercentRight") model.rightBattery = getBatteryValue(selectorName: "batteryPercentRight")
@ -228,7 +234,10 @@ public final class BluetoothTracker: ObservableObject {
?? getBatteryValue(selectorName: "batteryPercentCombined") ?? getBatteryValue(selectorName: "batteryPercentCombined")
if let single = single { if let single = single {
lastValidBattery[addr] = single
model.singleBattery = single model.singleBattery = single
} else if let cached = lastValidBattery[addr] {
model.singleBattery = cached
} }
} }
} }