From 9ca71f6748550bcd2f795aa986e39c3c838765c6 Mon Sep 17 00:00:00 2001
From: Asura <todaymofish@gmail.com>
Date: Mon, 26 Sep 2022 00:50:12 -0700
Subject: [PATCH] Fix numpad convert error in flutter

---
 flutter/lib/consts.dart             | 20 ++++++++++----------
 flutter/lib/models/input_model.dart |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart
index ccacab5fb..a307aee5e 100644
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -231,16 +231,16 @@ const Map<int, String> physicalKeyMap = <int, String>{
   0x00070056: 'VK_SUBTRACT',
   0x00070057: 'VK_ADD',
   0x00070058: 'VK_ENTER', // num enter
-  0x00070059: 'VK_NUMPAD0',
-  0x0007005a: 'VK_NUMPAD1',
-  0x0007005b: 'VK_NUMPAD2',
-  0x0007005c: 'VK_NUMPAD3',
-  0x0007005d: 'VK_NUMPAD4',
-  0x0007005e: 'VK_NUMPAD5',
-  0x0007005f: 'VK_NUMPAD6',
-  0x00070060: 'VK_NUMPAD7',
-  0x00070061: 'VK_NUMPAD8',
-  0x00070062: 'VK_NUMPAD9',
+  0x00070059: 'VK_NUMPAD1',
+  0x0007005a: 'VK_NUMPAD2',
+  0x0007005b: 'VK_NUMPAD3',
+  0x0007005c: 'VK_NUMPAD4',
+  0x0007005d: 'VK_NUMPAD5',
+  0x0007005e: 'VK_NUMPAD6',
+  0x0007005f: 'VK_NUMPAD7',
+  0x00070060: 'VK_NUMPAD8',
+  0x00070061: 'VK_NUMPAD9',
+  0x00070062: 'VK_NUMPAD0',
   0x00070063: 'VK_DECIMAL',
   0x00070075: 'VK_HELP',
   0x00070077: 'VK_SELECT',
diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart
index f996daddf..2e4d45732 100644
--- a/flutter/lib/models/input_model.dart
+++ b/flutter/lib/models/input_model.dart
@@ -103,8 +103,8 @@ class Keyboard {
 
   void sendRawKey(RawKeyEvent e, {bool? down, bool? press}) {
     // for maximum compatibility
-    final label = logicalKeyMap[e.logicalKey.keyId] ??
-        physicalKeyMap[e.physicalKey.usbHidUsage] ??
+    final label = physicalKeyMap[e.physicalKey.usbHidUsage] ??
+        logicalKeyMap[e.logicalKey.keyId] ??
         e.logicalKey.keyLabel;
     _ffi.inputKey(label, down: down, press: press ?? false);
   }