hunter-open-sdk 1.0.8-beta.1 → 1.1.1-beta.1

package/lib/registerEvent/index.js

@@ -37,17 +37,37 @@ var getResourcePath = function getResourcePath() {
 };
 
 /**
- * 配对
+ * 发布配对
+ * @param {String} udid 设备id
+ * @param {String} params 参数
+ * @returns {String} 发布配对结果
+ */
+var publishPair = function publishPair() {
+  var udid = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var params = arguments.length > 1 ? arguments[1] : undefined;
+  // 通过调用 trust_status 来判断信任状态
+  var kitParamsObj = JSON.parse(params);
+
+  // 合并参数
+  Object.assign(kitParamsObj, {
+    cmd: 'publish_pair',
+    udid: udid
+  });
+  return (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
+};
+
+/**
+ * 获取信任状态
  * @param {String} udid 设备id
  * @returns 
  */
-var DevicePair = /*#__PURE__*/function () {
+var getTrustStatus = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
     var udid,
       params,
-      paramsObj,
-      devicePair,
-      pairRes,
+      kitParamsObj,
+      trustStatusRes,
+      trustStatusResObj,
       Code,
       Data,
       _args = arguments;
@@ -60,50 +80,93 @@ var DevicePair = /*#__PURE__*/function () {
             _context.next = 4;
             break;
           }
-          return _context.abrupt("return");
+          return _context.abrupt("return", false);
         case 4:
-          // 通过调用read_pair来判断是否已配对【信任】
-          paramsObj = JSON.parse(params); // 合并参数
-          Object.assign(paramsObj, {
+          // 通过调用 trust_status 来判断信任状态
+          kitParamsObj = JSON.parse(params); // 合并参数
+          Object.assign(kitParamsObj, {
             cmd: 'trust_status',
             udid: udid
           });
-          devicePair = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(paramsObj));
-          if (!devicePair) {
-            _context.next = 17;
+
+          // 获取信任状态
+          trustStatusRes = (0, _utils2.callHunterInspectionKit)('TheForceKit', JSON.stringify(kitParamsObj));
+          if (!trustStatusRes) {
+            _context.next = 19;
             break;
           }
-          pairRes = JSON.parse(devicePair);
-          Code = pairRes.Code, Data = pairRes.Data;
+          trustStatusResObj = JSON.parse(trustStatusRes);
+          Code = trustStatusResObj.Code, Data = trustStatusResObj.Data;
           if (!(Code == 0 && (Data.imei || Data.serialNumber))) {
             _context.next = 14;
             break;
           }
-          saasCallBack({
-            data: {
-              eventName: 'type_trust_result',
-              udid: udid,
-              eventCode: 0
-            }
-          });
-          _context.next = 17;
-          break;
+          return _context.abrupt("return", Data);
         case 14:
           _context.next = 16;
           return (0, _utils.sleep)();
         case 16:
-          DevicePair(udid, params);
-        case 17:
+          _context.next = 18;
+          return getTrustStatus(udid, params);
+        case 18:
+          return _context.abrupt("return", _context.sent);
+        case 19:
+          return _context.abrupt("return", false);
+        case 20:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function DevicePair() {
+  return function getTrustStatus() {
     return _ref.apply(this, arguments);
   };
 }();
 
+/**
+ * 配对并获取信任状态
+ * @param {String} udid 设备id
+ * @returns 
+ */
+var DevicePair = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+    var udid,
+      params,
+      trustStatusRes,
+      _args2 = arguments;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          udid = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : '';
+          params = _args2.length > 1 ? _args2[1] : undefined;
+          // 发布配对
+          publishPair(udid, params);
+
+          // 通过 trust_status 来判断信任状态
+          _context2.next = 5;
+          return getTrustStatus(udid, params);
+        case 5:
+          trustStatusRes = _context2.sent;
+          if (trustStatusRes) {
+            saasCallBack({
+              data: {
+                eventName: 'type_trust_result',
+                udid: udid,
+                eventCode: 0
+              }
+            });
+          }
+        case 7:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function DevicePair() {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
 // 写入dll文件version
 var writeDllVersion = function writeDllVersion(version) {
   var resourcePath = getResourcePath();
@@ -255,9 +318,9 @@ var checkAndInstallDriver = function checkAndInstallDriver() {
   });
 };
 var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(params, callBack) {
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  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) {
         case 0:
           saasCallBack = callBack;
 
@@ -265,19 +328,19 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
           updateDllFileCheck();
 
           // 在插线之前就检测驱动状态
-          _context3.next = 4;
+          _context4.next = 4;
           return checkAndInstallDriver();
         case 4:
           usbListener = new usbmux.createListener().on('attached', /*#__PURE__*/function () {
-            var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(udid) {
-              return _regenerator.default.wrap(function _callee2$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+            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) {
                   case 0:
                     if (udid) {
-                      _context2.next = 2;
+                      _context3.next = 2;
                       break;
                     }
-                    return _context2.abrupt("return");
+                    return _context3.abrupt("return");
                   case 2:
                     // 插入设备通知
                     saasCallBack({
@@ -292,12 +355,12 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
                     DevicePair(udid, params);
                   case 5:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
-              }, _callee2);
+              }, _callee3);
             }));
             return function (_x3) {
-              return _ref3.apply(this, arguments);
+              return _ref4.apply(this, arguments);
             };
           }()).on('detached', function (udid) {
             // 拔出设备
@@ -317,12 +380,12 @@ var RegisterEvent = exports.RegisterEvent = /*#__PURE__*/function () {
           });
         case 5:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   }));
   return function RegisterEvent(_x, _x2) {
-    return _ref2.apply(this, arguments);
+    return _ref3.apply(this, arguments);
   };
 }();
 var UnregisterEvent = exports.UnregisterEvent = function UnregisterEvent() {

package/package.json

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