hunter-open-sdk 2.0.0-beta.2 → 2.0.0-beta.4

package/lib/getAndroidSn/index.js

@@ -14,7 +14,8 @@ var childProcess = require('child_process');
 var exec = childProcess.exec;
 var hadRegisterUsb = false; // 是否已经注册过usb事件
 var isPause = false; // 是否暂停获取sn
-
+var attachHandler = null;
+var detachHandler = null;
 // mac获取sn
 var getMacSn = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(device, callBack) {
@@ -161,13 +162,24 @@ var getWinSn = /*#__PURE__*/function () {
  * @param {Object} params - 参数
  * @param {Function} callBack - 回调函数
  */
+
 var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack) {
   if (hadRegisterUsb) {
     isPause = false;
     return;
   }
   hadRegisterUsb = true;
-  _usb.usb.on('attach', /*#__PURE__*/function () {
+
+  // 先移除可能存在的旧监听器
+  if (attachHandler) {
+    _usb.usb.removeListener('attach', attachHandler);
+  }
+  if (detachHandler) {
+    _usb.usb.removeListener('detach', detachHandler);
+  }
+
+  // 定义处理函数并保存引用
+  attachHandler = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(device) {
       var idVendor;
       return _regenerator.default.wrap(function _callee3$(_context3) {
@@ -192,37 +204,40 @@ var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack
                 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;
+            if ((0, _utils.isMac)()) {
+              getMacSn(device, callBack);
+            } else if ((0, _utils.isWin)()) {
+              getWinSn(device, callBack);
             }
-            // win获取sn
-            getWinSn(device, callBack);
-            return _context3.abrupt("return");
-          case 12:
+          case 7:
           case "end":
             return _context3.stop();
         }
       }, _callee3);
     }));
-    return function (_x5) {
+    return function attachHandler(_x5) {
       return _ref3.apply(this, arguments);
     };
-  }());
-  _usb.usb.on('detach', function () {
-    if (isPause) {
-      return;
-    }
-  });
+  }();
+  detachHandler = function detachHandler() {
+    if (isPause) return;
+  };
+
+  // 注册新监听器
+  _usb.usb.on('attach', attachHandler);
+  _usb.usb.on('detach', detachHandler);
 };
 var UnregisterAndroidSn = exports.UnregisterAndroidSn = function UnregisterAndroidSn() {
   isPause = true;
+
+  // 移除事件监听器
+  if (attachHandler) {
+    _usb.usb.removeListener('attach', attachHandler);
+    attachHandler = null;
+  }
+  if (detachHandler) {
+    _usb.usb.removeListener('detach', detachHandler);
+    detachHandler = null;
+  }
+  hadRegisterUsb = false;
 };

package/package.json

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