feat: support box-number navigation for completed multi-code boxing & unify key handling

- In multi-code boxing mode, scanning a completed total-row number shows a
  clickable warning banner; clicking it or pressing P4 navigates to that
  box number to view boxing details.
- Unify key handling across all pages to LogicalKeyboardKey named constants,
  removing the _androidKeyCodeFromLogicalKey fallback path.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Misaka_Company
2026-05-20 14:21:38 +08:00
parent f587194267
commit b1a76287d6
3 changed files with 55 additions and 64 deletions

View File

@@ -84,9 +84,6 @@ class BoxingPage extends StatefulWidget {
} }
class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver { class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
static const _androidKeyCodeButtonR1 = 103;
static const _androidKeyCodeButtonL2 = 104;
final _scannerService = ScannerService(); final _scannerService = ScannerService();
final _apiService = ApiService(); final _apiService = ApiService();
final _feedbackService = FeedbackService(); final _feedbackService = FeedbackService();
@@ -145,6 +142,9 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
bool _isAutoProcessing = false; bool _isAutoProcessing = false;
final _autoWarnings = <String>[]; final _autoWarnings = <String>[];
// 多码凑箱:已完成装箱时可跳转的箱号
int? _completedJumpBoxNo;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -201,28 +201,23 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
_finishManyToOneBox(); _finishManyToOneBox();
} }
} }
if (_completedJumpBoxNo != null && _isJumpToBoxKey(event)) {
_jumpToCompletedBox();
}
} }
bool _isModeSwitchKey(KeyEvent event) { bool _isModeSwitchKey(KeyEvent event) {
final key = event.logicalKey; final key = event.logicalKey;
return key == LogicalKeyboardKey.select || return key == LogicalKeyboardKey.select ||
key == LogicalKeyboardKey.gameButtonRight1 || key == LogicalKeyboardKey.gameButtonRight1;
_androidKeyCodeFromLogicalKey(key) == _androidKeyCodeButtonR1;
} }
bool _isFinishBoxKey(KeyEvent event) { bool _isFinishBoxKey(KeyEvent event) {
final key = event.logicalKey; return event.logicalKey == LogicalKeyboardKey.gameButtonLeft2;
return key == LogicalKeyboardKey.gameButtonLeft2 ||
_androidKeyCodeFromLogicalKey(key) == _androidKeyCodeButtonL2;
} }
int? _androidKeyCodeFromLogicalKey(LogicalKeyboardKey key) { bool _isJumpToBoxKey(KeyEvent event) {
final keyId = key.keyId; return event.logicalKey == LogicalKeyboardKey.gameButtonRight2;
const androidPlane = LogicalKeyboardKey.androidPlane;
if (keyId >= androidPlane && keyId < androidPlane + 0x100000000) {
return keyId - androidPlane;
}
return null;
} }
void _onBoxNoTextChanged() { void _onBoxNoTextChanged() {
@@ -372,6 +367,7 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
_editingAssignedItemId = null; _editingAssignedItemId = null;
_editingAssignedQuantity = ''; _editingAssignedQuantity = '';
_deletingAssignedItemId = null; _deletingAssignedItemId = null;
_completedJumpBoxNo = null;
_statusOverrideText = null; _statusOverrideText = null;
if (_mode == BoxingMode.singleCode) { if (_mode == BoxingMode.singleCode) {
_paichanSwitchNotice = null; _paichanSwitchNotice = null;
@@ -482,6 +478,10 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
final remaining = _remainingQuantity; final remaining = _remainingQuantity;
if (remaining <= 0) { if (remaining <= 0) {
_quantityController.clear(); _quantityController.clear();
if (_manyToOnePackedItems.isEmpty &&
_currentZongpaiBoxes.isNotEmpty) {
_completedJumpBoxNo = _currentZongpaiBoxes.first.boxNo;
}
_statusOverrideText = '该总排号已全部装箱完毕'; _statusOverrideText = '该总排号已全部装箱完毕';
_statusOverrideDot = StatusDotColor.red; _statusOverrideDot = StatusDotColor.red;
return; return;
@@ -1230,6 +1230,17 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
}); });
} }
void _jumpToCompletedBox() {
final boxNo = _completedJumpBoxNo;
if (boxNo == null) return;
setState(() {
_boxNoController.text = boxNo.toString();
_completedJumpBoxNo = null;
_statusOverrideText = null;
_statusOverrideDot = null;
});
}
// === 导航到详情页 === // === 导航到详情页 ===
void _openDetail() { void _openDetail() {
@@ -1430,15 +1441,32 @@ class _BoxingPageState extends State<BoxingPage> with WidgetsBindingObserver {
if (_phase == _Phase.scanned && if (_phase == _Phase.scanned &&
_zongpaiNo != null && _zongpaiNo != null &&
_remainingQuantity <= 0) { _remainingQuantity <= 0) {
banners.add( final jumpBoxNo = _completedJumpBoxNo;
_noticeBanner( if (jumpBoxNo != null) {
icon: Icon(Icons.warning, size: 14, color: Colors.red.shade800), banners.add(
text: '${_zongpaiNo!} 已全部装箱完毕,无需操作', GestureDetector(
background: Colors.red.shade50, onTap: _jumpToCompletedBox,
foreground: Colors.red.shade800, behavior: HitTestBehavior.opaque,
border: Colors.red.shade100, child: _noticeBanner(
), icon: Icon(Icons.warning, size: 14, color: Colors.amber.shade800),
); text: '${_zongpaiNo!} 已完成装箱。(P4跳转所在箱号)',
background: Colors.amber.shade50,
foreground: Colors.amber.shade800,
border: Colors.amber.shade200,
),
),
);
} else {
banners.add(
_noticeBanner(
icon: Icon(Icons.warning, size: 14, color: Colors.red.shade800),
text: '${_zongpaiNo!} 已全部装箱完毕,无需操作',
background: Colors.red.shade50,
foreground: Colors.red.shade800,
border: Colors.red.shade100,
),
);
}
} }
return banners; return banners;
} }

View File

@@ -39,10 +39,6 @@ class HomePage extends StatefulWidget {
} }
class _HomePageState extends State<HomePage> { class _HomePageState extends State<HomePage> {
static const _androidKeyCode1 = 8;
static const _androidKeyCode2 = 9;
static const _androidKeyCode3 = 10;
final _apiService = ApiService(); final _apiService = ApiService();
final _focusNode = FocusNode(); final _focusNode = FocusNode();
bool _isCheckingConnection = false; bool _isCheckingConnection = false;
@@ -134,23 +130,6 @@ class _HomePageState extends State<HomePage> {
event.character == '3') { event.character == '3') {
return 3; return 3;
} }
// Android keyCode fallback for scanner devices: 1/2/3 => 8/9/10.
final androidKeyCode = _androidKeyCodeFromLogicalKey(key);
return switch (androidKeyCode) {
_androidKeyCode1 => 1,
_androidKeyCode2 => 2,
_androidKeyCode3 => 3,
_ => null,
};
}
int? _androidKeyCodeFromLogicalKey(LogicalKeyboardKey key) {
final keyId = key.keyId;
const androidPlane = LogicalKeyboardKey.androidPlane;
if (keyId >= androidPlane && keyId < androidPlane + 0x100000000) {
return keyId - androidPlane;
}
return null; return null;
} }

View File

@@ -20,8 +20,6 @@ class RegistrationPage extends StatefulWidget {
} }
class _RegistrationPageState extends State<RegistrationPage> { class _RegistrationPageState extends State<RegistrationPage> {
static const _androidKeyCodeButtonR1 = 103;
final _scannerService = ScannerService(); final _scannerService = ScannerService();
final _apiService = ApiService(); final _apiService = ApiService();
final _feedbackService = FeedbackService(); final _feedbackService = FeedbackService();
@@ -101,17 +99,7 @@ class _RegistrationPageState extends State<RegistrationPage> {
bool _isLockToggleKey(KeyEvent event) { bool _isLockToggleKey(KeyEvent event) {
final key = event.logicalKey; final key = event.logicalKey;
return key == LogicalKeyboardKey.select || return key == LogicalKeyboardKey.select ||
key == LogicalKeyboardKey.gameButtonRight1 || key == LogicalKeyboardKey.gameButtonRight1;
_androidKeyCodeFromLogicalKey(key) == _androidKeyCodeButtonR1;
}
int? _androidKeyCodeFromLogicalKey(LogicalKeyboardKey key) {
final keyId = key.keyId;
const androidPlane = LogicalKeyboardKey.androidPlane;
if (keyId >= androidPlane && keyId < androidPlane + 0x100000000) {
return keyId - androidPlane;
}
return null;
} }
void _onScan(ScanResult result) { void _onScan(ScanResult result) {
@@ -676,13 +664,9 @@ class _RegistrationPageState extends State<RegistrationPage> {
focusNode: dialogFocus, focusNode: dialogFocus,
onKeyEvent: (event) { onKeyEvent: (event) {
if (event is! KeyDownEvent) return; if (event is! KeyDownEvent) return;
final androidKey = if (event.logicalKey == LogicalKeyboardKey.arrowUp) {
_androidKeyCodeFromLogicalKey(event.logicalKey);
if (event.logicalKey == LogicalKeyboardKey.arrowUp ||
androidKey == 19) {
setDialogState(() => selectedIndex = 0); setDialogState(() => selectedIndex = 0);
} else if (event.logicalKey == LogicalKeyboardKey.arrowDown || } else if (event.logicalKey == LogicalKeyboardKey.arrowDown) {
androidKey == 20) {
setDialogState(() => selectedIndex = 1); setDialogState(() => selectedIndex = 1);
} else if (event.logicalKey == LogicalKeyboardKey.enter) { } else if (event.logicalKey == LogicalKeyboardKey.enter) {
selectedIndex == 0 ? dismissAsNo() : confirmSwitch(); selectedIndex == 0 ? dismissAsNo() : confirmSwitch();