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

Update DeviceMetricsLog.swift

Browse source
This commit is contained in:
Garth Vander Houwen 2023-03-30 21:09:21 -07:00 • committed by GitHub
parent 6aa2b3414a
commit 64b3d42f2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Meshtastic/Views/Nodes/DeviceMetricsLog.swift
View file

@ -19,14 +19,17 @@ struct DeviceMetricsLog: View {
var body: some View {
let oneDayAgo = Calendar.current.date(byAdding: .day, value: -3, to: Date())
let deviceMetrics = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0")).reversed() as? [TelemetryEntity] ?? []
let batteryChartData = deviceMetrics
.filter { $0.time != nil && $0.time! >= oneDayAgo! }
.sorted { $0.time! < $1.time! }
NavigationStack {
let oneDayAgo = Calendar.current.date(byAdding: .day, value: -3, to: Date())
let data = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0 && time !=nil && time >= %@", oneDayAgo! as CVarArg)) ?? []
if data.count > 0 {
if batteryChartData.count > 0 {
GroupBox(label: Label("battery.level.trend", systemImage: "battery.100")) {
Chart(data.array as? [TelemetryEntity] ?? [], id: \.self) {
Chart(batteryChartData, id: \.self) {
LineMark(
x: .value("Hour", $0.time!.formattedDate(format: "ha")),
y: .value("Value", $0.batteryLevel)
@ -41,7 +44,7 @@ struct DeviceMetricsLog: View {
}
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMddjmma", options: 0, locale: Locale.current)
let dateFormatString = (localeDateFormat ?? "MM/dd/YY j:mma").replacingOccurrences(of: ",", with: "")
let deviceMetrics = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0")).reversed() as? [TelemetryEntity] ?? []
//let deviceMetrics = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0")).reversed() as? [TelemetryEntity] ?? []
Text("\(deviceMetrics.count) Readings")
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
@ -102,7 +105,7 @@ struct DeviceMetricsLog: View {
ForEach(deviceMetrics) { dm in
GridRow {
if dm.batteryLevel > 100 {
Text("USB")
Text("PWD")
.font(.caption)
} else {
Text("\(String(dm.batteryLevel))%")