hunter-open-sdk 1.0.7-beta.1 → 1.0.7

package/lib/getAndroidSn/index.js

@@ -32,22 +32,18 @@ var getMacSn = /*#__PURE__*/function () {
           return customWebUSB.getDevices();
         case 4:
           deviceList = _context.sent;
-          console.log('deviceList', deviceList);
-
-          // 如果设备没有attachDeviceId 则直接返回
-          if (!(!attachDeviceId || !deviceList.length)) {
-            _context.next = 8;
+          if (attachDeviceId) {
+            _context.next = 7;
             break;
           }
           return _context.abrupt("return");
-        case 8:
+        case 7:
           // 删选出当前的设备信息 为获取到serialNumber
           currentDevice = deviceList.filter(function (item) {
             return item.device.deviceAddress == attachDeviceId;
           });
-          console.log('currentDevice', currentDevice);
           if (currentDevice.length) {
-            _context.next = 13;
+            _context.next = 11;
             break;
           }
           callBack({
@@ -56,7 +52,7 @@ var getMacSn = /*#__PURE__*/function () {
             message: '获取SN失败'
           });
           return _context.abrupt("return");
-        case 13:
+        case 11:
           // 检查设备是否为支持的三星、华为、荣耀手机品牌
           deviceInfo = currentDevice[0];
           productName = ((_deviceInfo$productNa = deviceInfo.productName) === null || _deviceInfo$productNa === void 0 ? void 0 : _deviceInfo$productNa.toLowerCase()) || '';
@@ -65,9 +61,8 @@ var getMacSn = /*#__PURE__*/function () {
           isSupportedBrand = supportedBrands.some(function (brand) {
             return productName.includes(brand) || manufacturerName.includes(brand);
           });
-          console.log('deviceInfo', deviceInfo, productName, manufacturerName);
           if (isSupportedBrand) {
-            _context.next = 22;
+            _context.next = 19;
             break;
           }
           callBack({
@@ -76,7 +71,7 @@ var getMacSn = /*#__PURE__*/function () {
             message: '暂不支持该品牌手机查询SN'
           });
           return _context.abrupt("return");
-        case 22:
+        case 19:
           callBack({
             code: 0,
             data: {
@@ -84,7 +79,7 @@ var getMacSn = /*#__PURE__*/function () {
             },
             message: '获取SN成功'
           });
-        case 23:
+        case 20:
         case "end":
           return _context.stop();
       }
@@ -174,6 +169,7 @@ var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack
   hadRegisterUsb = true;
   _usb.usb.on('attach', /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(device) {
+      var idVendor;
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -183,7 +179,13 @@ var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack
             }
             return _context3.abrupt("return");
           case 2:
-            console.log('attach GetAndroidSn', device);
+            idVendor = device.deviceDescriptor.idVendor;
+            if (!(idVendor == 1452)) {
+              _context3.next = 5;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 5:
             callBack({
               data: {
                 eventName: 'type_usb_android_device_result',
@@ -191,21 +193,21 @@ var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack
               }
             });
             if (!(0, _utils.isMac)()) {
-              _context3.next = 7;
+              _context3.next = 9;
               break;
             }
             // mac获取sn
             getMacSn(device, callBack);
             return _context3.abrupt("return");
-          case 7:
+          case 9:
             if (!(0, _utils.isWin)()) {
-              _context3.next = 10;
+              _context3.next = 12;
               break;
             }
             // win获取sn
             getWinSn(device, callBack);
             return _context3.abrupt("return");
-          case 10:
+          case 12:
           case "end":
             return _context3.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "1.0.7-beta.1",
+  "version": "1.0.7",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",