meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

adding first heard date too

Browse source
This commit is contained in:
Blake McAnally 2024-07-09 20:47:26 -05:00
parent 3bf443884c
commit e4851769a1
4 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Localizable.xcstrings
View file

@ -7365,6 +7365,9 @@
}
}
}
},
"First heard" : {
},
"Five Minutes" : {

6
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -145,8 +145,10 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext)
let newNode = NodeInfoEntity(context: context)
newNode.id = Int64(packet.from)
newNode.num = Int64(packet.from)
newNode.firstHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
newNode.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
if packet.rxTime != 0 {
newNode.firstHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
newNode.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
}
newNode.snr = packet.rxSnr
newNode.rssi = packet.rxRssi
newNode.viaMqtt = packet.viaMqtt

4
Meshtastic/Views/Helpers/LastHeardText.swift
View file

@ -15,8 +15,8 @@ struct LastHeardText: View {
}()
var body: some View {
if let lastHeard, lastHeard.timeIntervalSince1970 > 0 {
Text(lastHeard.formatted())
if let lastHeard, lastHeard.timeIntervalSince1970 > 0, let text = Self.formatter.string(for: lastHeard) {
Text(text)
} else {
Text("unknown")
}

15
Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
View file

@ -129,6 +129,21 @@ struct NodeDetail: View {
}
}
if let firstHeard = node.firstHeard {
HStack {
Label {
Text("First heard")
} icon: {
Image(systemName: "clock")
.symbolRenderingMode(.multicolor)
}
Spacer()
LastHeardText(lastHeard: firstHeard)
.textSelection(.enabled)
}
}
if let lastHeard = node.lastHeard {
HStack {
Label {