mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
224 lines
6.9 KiB
Swift
224 lines
6.9 KiB
Swift
//
|
|
// PaxCounterLog.swift
|
|
// Meshtastic
|
|
//
|
|
// Created by Garth Vander Houwen on 2/25/24.
|
|
//
|
|
|
|
import SwiftUI
|
|
import Charts
|
|
import OSLog
|
|
|
|
struct PaxCounterLog: View {
|
|
|
|
@Environment(\.managedObjectContext) var context
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
|
|
@State private var isPresentingClearLogConfirm: Bool = false
|
|
@State var isExporting = false
|
|
@State var exportString = ""
|
|
|
|
@State private var bleChartColor: Color = .blue
|
|
@State private var wifiChartColor: Color = .orange
|
|
@State private var paxChartColor: Color = .green
|
|
@ObservedObject var node: NodeInfoEntity
|
|
|
|
var body: some View {
|
|
VStack {
|
|
if node.hasPax {
|
|
|
|
let oneWeekAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())
|
|
let pax = node.pax?.reversed() as? [PaxCounterEntity] ?? []
|
|
let chartData = pax
|
|
.filter { $0.time != nil && $0.time! >= oneWeekAgo! }
|
|
.sorted { $0.time! < $1.time! }
|
|
let maxValue = (chartData.map { $0.wifi }.max() ?? 0) + (chartData.map { $0.ble }.max() ?? 0) + 5
|
|
if chartData.count > 0 {
|
|
GroupBox(label: Label("\(pax.count) Readings Total", systemImage: "chart.xyaxis.line")) {
|
|
|
|
Chart {
|
|
ForEach(chartData, id: \.self) { point in
|
|
Plot {
|
|
PointMark(
|
|
x: .value("x", point.time!),
|
|
y: .value("y", (point.wifi + point.ble))
|
|
)
|
|
}
|
|
.accessibilityLabel("Total PAX")
|
|
.accessibilityValue("X: \(point.time!), Y: \(point.wifi + point.ble)")
|
|
.foregroundStyle(paxChartColor)
|
|
.interpolationMethod(.cardinal)
|
|
|
|
Plot {
|
|
PointMark(
|
|
x: .value("x", point.time!),
|
|
y: .value("y", point.wifi)
|
|
)
|
|
}
|
|
.accessibilityLabel("WiFi")
|
|
.accessibilityValue("X: \(point.time!), Y: \(point.wifi)")
|
|
.foregroundStyle(wifiChartColor)
|
|
|
|
Plot {
|
|
PointMark(
|
|
x: .value("x", point.time!),
|
|
y: .value("y", point.ble)
|
|
)
|
|
}
|
|
.accessibilityLabel("BLE")
|
|
.accessibilityValue("X: \(point.time!), Y: \(point.ble)")
|
|
.foregroundStyle(bleChartColor)
|
|
}
|
|
}
|
|
.chartXAxis(content: {
|
|
AxisMarks(position: .top)
|
|
})
|
|
.chartXAxis(.automatic)
|
|
.chartYScale(domain: 0...maxValue)
|
|
.chartForegroundStyleScale([
|
|
"BLE".localized: .blue,
|
|
"WiFi".localized: .orange,
|
|
"Total PAX".localized: .green
|
|
])
|
|
.chartLegend(position: .automatic, alignment: .bottom)
|
|
}
|
|
.frame(minHeight: 250)
|
|
}
|
|
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(pax) {
|
|
TableColumn("BLE") { pc in
|
|
Text("\(pc.ble)")
|
|
}
|
|
TableColumn("WiFi") { pc in
|
|
Text("\(pc.wifi)")
|
|
}
|
|
TableColumn("Total PAX") { pc in
|
|
Text("\(pc.wifi + pc.ble)")
|
|
}
|
|
TableColumn("Uptime") { pc in
|
|
let now = Date.now
|
|
let later = now + TimeInterval(pc.uptime)
|
|
let components = (now..<later).formatted(.components(style: .condensedAbbreviated))
|
|
Text(components)
|
|
}
|
|
TableColumn("Timestamp") { pc in
|
|
Text(pc.time?.formattedDate(format: dateFormatString) ?? "Unknown Age".localized)
|
|
}
|
|
.width(min: 180)
|
|
}
|
|
} 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: 50), spacing: 0.1),
|
|
GridItem(.flexible(minimum: 60, maximum: 140), spacing: 0.1),
|
|
GridItem(.flexible(minimum: 100, maximum: 160), spacing: 0.1)
|
|
]
|
|
LazyVGrid(columns: columns, alignment: .leading, spacing: 1) {
|
|
GridRow {
|
|
Text("BLE")
|
|
.font(.caption)
|
|
.fontWeight(.bold)
|
|
Text("WiFi")
|
|
.font(.caption)
|
|
.fontWeight(.bold)
|
|
Text("Total")
|
|
.font(.caption)
|
|
.fontWeight(.bold)
|
|
Text("Uptime")
|
|
.font(.caption)
|
|
.fontWeight(.bold)
|
|
Text("Timestamp")
|
|
.font(.caption)
|
|
.fontWeight(.bold)
|
|
}
|
|
ForEach(pax) { pc in
|
|
GridRow {
|
|
Text(String(pc.ble))
|
|
.font(.caption)
|
|
Text(String(pc.wifi))
|
|
.font(.caption)
|
|
Text(String(pc.ble + pc.wifi))
|
|
.font(.caption)
|
|
let now = Date.now
|
|
let later = now + TimeInterval(pc.uptime)
|
|
let components = (now..<later).formatted(.components(style: .condensedAbbreviated))
|
|
Text(components)
|
|
.font(.caption)
|
|
Text(pc.time?.formattedDate(format: dateFormatString) ?? "Unknown Age".localized)
|
|
.font(.caption)
|
|
}
|
|
}
|
|
}
|
|
.padding(.leading, 15)
|
|
.padding(.trailing, 5)
|
|
}
|
|
}
|
|
HStack {
|
|
Button(role: .destructive) {
|
|
isPresentingClearLogConfirm = true
|
|
} label: {
|
|
Label("Clear", systemImage: "trash.fill")
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.large)
|
|
.padding(.bottom)
|
|
.padding(.leading)
|
|
.confirmationDialog(
|
|
"Are you sure?",
|
|
isPresented: $isPresentingClearLogConfirm,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button("Delete all pax data?", role: .destructive) {
|
|
if clearPax(destNum: node.num, context: context) {
|
|
Logger.services.info("Cleared Pax Counter for \(node.num, privacy: .public)")
|
|
} else {
|
|
Logger.services.error("Clear Pax Counter Log Failed")
|
|
}
|
|
}
|
|
}
|
|
|
|
Button {
|
|
exportString = paxToCsvFile(pax: pax)
|
|
isExporting = true
|
|
} label: {
|
|
Label("Save", systemImage: "square.and.arrow.down")
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(.large)
|
|
.padding(.bottom)
|
|
.padding(.trailing)
|
|
}
|
|
} else {
|
|
ContentUnavailableView("No PAX Counter Logs", systemImage: "slash.circle")
|
|
}
|
|
}
|
|
.navigationTitle("PAX Counter Log")
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
.navigationBarItems(trailing:
|
|
ZStack {
|
|
ConnectedDevice(deviceConnected: accessoryManager.isConnected, name: accessoryManager.activeConnection?.device.shortName ?? "?")
|
|
})
|
|
.fileExporter(
|
|
isPresented: $isExporting,
|
|
document: CsvDocument(emptyCsv: exportString),
|
|
contentType: .commaSeparatedText,
|
|
defaultFilename: String("\(node.user?.longName ?? "Node") \("paxcounter.log".localized)"),
|
|
onCompletion: { result in
|
|
switch result {
|
|
case .success:
|
|
self.isExporting = false
|
|
Logger.services.info("PAX Counter log download succeeded")
|
|
case .failure(let error):
|
|
Logger.services.error("PAX Counter log download failed: \(error.localizedDescription, privacy: .public)")
|
|
}
|
|
}
|
|
)
|
|
}
|
|
}
|