hunter-open-sdk 1.0.5 → 1.0.7

package/lib/getAndroidSn/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GetAndroidSn = void 0;
+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");
@@ -12,6 +12,8 @@ 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 () {
@@ -160,34 +162,52 @@ var getWinSn = /*#__PURE__*/function () {
  * @param {Function} callBack - 回调函数
  */
 var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack) {
-  console.log('GetAndroidSn params', params);
+  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:
-            saasCallBack({
+            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 = 4;
+              _context3.next = 9;
               break;
             }
             // mac获取sn
             getMacSn(device, callBack);
             return _context3.abrupt("return");
-          case 4:
+          case 9:
             if (!(0, _utils.isWin)()) {
-              _context3.next = 7;
+              _context3.next = 12;
               break;
             }
             // win获取sn
             getWinSn(device, callBack);
             return _context3.abrupt("return");
-          case 7:
+          case 12:
           case "end":
             return _context3.stop();
         }
@@ -197,5 +217,12 @@ var GetAndroidSn = exports.GetAndroidSn = function GetAndroidSn(params, callBack
       return _ref3.apply(this, arguments);
     };
   }());
-  _usb.usb.on('detach', function () {});
+  _usb.usb.on('detach', function () {
+    if (isPause) {
+      return;
+    }
+  });
+};
+var UnregisterAndroidSn = exports.UnregisterAndroidSn = function UnregisterAndroidSn() {
+  isPause = true;
 };

package/lib/helper/deviceHelper.js

@@ -4,10 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DeviceHelper = void 0;
+exports.deviceHelper = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var DeviceHelper = exports.DeviceHelper = /*#__PURE__*/function () {
+var DeviceHelper = /*#__PURE__*/function () {
   function DeviceHelper() {
     (0, _classCallCheck2.default)(this, DeviceHelper);
     this.udidList = [];
@@ -41,4 +41,5 @@ var DeviceHelper = exports.DeviceHelper = /*#__PURE__*/function () {
     }
   }]);
   return DeviceHelper;
-}();
+}();
+var deviceHelper = exports.deviceHelper = new DeviceHelper();

package/lib/index.js

@@ -20,5 +20,6 @@ var _default = exports.default = {
   unregisterEvent: _registerEvent.UnregisterEvent,
   getGeneralReport: _getGeneralReport.GetGeneralReport,
   getSaaSReport: _getSaaSReport.GetSaaSReport,
-  getAndroidSn: _getAndroidSn.GetAndroidSn
+  getAndroidSn: _getAndroidSn.GetAndroidSn,
+  unregisterAndroidSn: _getAndroidSn.UnregisterAndroidSn
 };

package/lib/registerEvent/index.js

@@ -22,7 +22,6 @@ var saasCallBack;
 
 // usb监听
 var usbListener = null;
-var deviceHelper = new _deviceHelper.DeviceHelper();
 /**
  * 获取资源文件的基础路径
  */
@@ -56,7 +55,7 @@ var DevicePair = /*#__PURE__*/function () {
         case 0:
           udid = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
           params = _args.length > 1 ? _args[1] : undefined;
-          if (deviceHelper.hasUdid(udid)) {
+          if (_deviceHelper.deviceHelper.hasUdid(udid)) {
             _context.next = 4;
             break;
           }
@@ -287,7 +286,7 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                         eventCode: 0
                       }
                     });
-                    deviceHelper.addUdid(udid);
+                    _deviceHelper.deviceHelper.addUdid(udid);
                     // 有驱动，直接运行脚本
                     DevicePair(udid, params);
                   case 5:
@@ -308,7 +307,7 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                 eventCode: -1
               }
             });
-            deviceHelper.removeUdid(udid);
+            _deviceHelper.deviceHelper.removeUdid(udid);
           }).on('error', function (err) {
             console.log('usb连接错误：', err);
             Sentry.captureException('usb连接错误:' + JSON.stringify(err));
@@ -327,5 +326,5 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
 }();
 var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {
   usbListener && usbListener.destroy();
-  deviceHelper.clearUdidList();
+  _deviceHelper.deviceHelper.clearUdidList();
 };

package/package.json

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