hunter-open-sdk 2.0.0-beta.5 → 2.0.0-beta.6

package/lib/getAndroidSn/index.js

@@ -8,42 +8,42 @@ exports.UnregisterAndroidSn = exports.GetAndroidSn = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _usb = require("usb");
-var _utils = require("../utils/utils.js");
-var _utilsSn = require("../utils/utils.sn.js");
-var _child_process = require("child_process");
-// const childProcess = require('child_process')
-// const exec = childProcess.exec
-var attachHandler = null;
-var customWebUSB = new _usb.WebUSB({
-  allowAllDevices: true
-});
+var _utils = require("../utils/utils");
+var _utils2 = require("../utils/utils.sn");
+var childProcess = require('child_process');
+var exec = childProcess.exec;
+var hadRegisterUsb = false; // 是否已经注册过usb事件
+var isPause = false; // 是否暂停获取sn
 
 // mac获取sn
 var getMacSn = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(device, callBack) {
     var _deviceInfo$productNa, _deviceInfo$manufactu;
-    var attachDeviceId, deviceList, currentDevice, deviceInfo, productName, manufacturerName, supportedBrands, isSupportedBrand;
+    var attachDeviceId, customWebUSB, deviceList, currentDevice, deviceInfo, productName, manufacturerName, supportedBrands, isSupportedBrand;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           // 拿到当前连接的设备deviceAddress 作为标识去usb列表筛选
           attachDeviceId = device.deviceAddress;
-          _context.next = 3;
+          customWebUSB = new _usb.WebUSB({
+            allowAllDevices: true
+          });
+          _context.next = 4;
           return customWebUSB.getDevices();
-        case 3:
+        case 4:
           deviceList = _context.sent;
           if (attachDeviceId) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
           return _context.abrupt("return");
-        case 6:
+        case 7:
           // 删选出当前的设备信息 为获取到serialNumber
           currentDevice = deviceList.filter(function (item) {
             return item.device.deviceAddress == attachDeviceId;
           });
           if (currentDevice.length) {
-            _context.next = 10;
+            _context.next = 11;
             break;
           }
           callBack({
@@ -52,7 +52,7 @@ var getMacSn = /*#__PURE__*/function () {
             message: '获取SN失败'
           });
           return _context.abrupt("return");
-        case 10:
+        case 11:
           // 检查设备是否为支持的三星、华为、荣耀手机品牌
           deviceInfo = currentDevice[0];
           productName = ((_deviceInfo$productNa = deviceInfo.productName) === null || _deviceInfo$productNa === void 0 ? void 0 : _deviceInfo$productNa.toLowerCase()) || '';
@@ -62,7 +62,7 @@ var getMacSn = /*#__PURE__*/function () {
             return productName.includes(brand) || manufacturerName.includes(brand);
           });
           if (isSupportedBrand) {
-            _context.next = 18;
+            _context.next = 19;
             break;
           }
           callBack({
@@ -71,7 +71,7 @@ var getMacSn = /*#__PURE__*/function () {
             message: '暂不支持该品牌手机查询SN'
           });
           return _context.abrupt("return");
-        case 18:
+        case 19:
           callBack({
             code: 0,
             data: {
@@ -79,7 +79,7 @@ var getMacSn = /*#__PURE__*/function () {
             },
             message: '获取SN成功'
           });
-        case 19:
+        case 20:
         case "end":
           return _context.stop();
       }
@@ -99,7 +99,7 @@ var getWinSn = /*#__PURE__*/function () {
         case 0:
           // windows 需要运行命令获取sn
           cmdStr = "wmic path Win32_PnPEntity where \"DeviceID like 'USB%'\" get Name, PNPDeviceID /value";
-          (0, _child_process.exec)(cmdStr, function (err, stdout, stderr) {
+          exec(cmdStr, function (err, stdout, stderr) {
             if (err) {
               // 运行失败 则直接返回获取失败
               callBack({
@@ -120,7 +120,7 @@ var getWinSn = /*#__PURE__*/function () {
             }
 
             // 处理WMIC输出并提取手机序列号
-            var phoneDevices = (0, _utilsSn.parseWmicOutput)(stdout);
+            var phoneDevices = (0, _utils2.parseWmicOutput)(stdout);
             if (phoneDevices.length === 0) {
               callBack({
                 code: -1,
@@ -161,47 +161,68 @@ var getWinSn = /*#__PURE__*/function () {
  * @param {Object} params - 参数
  * @param {Function} callBack - 回调函数
  */
-
 var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack) {
-  if (attachHandler) return;
-  // 定义处理函数并保存引用
-  attachHandler = /*#__PURE__*/function () {
+  if (hadRegisterUsb) {
+    isPause = false;
+    return;
+  }
+  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:
-            console.log('device', device);
-            // const {idVendor} = device.deviceDescriptor;
-            // if(idVendor == 1452) return;
-
-            // callBack({
-            //   data: {
-            //     eventName: 'type_usb_android_device_result',
-            //     eventCode: 0
-            //   }
-            // });
-
-            // if (isMac()) {
-            //   getMacSn(device, callBack);
-            // } else if (isWin()) {
-            //   getWinSn(device, callBack);
-            // }
-          case 1:
+            if (!isPause) {
+              _context3.next = 2;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 2:
+            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',
+                eventCode: 0
+              }
+            });
+            if (!(0, _utils.isMac)()) {
+              _context3.next = 9;
+              break;
+            }
+            // mac获取sn
+            getMacSn(device, callBack);
+            return _context3.abrupt("return");
+          case 9:
+            if (!(0, _utils.isWin)()) {
+              _context3.next = 12;
+              break;
+            }
+            // win获取sn
+            getWinSn(device, callBack);
+            return _context3.abrupt("return");
+          case 12:
           case "end":
             return _context3.stop();
         }
       }, _callee3);
     }));
-    return function attachHandler(_x5) {
+    return function (_x5) {
       return _ref3.apply(this, arguments);
     };
-  }();
-  customWebUSB.addEventListener('connect', attachHandler);
+  }());
+  _usb.usb.on('detach', function () {
+    if (isPause) {
+      return;
+    }
+  });
 };
 var UnregisterAndroidSn = exports.UnregisterAndroidSn = function UnregisterAndroidSn() {
-  // 移除事件监听器
-  if (attachHandler) {
-    customWebUSB.removeEventListener('connect', attachHandler);
-    attachHandler = null;
-  }
+  isPause = true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "description": "采货侠SaaS版本桌面端sdk",
   "scripts": {
     "start": "zz dev",
@@ -11,8 +11,8 @@
     "fix": "zz lint --fix",
     "staged": "zz lint --staged",
     "staged-fix": "zz --staged --fix",
-    "pub": "zz pub",
-    "pub-beta": "zz pub --beta",
+    "pub": "npm run build && npm publish",
+    "pub-beta": "npm run build && npm publish --tag beta",
     "unpub": "zz pub --unpub",
     "doc": "zz doc && zz doc --upload",
     "dev-doc": "zz doc --dev",

package/lib/test.js

@@ -1,7 +0,0 @@
-"use strict";
-
-var _require = require("./getAndroidSn/index.js"),
-  GetAndroidSn = _require.GetAndroidSn;
-GetAndroidSn({}, function (res) {
-  console.log(res);
-});