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

move uptime to node details

Browse source
This commit is contained in:
Garth Vander Houwen 2024-04-22 15:11:00 -07:00
parent 0aba48a447
commit 85bda07bae
2 changed files with 29 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@
//
import SwiftUI
import Charts
import UIKit
struct DeviceMetricsLog: View {
@ -87,8 +86,8 @@ struct DeviceMetricsLog: View {
}
.frame(minHeight: 250)
}
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMdjmma", options: 0, locale: Locale.current)
let dateFormatString = (localeDateFormat ?? "M/d/YY j:mma").replacingOccurrences(of: ",", with: "")
let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMddjmma", options: 0, locale: Locale.current)
let dateFormatString = (localeDateFormat ?? "MM/dd/YY j:mma").replacingOccurrences(of: ",", with: "")
if UIScreen.main.bounds.size.width > 768 && (UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac) {
// Add a table for mac and ipad
// Table(Array(deviceMetrics),id: \.self) {
@ -114,28 +113,6 @@ struct DeviceMetricsLog: View {
let later = now + TimeInterval(dm.uptimeSeconds)
let components = (now..<later).formatted(.components(style: .narrow))
Text(components)
let formatter = RelativeDateTimeFormatter()
formatter.unitsStyle = .abbreviated
//let formattedString = String(format: "%02ld%02ld", difference.hour!, difference.minute!)
//print(formattedString)
// let formatter = DateComponentsFormatter()
//
// formatter.unitsStyle = .abbreviated
// formatter.zeroFormattingBehavior = .dropAll
// formatter.allowedUnits = [.day, .hour, .minute, .second]
//formatter.unitsStyle = .narrow
// let formattedDuration = formatter.string(from: now, to: later)
// print(formattedDuration) // Output: "2h 30m"
//let formattedDuration = formatter.string(from: now, to: later)
//print(formattedDuration) // Output: "2h 30m"
//let components = (now..<later).formatted(.components(style: .narrow))
//formatter.string(from: (now..<later).duration)
//Text(formattedDuration)
//Text(components)
}
TableColumn("timestamp") { dm in
Text(dm.time?.formattedDate(format: dateFormatString) ?? "unknown.age".localized)
@ -145,11 +122,10 @@ struct DeviceMetricsLog: View {
} else {
ScrollView {
let columns = [
GridItem(.flexible(minimum: 20, maximum: 50), spacing: 0.1),
GridItem(.flexible(minimum: 20, maximum: 50), spacing: 0.1),
GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
GridItem(.flexible(minimum: 20, maximum: 70), spacing: 0.1),
GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
GridItem(.flexible(minimum: 100, maximum: .infinity), spacing: 0.1)
]
LazyVGrid(columns: columns, alignment: .leading, spacing: 1) {
@ -166,9 +142,6 @@ struct DeviceMetricsLog: View {
Text("AirTm")
.font(.caption)
.fontWeight(.bold)
Text("uptime")
.font(.caption)
.fontWeight(.bold)
Text("timestamp")
.font(.caption)
.fontWeight(.bold)
@ -188,11 +161,6 @@ struct DeviceMetricsLog: View {
.font(.caption)
Text("\(String(format: "%.2f", dm.airUtilTx))%")
.font(.caption)
let now = Date.now
let later = now + TimeInterval(dm.uptimeSeconds)
let components = (now..<later).formatted(.components(style: .condensedAbbreviated))
Text(components)
.font(.caption)
Text(dm.time?.formattedDate(format: dateFormatString) ?? "unknown.age".localized)
.font(.caption)
}

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

@ -26,10 +26,34 @@ struct NodeDetail: View {
VStack {
ScrollView {
NodeInfoItem(node: node)
let dm = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0")).lastObject as? TelemetryEntity
if dm?.uptimeSeconds ?? 0 > 0 {
HStack(alignment: .center) {
let now = Date.now
let later = now + TimeInterval(dm!.uptimeSeconds)
let components = (now..<later).formatted(.components(style: .narrow))
Label(
title: {
Text("\("uptime".localized)")
.font(.title2)+Text(": \(components)")
.font(.title3)
.foregroundColor(Color.gray)
},
icon: {
Image(systemName: "arrowshape.up.circle.fill")
.foregroundColor(.green)
.symbolRenderingMode(.hierarchical)
.font(.title)
}
)
}
Divider()
}
if node.metadata != nil {
HStack(alignment: .center) {
Text("firmware.version").font(.title2)+Text(": \(node.metadata?.firmwareVersion ?? "unknown".localized)")
.font(.title3).foregroundColor(Color.gray)
.font(.title3)
.foregroundColor(Color.gray)
if connectedNode != nil && connectedNode?.myInfo?.hasAdmin ?? false && node.metadata?.time != nil && !Calendar.current.isDateInToday(node.metadata!.time!) {
Button {
let adminMessageId = bleManager.requestDeviceMetadata(fromUser: connectedNode!.user!, toUser: node.user!, adminIndex: connectedNode!.myInfo!.adminIndex, context: context)