hunter-open-sdk 1.1.1-beta.2 → 1.1.1-beta.3

package/lib/registerEvent/index.js

@@ -65,6 +65,7 @@ var getTrustStatus = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
     var udid,
       params,
+      once,
       kitParamsObj,
       trustStatusRes,
       trustStatusResObj,
@@ -76,12 +77,13 @@ var getTrustStatus = /*#__PURE__*/function () {
         case 0:
           udid = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
           params = _args.length > 1 ? _args[1] : undefined;
+          once = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
           if (_deviceHelper.deviceHelper.hasUdid(udid)) {
-            _context.next = 4;
+            _context.next = 5;
             break;
           }
           return _context.abrupt("return", false);
-        case 4:
+        case 5:
           // 通过调用 trust_status 来判断信任状态
           kitParamsObj = JSON.parse(params); // 合并参数
           Object.assign(kitParamsObj, {
@@ -92,27 +94,31 @@ var getTrustStatus = /*#__PURE__*/function () {
           // 获取信任状态
           trustStatusRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
           if (!trustStatusRes) {
-            _context.next = 19;
+            _context.next = 21;
             break;
           }
           trustStatusResObj = JSON.parse(trustStatusRes);
           Code = trustStatusResObj.Code, Data = trustStatusResObj.Data;
           if (!(Code == 0 && (Data.imei || Data.serialNumber))) {
-            _context.next = 14;
+            _context.next = 15;
             break;
           }
           return _context.abrupt("return", Data);
-        case 14:
-          _context.next = 16;
-          return (0, _utils.sleep)();
-        case 16:
+        case 15:
+          if (once) {
+            _context.next = 21;
+            break;
+          }
           _context.next = 18;
-          return getTrustStatus(udid, params);
+          return (0, _utils.sleep)();
         case 18:
+          _context.next = 20;
+          return getTrustStatus(udid, params);
+        case 20:
           return _context.abrupt("return", _context.sent);
-        case 19:
+        case 21:
           return _context.abrupt("return", false);
-        case 20:
+        case 22:
         case "end":
           return _context.stop();
       }
@@ -122,6 +128,25 @@ var getTrustStatus = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+var getTrustStatusOnce = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid, params) {
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return getTrustStatus(udid, params, true);
+        case 2:
+          return _context2.abrupt("return", _context2.sent);
+        case 3:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getTrustStatusOnce(_x, _x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 
 /**
  * 配对并获取信任状态
@@ -129,24 +154,29 @@ var getTrustStatus = /*#__PURE__*/function () {
  * @returns 
  */
 var DevicePair = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
     var udid,
       params,
+      trustStatusOnceRes,
       trustStatusRes,
-      _args2 = arguments;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+      _args3 = arguments;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          udid = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : '';
-          params = _args2.length > 1 ? _args2[1] : undefined;
-          // 发布配对
-          publishPair(udid, params);
+          udid = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : '';
+          params = _args3.length > 1 ? _args3[1] : undefined;
+          // 单次获取信任状态
+          trustStatusOnceRes = getTrustStatusOnce(udid, params); // 未信任弹起信任窗口
+          if (!trustStatusOnceRes) {
+            // 发布配对
+            publishPair(udid, params);
+          }
 
           // 通过 trust_status 来判断信任状态
-          _context2.next = 5;
+          _context3.next = 6;
           return getTrustStatus(udid, params);
-        case 5:
-          trustStatusRes = _context2.sent;
+        case 6:
+          trustStatusRes = _context3.sent;
           if (trustStatusRes) {
             saasCallBack({
               data: {
@@ -156,14 +186,14 @@ var DevicePair = /*#__PURE__*/function () {
               }
             });
           }
-        case 7:
+        case 8:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return function DevicePair() {
-    return _ref2.apply(this, arguments);
+    return _ref3.apply(this, arguments);
   };
 }();
 
@@ -318,9 +348,9 @@ var checkAndInstallDriver = function checkAndInstallDriver() {
   });
 };
 var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(params, callBack) {
-    return _regenerator.default.wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(params, callBack) {
+    return _regenerator.default.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
           saasCallBack = callBack;
 
@@ -328,19 +358,19 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
           updateDllFileCheck();
 
           // 在插线之前就检测驱动状态
-          _context4.next = 4;
+          _context5.next = 4;
           return checkAndInstallDriver();
         case 4:
           usbListener = new usbmux.createListener().on('attached', /*#__PURE__*/function () {
-            var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(udid) {
-              return _regenerator.default.wrap(function _callee3$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+            var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(udid) {
+              return _regenerator.default.wrap(function _callee4$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
                   case 0:
                     if (udid) {
-                      _context3.next = 2;
+                      _context4.next = 2;
                       break;
                     }
-                    return _context3.abrupt("return");
+                    return _context4.abrupt("return");
                   case 2:
                     // 插入设备通知
                     saasCallBack({
@@ -355,12 +385,12 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                     DevicePair(udid, params);
                   case 5:
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
-              }, _callee3);
+              }, _callee4);
             }));
-            return function (_x3) {
-              return _ref4.apply(this, arguments);
+            return function (_x5) {
+              return _ref5.apply(this, arguments);
             };
           }()).on('detached', function (udid) {
             // 拔出设备
@@ -380,12 +410,12 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
           });
         case 5:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4);
+    }, _callee5);
   }));
-  return function RegisterEvent(_x, _x2) {
-    return _ref3.apply(this, arguments);
+  return function RegisterEvent(_x3, _x4) {
+    return _ref4.apply(this, arguments);
   };
 }();
 var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {

package/package.json

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