mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Update messaging list separator insets
* Dont show unread messages or notifications for emoji reactions matching iMessage.
* Restore ble state method (#1416)
* Restore BLE State
* Log privacy
* AccessoryManager to handle restored connection
* Comment task out
* Update restore state function based on conversation with jake
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Two Column Node List (#1425)
* Restore BLE State
* Log privacy
* AccessoryManager to handle restored connection
* Comment task out
* Switch the node list to a two column layout
* Keep asian translations of channel details string
* Update restore state function based on conversation with jake
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* always show node list search bar
* Update auto correct modifier
* Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover
* Work in progress.
* Update detents
* Gate the discovery process while restoring
* Use geometry reader to size weather tiles on node details
* Update BLE Transport
* Update location weather condistion styles
* Log privacy in didReceive
* Remove extra dividers from admin key config, fix onboarding typo
* Bump minimum catalyst target
* Bump mac target version
* Use @FetchRequest for UserList to try and use less memory on ios 17
* Revert change to @fetchrequest
* Stab in the dark for Devices crash
* Updated UserList (back?) to @FetchRequest
* Set mac minimum to 15
* Nil out continuation after use
* Use @FetchRequest for the node list to stop crashes on iOS 17
* Handle failed connections during restoration
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update protos
* Update protos
* Remove stale keys
* Serbian translations update (#1422)
* Log privacy
* Add Serbian translations
---------
Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com>
* Clarify public key sub-text in security settings (#1412)
* Clarify public key sub-text in settings
* Trigger lint
* freq slot num pad (#1410)
* kill keyboard toolbar on lora config
* delete extranious scrollDismissesKeyboard
* Properly set catalyst target
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Views/Settings/Config/SecurityConfig.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Enums/DeviceEnums.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Make current location nilable, remove log spam
* clean up toUser logic
* Fix telemetry entity not added in nodeInfoPacket
* fix typo: powerMetrics.hasChXCurrent mismatch
* Duplicate decoding of telemetry.current removed
* Clean up mesh map fetch request and distance filter logic
* Revert attempt to fix message logic
* Bump datadog version
* Missing message fix, attempt #2 (#1431)
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
* Retry fewer times for longer
* Revert "Missing message fix, attempt #2 (#1431)" (#1432)
This reverts commit a96d318adb.
* Make retry 2 seconds
* Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database
* Add clear notifications function
* Link from channel messages to node info
* Link to node details
* Discovery on retry fix
* Discovery on retry fix fix
* Add contact to device node db if you get an encrypted send faild routing error
* Seperate channel message view into two views for better performance.
* Refactor User Message List
* Update device hardware
Add liquid glass to config save button
* Save button cleanup
* Update button structure on users view
* Move encrypted send logic out of the router. Update protos
* Restore node long- and short- names (#1442)
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Revert routing error
* Toggle for enabling device telemetry broadcast enable
* Update
* Enhancements for interval dropdowns (#1445)
* Cleanup
* Fix core data version
* Add never to update interval
* Device telemetry Enabled Boolean (#1446)
* Update core data and interval picker
* Move formatter
* Rework to nest options under enabled
* Clearer names
* Safer devicehardware api call, remove node history filter from mesh map
* Fix build
* Simplify mesh map filter
* Remove stale translation keys
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com>
Co-authored-by: Spencer Smith <dontaskspencer@gmail.com>
Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
186 lines
6.2 KiB
Swift
186 lines
6.2 KiB
Swift
//
|
|
// DeviceMetricsLog.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 7/7/22.
|
|
//
|
|
import SwiftUI
|
|
import Charts
|
|
import OSLog
|
|
import CoreData
|
|
|
|
struct EnvironmentMetricsLog: View {
|
|
|
|
@Environment(\.managedObjectContext) var context
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
@State private var isPresentingClearLogConfirm: Bool = false
|
|
@State var isExporting = false
|
|
@State var exportString = ""
|
|
@ObservedObject var node: NodeInfoEntity
|
|
|
|
@StateObject var columnList = MetricsColumnList.environmentDefaultColumns
|
|
@StateObject var seriesList = MetricsSeriesList.environmentDefaultChartSeries
|
|
|
|
@State var isEditingColumnConfiguration = false
|
|
|
|
@FetchRequest private var chartData: FetchedResults<TelemetryEntity>
|
|
|
|
init(node: NodeInfoEntity) {
|
|
self.node = node
|
|
|
|
// Build fetch request:
|
|
let request: NSFetchRequest<TelemetryEntity> = TelemetryEntity.fetchRequest()
|
|
let oneWeekAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date()) ?? Date.distantPast
|
|
request.predicate = NSPredicate(format: "nodeTelemetry == %@ AND metricsType == 1 AND time >= %@", node, oneWeekAgo as NSDate)
|
|
request.sortDescriptors = [NSSortDescriptor(key: "time", ascending: false)]
|
|
_chartData = FetchRequest(fetchRequest: request)
|
|
}
|
|
|
|
var body: some View {
|
|
VStack {
|
|
if node.hasEnvironmentMetrics {
|
|
let chartRange = applyMargins(seriesList.chartRange(forData: chartData))
|
|
VStack {
|
|
if chartData.count > 0 {
|
|
GroupBox(label: Label("\(chartData.count) Readings Total", systemImage: "chart.xyaxis.line")) {
|
|
Chart(seriesList.visible) { series in
|
|
ForEach(chartData, id: \.time) { dataPoint in
|
|
series.body(dataPoint, inChartRange: chartRange)
|
|
}
|
|
}
|
|
.chartXAxis(content: {
|
|
AxisMarks(position: .top)
|
|
})
|
|
.chartYScale(domain: chartRange)
|
|
.chartForegroundStyleScale { (seriesName: String) -> AnyShapeStyle in
|
|
return seriesList.foregroundStyle(forAbbreviatedName: seriesName, chartRange: chartRange) ?? AnyShapeStyle(Color.clear)
|
|
}
|
|
.chartLegend(position: .automatic, alignment: .bottom)
|
|
}
|
|
}
|
|
|
|
// Dynamic table column using SwiftUI Table requires TableColumnForEach which requires the target
|
|
// to be bumped to 17.4 -- Until that happens, the existing non-configurable table is used.
|
|
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
|
|
// Add a table for mac and ipad
|
|
Table(chartData) {
|
|
TableColumnForEach(columnList.visible) { col in
|
|
TableColumn(col.name) { em in
|
|
col.body(em)
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
ScrollView {
|
|
LazyVGrid(columns: columnList.gridItems, alignment: .leading, spacing: 1, pinnedViews: [.sectionHeaders]) {
|
|
GridRow {
|
|
ForEach(columnList.visible) { col in
|
|
Text(col.abbreviatedName)
|
|
.font(.caption)
|
|
.fontWeight(.bold)
|
|
}
|
|
}
|
|
ForEach(chartData) { em in
|
|
GridRow {
|
|
ForEach(columnList.visible) { col in
|
|
col.body(em)
|
|
.font(.caption)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.padding(.leading, 15)
|
|
.padding(.trailing, 5)
|
|
}
|
|
}
|
|
}
|
|
HStack {
|
|
let isPadOrCatalyst = UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac
|
|
let buttonSize: ControlSize = isPadOrCatalyst ? .large : .small
|
|
let imageScale: Image.Scale = isPadOrCatalyst ? .medium : .small
|
|
Button {
|
|
self.isEditingColumnConfiguration = true
|
|
} label: {
|
|
Label("Config", systemImage: "tablecells")
|
|
.imageScale(imageScale)
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(buttonSize)
|
|
.padding(.bottom)
|
|
.padding(.leading)
|
|
.sheet(isPresented: self.$isEditingColumnConfiguration) {
|
|
MetricsColumnDetail(columnList: columnList, seriesList: seriesList)
|
|
}
|
|
Button(role: .destructive) {
|
|
isPresentingClearLogConfirm = true
|
|
} label: {
|
|
Label("Clear", systemImage: "trash.fill")
|
|
.imageScale(imageScale)
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(buttonSize)
|
|
.padding(.bottom)
|
|
.confirmationDialog(
|
|
"Are you sure?",
|
|
isPresented: $isPresentingClearLogConfirm,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button("Delete all environment metrics?", role: .destructive) {
|
|
if clearTelemetry(destNum: node.num, metricsType: 1, context: context) {
|
|
Logger.services.error("Clear Environment Metrics Log Failed")
|
|
}
|
|
}
|
|
}
|
|
Button {
|
|
exportString = telemetryToCsvFile(telemetry: chartData, metricsType: 1)
|
|
isExporting = true
|
|
} label: {
|
|
Label("Save", systemImage: "square.and.arrow.down")
|
|
.imageScale(imageScale)
|
|
}
|
|
.buttonStyle(.bordered)
|
|
.buttonBorderShape(.capsule)
|
|
.controlSize(buttonSize)
|
|
.padding(.bottom)
|
|
.padding(.trailing)
|
|
}
|
|
|
|
} else {
|
|
ContentUnavailableView("No Environment Metrics", systemImage: "slash.circle")
|
|
}
|
|
}
|
|
|
|
.navigationTitle("Environment Metrics 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") Environment Metrics Log"),
|
|
onCompletion: { result in
|
|
switch result {
|
|
case .success:
|
|
self.isExporting = false
|
|
Logger.services.info("Environment metrics log download succeeded.")
|
|
case .failure(let error):
|
|
Logger.services.error("Environment metrics log download failed: \(error.localizedDescription, privacy: .public)")
|
|
}
|
|
}
|
|
)
|
|
}
|
|
|
|
// Helper. Adds a little buffer to the Y axis range, but keeps Y=0
|
|
func applyMargins<T>(_ range: ClosedRange<T>) -> ClosedRange<T> where T: BinaryFloatingPoint {
|
|
let span = range.upperBound - range.lowerBound
|
|
let margin = span * 0.1
|
|
let lower = range.lowerBound == 0.0 ? 0.0 : range.lowerBound - margin
|
|
let upper = range.upperBound + margin
|
|
return lower...upper
|
|
}
|
|
}
|