zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-04-20 22:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor path handling in ChannelMessagePathScreen to improve logic for outgoing messages and channel messages

Browse source
This commit is contained in:
Winston Lowe 2026-02-18 10:25:06 -08:00
parent 17a9db0f0e
commit b8acedd03e
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/connector/meshcore_connector.dart
View file

@ -64,7 +64,7 @@ class DirectRepeater {
lastUpdated.millisecondsSinceEpoch;
final maxAgeMs = maxAgeMinutes * 60 * 1000;
final recencyScore = (maxAgeMs - ageMs).clamp(0, maxAgeMs);
return (snr * snr).round() + recencyScore;
return ((snr - 31.75) * 1000).round() + recencyScore;
}
bool isStale() {

26
lib/screens/channel_message_path_screen.dart
View file

@ -60,7 +60,7 @@ class ChannelMessagePathScreen extends StatelessWidget {
title: context.l10n.contacts_repeaterPathTrace,
path: primaryPath,
flipPathRound: true,
reversePathRound: !message.isOutgoing,
reversePathRound: !message.isOutgoing && !channelMessage,
),
),
),
@ -165,7 +165,11 @@ class ChannelMessagePathScreen extends StatelessWidget {
),
subtitle: Text(_formatPathPrefixes(variants[i])),
trailing: const Icon(Icons.map_outlined, size: 20),
onTap: () => _openPathMap(context, initialPath: variants[i]),
onTap: () => _openPathMap(
context,
initialPath: variants[i],
channelMessage: channelMessage,
),
),
),
],
@ -344,7 +348,9 @@ class _ChannelMessagePathMapScreenState
primaryPath,
);
final selectedPath = !widget.channelMessage && widget.message.isOutgoing
final selectedPath =
((!widget.message.isOutgoing && !widget.channelMessage) ||
(widget.message.isOutgoing && widget.channelMessage))
? Uint8List.fromList(selectedPathTmp.reversed.toList())
: selectedPathTmp;
@ -356,12 +362,24 @@ class _ChannelMessagePathMapScreenState
);
final points = <LatLng>[];
print(
'outgoing: ${widget.message.isOutgoing}, channelMsg: ${widget.channelMessage}',
);
if ((widget.message.isOutgoing && !widget.channelMessage) ||
(widget.message.isOutgoing && widget.channelMessage)) {
points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
}
for (final hop in hops) {
if (hop.hasLocation) {
points.add(hop.position!);
}
}
points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
if ((!widget.message.isOutgoing && !widget.channelMessage) ||
(!widget.message.isOutgoing && widget.channelMessage)) {
points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
}
final polylines = points.length > 1
? [