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

package/lib/getAndroidSn/index.js

@@ -14,8 +14,7 @@ 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) {
@@ -162,24 +161,13 @@ 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;
-
-  // 先移除可能存在的旧监听器
-  if (attachHandler) {
-    _usb.usb.removeListener('attach', attachHandler);
-  }
-  if (detachHandler) {
-    _usb.usb.removeListener('detach', detachHandler);
-  }
-
-  // 定义处理函数并保存引用
-  attachHandler = /*#__PURE__*/function () {
+  _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) {
@@ -204,40 +192,37 @@ var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack
                 eventCode: 0
               }
             });
-            if ((0, _utils.isMac)()) {
-              getMacSn(device, callBack);
-            } else if ((0, _utils.isWin)()) {
-              getWinSn(device, callBack);
+            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;
             }
-          case 7:
+            // 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);
     };
-  }();
-  detachHandler = function detachHandler() {
-    if (isPause) return;
-  };
-
-  // 注册新监听器
-  _usb.usb.on('attach', attachHandler);
-  _usb.usb.on('detach', detachHandler);
+  }());
+  _usb.usb.on('detach', function () {
+    if (isPause) {
+      return;
+    }
+  });
 };
 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/lib/utils/utils.js

@@ -30,9 +30,10 @@ var isDev = exports.isDev = function isDev() {
   }
 
   // 检查是否在 Electron 主进程中，且没有打包
-  if (process.type === 'browser' && !process.resourcesPath.includes('app.asar')) {
-    return true;
-  }
+  // if (process.type === 'browser' && !process.resourcesPath.includes('app.asar')) {
+  //   return true
+  // }
+
   return false;
 };
 var isProd = exports.isProd = function isProd() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunter-open-sdk",
-  "version": "2.0.0-beta.4",
+  "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",