w-ui-v1 1.0.56 → 1.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/utils/nfc.ts

@@ -174,7 +174,7 @@ function __read(intent) {
         tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);
         var bytesId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
         waiting.close();
-        var tagid = bytesToHexString(tag.getId())
+        var tagid = bytesToDecimalString(tag.getId())
         if (typeof _getCardNo === 'function') {
             _getCardNo(tagid);
         }
@@ -186,20 +186,30 @@ function __read(intent) {
     }
 }
  
-function bytesToHexString(inarray) {
-    var i, j, x;
-    var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A",
-        "B", "C", "D", "E", "F"
-    ];
-    var out = "";
-    for (j = 0; j < inarray.length; ++j) {
-        x = parseInt(inarray[j]) & 0xff;
-        i = (x >> 4) & 0x0f;
-        out += hex[i];
-        i = x & 0x0f;
-        out += hex[i];
+// function bytesToHexString(inarray) {
+//     var i, j, x;
+//     var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A",
+//         "B", "C", "D", "E", "F"
+//     ];
+//     var out = "";
+//     for (j = 0; j < inarray.length; ++j) {
+//         x = parseInt(inarray[j]) & 0xff;
+//         i = (x >> 4) & 0x0f;
+//         out += hex[i];
+//         i = x & 0x0f;
+//         out += hex[i];
+//     }
+//     return out;
+// }
+function bytesToDecimalString(inarray) {
+    let result = BigInt(0);
+    // 反转数组以适配大端序
+    const reversed = [...inarray].reverse();
+    for (let j = 0; j < reversed.length; j++) {
+        const byte = BigInt(parseInt(reversed[j])) & BigInt(0xff);
+        result = (result << BigInt(8)) | byte;
     }
-    return out;
+    return result.toString();
 }
  
 function reverseTwo(str) {