zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-07-13 20:32:02 +10:00
Code Issues Packages Projects Releases 2 Wiki Activity

clean

Browse Source
This commit is contained in:
just_stuff_tm
2026-03-03 16:44:13 -05:00
committed by just-stuff-tm
parent 367e47bb1e
commit 524558c511
11 changed files with 79 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/screens/scanner_screen.dart
+9 -6
View File
@@ -6,6 +6,7 @@ import 'package:provider/provider.dart';
import '../connector/meshcore_connector.dart';
import '../l10n/l10n.dart';
import '../utils/app_logger.dart';
import '../widgets/adaptive_app_bar_title.dart';
import '../widgets/device_tile.dart';
import 'contacts_screen.dart';
@@ -60,7 +61,7 @@ class _ScannerScreenState extends State<ScannerScreen> {
}
},
onError: (Object e) {
debugPrint("Scanner adapterState stream error: $e");
appLogger.warn('Adapter state stream error: $e', tag: 'ScannerScreen');
},
);
}
@@ -86,7 +87,7 @@ class _ScannerScreenState extends State<ScannerScreen> {
? IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
debugPrint('ScannerScreen: back button pressed');
appLogger.info('Back button pressed', tag: 'ScannerScreen');
Navigator.of(context).maybePop();
},
)
@@ -131,8 +132,9 @@ class _ScannerScreenState extends State<ScannerScreen> {
if (usbSupported)
FloatingActionButton.extended(
onPressed: () {
debugPrint(
'ScannerScreen: USB selected, opening UsbScreen',
appLogger.info(
'USB selected, opening UsbScreen',
tag: 'ScannerScreen',
);
Navigator.of(context).push(
MaterialPageRoute(builder: (_) => const UsbScreen()),
@@ -153,8 +155,9 @@ class _ScannerScreenState extends State<ScannerScreen> {
} else {
unawaited(
connector.startScan().catchError((e) {
debugPrint(
"Scanner screen startScan error: $e",
appLogger.warn(
'startScan error: $e',
tag: 'ScannerScreen',
);
}),
);
lib/screens/usb_screen.dart
+21 -14
View File
@@ -8,6 +8,7 @@ import 'package:provider/provider.dart';
import '../connector/meshcore_connector.dart';
import '../connector/meshcore_connector_usb.dart';
import '../l10n/l10n.dart';
import '../utils/app_logger.dart';
import '../utils/platform_info.dart';
import '../utils/usb_port_labels.dart';
import 'contacts_screen.dart';
@@ -109,7 +110,7 @@ class _UsbScreenState extends State<UsbScreen> {
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () {
debugPrint('UsbScreen: back button pressed');
appLogger.info('Back button pressed', tag: 'UsbScreen');
Navigator.of(context).maybePop();
},
),
@@ -124,8 +125,9 @@ class _UsbScreenState extends State<UsbScreen> {
PlatformInfo.isIOS)
TextButton.icon(
onPressed: () {
debugPrint(
'UsbScreen: Bluetooth selected, opening ScannerScreen',
appLogger.info(
'Bluetooth selected, opening ScannerScreen',
tag: 'UsbScreen',
);
Navigator.of(context).pushReplacement(
MaterialPageRoute(builder: (_) => const ScannerScreen()),
@@ -218,8 +220,9 @@ class _UsbScreenState extends State<UsbScreen> {
onPressed: _isLoadingPorts || _isConnecting
? null
: () {
debugPrint(
'UsbScreen: refresh ports pressed',
appLogger.info(
'Refresh ports pressed',
tag: 'UsbScreen',
);
_loadPorts();
},
@@ -234,8 +237,9 @@ class _UsbScreenState extends State<UsbScreen> {
final rawPortName = normalizeUsbPortName(
_selectedPort!,
);
debugPrint(
'UsbScreen: connect pressed for $_selectedPort (raw: $rawPortName)',
appLogger.info(
'Connect pressed for $_selectedPort (raw: $rawPortName)',
tag: 'UsbScreen',
);
_connectSelectedPort();
}
@@ -262,8 +266,9 @@ class _UsbScreenState extends State<UsbScreen> {
onPressed: _isLoadingPorts || _isConnecting
? null
: () {
debugPrint(
'UsbScreen: refresh ports pressed',
appLogger.info(
'Refresh ports pressed',
tag: 'UsbScreen',
);
_loadPorts();
},
@@ -280,8 +285,9 @@ class _UsbScreenState extends State<UsbScreen> {
final rawPortName = normalizeUsbPortName(
_selectedPort!,
);
debugPrint(
'UsbScreen: connect pressed for $_selectedPort (raw: $rawPortName)',
appLogger.info(
'Connect pressed for $_selectedPort (raw: $rawPortName)',
tag: 'UsbScreen',
);
_connectSelectedPort();
}
@@ -413,7 +419,7 @@ class _UsbScreenState extends State<UsbScreen> {
_selectedPort = port;
_errorText = null;
});
debugPrint('UsbScreen: selected port $port');
appLogger.info('Selected port $port', tag: 'UsbScreen');
},
leading: Icon(
Icons.usb,
@@ -511,8 +517,9 @@ class _UsbScreenState extends State<UsbScreen> {
try {
await _usbConnector.connect(portName: rawPortName);
} catch (error, stackTrace) {
debugPrint(
'UsbScreen: connect failed for $rawPortName: $error\n$stackTrace',
appLogger.error(
'Connect failed for $rawPortName: $error\n$stackTrace',
tag: 'UsbScreen',
);
if (!mounted) return;
setState(() {