yach.open.jssdk 4.4.1-beta10 → 4.4.1-beta12

package/libs/lib/bridge/index.js

@@ -1,32 +1,39 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-_Object$defineProperty(exports, "PcBridgeInit", {
-  enumerable: true,
-  get: function get() {
-    return _pc.PcBridgeInit;
-  }
-});
+
 _Object$defineProperty(exports, "mobileBridge", {
   enumerable: true,
   get: function get() {
     return _mobile.mobileBridge;
   }
 });
+
 _Object$defineProperty(exports, "mobileBridgeInit", {
   enumerable: true,
   get: function get() {
     return _mobile.mobileBridgeInit;
   }
 });
+
 _Object$defineProperty(exports, "pcBridge", {
   enumerable: true,
   get: function get() {
     return _pc.pcBridge;
   }
 });
+
+_Object$defineProperty(exports, "PcBridgeInit", {
+  enumerable: true,
+  get: function get() {
+    return _pc.PcBridgeInit;
+  }
+});
+
 var _mobile = require("./mobile");
+
 var _pc = require("./pc");

package/libs/lib/bridge/mobile.js

@@ -1,28 +1,44 @@
 "use strict";
 
-var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
+
 exports.mobileBridgeInit = exports.mobileBridge = void 0;
-var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/set-timeout"));
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/promise"));
-var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/assign"));
+
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/json/stringify"));
+
 var _parseInt2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/parse-int"));
+
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/assign"));
+
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/promise"));
+
+var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/set-timeout"));
+
 var _event = _interopRequireDefault(require("../helper/event"));
+
 var _codeMap = require("../helper/codeMap");
+
 var _utils = require("../../utils");
+
 function setupWebViewJavascriptBridge(callback) {
   if (window.WebViewJavascriptBridge) {
     return callback(WebViewJavascriptBridge);
   }
+
   if (window.WKWebViewJavascriptBridge) {
     return callback(WKWebViewJavascriptBridge);
   }
+
   if (window.WVJBCallbacks) {
     return window.WVJBCallbacks.push(callback);
   }
+
   window.WVJBCallbacks = [callback];
   var WVJBIframe = document.createElement('iframe');
   WVJBIframe.style.display = 'none';
@@ -32,6 +48,7 @@ function setupWebViewJavascriptBridge(callback) {
     document.documentElement.removeChild(WVJBIframe);
   }, 0);
 }
+
 var mobileBridgeInit = function mobileBridgeInit() {
   return new _promise["default"](function (resolve, reject) {
     setupWebViewJavascriptBridge(function (bridge) {
@@ -40,6 +57,7 @@ var mobileBridgeInit = function mobileBridgeInit() {
         (0, _utils.log)("resume\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
+
         _event["default"].execEvent('resume', resData);
       });
       (0, _utils.log)("\u6CE8\u518CunreadMsgAction\u4E8B\u4EF6 ");
@@ -47,6 +65,7 @@ var mobileBridgeInit = function mobileBridgeInit() {
         (0, _utils.log)("unreadMsgAction\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
+
         _event["default"].execEvent('unreadMsgAction', resData);
       });
       (0, _utils.log)("\u6CE8\u518CwebViewMsgReceive\u4E8B\u4EF6 ");
@@ -54,31 +73,37 @@ var mobileBridgeInit = function mobileBridgeInit() {
         (0, _utils.log)("webViewMsgReceive\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
+
         _event["default"].execEvent('webViewMsgReceive', resData);
       });
       bridge.registerHandler('pushWorkMsg', function (resData) {
         (0, _utils.log)("pushWorkMsg\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
+
         _event["default"].execEvent('pushWorkMsg', resData);
       });
       bridge.registerHandler('getTogetherCallback', function (resData) {
         (0, _utils.log)("getTogetherCallback\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
+
         _event["default"].execEvent('getTogetherCallback', resData);
       });
       bridge.registerHandler('sendMsgCommon', function (resData) {
         (0, _utils.log)("sendMsgCommon ", {
           resData: resData
         });
+
         _event["default"].execEvent('sendMsgCommon', resData);
       });
       resolve();
     });
   });
 };
+
 exports.mobileBridgeInit = mobileBridgeInit;
+
 var mobileBridge = function mobileBridge(method, param) {
   return new _promise["default"](function (resolve, reject) {
     var p = (0, _assign["default"])({}, param);
@@ -87,6 +112,7 @@ var mobileBridge = function mobileBridge(method, param) {
         bridge.registerHandler(method, function (data) {
           var onSuccess = param.onSuccess;
           delete p.onSuccess;
+
           if ('function' === typeof onSuccess) {
             onSuccess(data);
             resolve({
@@ -96,32 +122,15 @@ var mobileBridge = function mobileBridge(method, param) {
           }
         });
       }
+
       bridge.callHandler(method, param, function (e) {
         var code = e.code,
-          message = e.message,
-          data = e.data;
+            message = e.message,
+            data = e.data;
+
         var _code = (0, _parseInt2["default"])(code);
-        var callbackStr = (0, _codeMap.electronResCodeMap)(_code);
-        if (_code === -2 || _code === 7) {
-          (0, _utils.bpitLog)({
-            method: method,
-            errorcode: _code,
-            message: message || 'SDK执行失败回调，相关参数'
-          });
-          (0, _utils.log)("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
-            method: method,
-            param: param,
-            data: data,
-            _code: _code,
-            message: message
-          });
-          reject({
-            _code: _code,
-            message: message
-          });
-          // return;
-        }
 
+        var callbackStr = (0, _codeMap.electronResCodeMap)(_code);
         var callbackFun = p[callbackStr];
         (0, _utils.log)("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           method: method,
@@ -130,17 +139,71 @@ var mobileBridge = function mobileBridge(method, param) {
           _code: _code,
           message: message,
           callbackFun: callbackFun
-        });
+        }); // 请求失败
+
+        if (callbackStr === 'onFail') {
+          (0, _utils.bpitLog)({
+            method: method,
+            errorcode: _code,
+            message: message || (0, _stringify["default"])(data) || 'SDK执行失败回调，相关参数'
+          });
+
+          if ('function' === typeof callbackFun) {
+            message ? callbackFun({
+              code: code,
+              message: message
+            }) : callbackFun(data);
+          }
+
+          reject({
+            _code: _code,
+            message: message,
+            data: data
+          });
+          return;
+        } // 请求成功
+
+
         if ('function' === typeof callbackFun) {
           callbackFun(data || message);
         }
+
         resolve({
           _code: _code,
           message: message,
           data: data
-        });
+        }); // if (_code === -2 || _code === 7) {
+        //   bpitLog({
+        //     method,
+        //     errorcode: _code,
+        //     message: message || 'SDK执行失败回调，相关参数',
+        //   });
+        //   log(`SDK执行后回调，相关参数 `, {
+        //     method,
+        //     param,
+        //     data,
+        //     _code,
+        //     message,
+        //   });
+        //   reject({_code, message});
+        //   // return;
+        // }
+        // const callbackFun = p[callbackStr];
+        // log(`SDK执行后回调，相关参数 `, {
+        //   method,
+        //   param,
+        //   data,
+        //   _code,
+        //   message,
+        //   callbackFun,
+        // });
+        // if ('function' === typeof callbackFun) {
+        //   callbackFun(data || message);
+        // }
+        // resolve({_code, message, data});
       });
     });
   });
 };
+
 exports.mobileBridge = mobileBridge;

package/libs/lib/bridge/pc.js

@@ -1,35 +1,45 @@
 "use strict";
 
-var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pcBridge = exports.PcBridgeInit = void 0;
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/promise"));
+
+exports.PcBridgeInit = exports.pcBridge = void 0;
+
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/assign"));
+
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/json/stringify"));
+
 var _parseInt2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/parse-int"));
+
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/promise"));
+
 var _pcIframe = _interopRequireDefault(require("../helper/pcIframe"));
+
 var _codeMap = require("../helper/codeMap");
+
 var _utils = require("../../utils");
+
 var PcBridgeInit = function PcBridgeInit() {
   _pcIframe["default"].init();
 };
+
 exports.PcBridgeInit = PcBridgeInit;
+
 var pcBridge = function pcBridge(method, param) {
-  return new _promise["default"](function (resolve) {
+  return new _promise["default"](function (resolve, reject) {
     return _pcIframe["default"].invokeAPI(method, param, function (_ref) {
       var data = _ref.data,
-        code = _ref.code,
-        message = _ref.message;
+          code = _ref.code,
+          message = _ref.message;
+
       var _code = (0, _parseInt2["default"])(code);
+
       var callbackStr = (0, _codeMap.electronResCodeMap)(_code);
-      if (_code === -2) {
-        (0, _utils.bpitLog)({
-          method: method,
-          errorcode: _code,
-          message: message || 'SDK执行失败回调，相关参数'
-        });
-      }
       var callbackFun = param[callbackStr];
       (0, _utils.log)("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
         method: method,
@@ -38,16 +48,67 @@ var pcBridge = function pcBridge(method, param) {
         _code: _code,
         message: message,
         callbackFun: callbackFun
-      });
+      }); // 请求失败
+
+      if (callbackStr === 'onFail') {
+        (0, _utils.bpitLog)({
+          method: method,
+          errorcode: _code,
+          message: message || (0, _stringify["default"])(data) || 'SDK执行失败回调，相关参数'
+        });
+
+        if ('function' === typeof callbackFun) {
+          console.log('wenai-code', code, _code);
+          var callbackData = Object.prototype.toString.call(data) === "[object Object]" ? (0, _assign["default"])((0, _assign["default"])({}, data), {
+            code: code,
+            message: message
+          }) : {
+            data: data,
+            code: code,
+            message: message
+          };
+          message ? callbackFun(callbackData) : callbackFun(data);
+        }
+
+        reject({
+          _code: _code,
+          message: message,
+          data: data
+        });
+        return;
+      } // 请求成功
+
+
       if ('function' === typeof callbackFun) {
         callbackFun(data || message);
       }
+
       resolve({
         _code: _code,
         message: message,
         data: data
-      });
+      }); //  if (_code === -2) {
+      //   bpitLog({
+      //     method,
+      //     errorcode: _code,
+      //     message: message || 'SDK执行失败回调，相关参数',
+      //   });
+      // }
+      // const callbackFun = param[callbackStr];
+      // log(`SDK执行后回调，相关参数 `, {
+      //   method,
+      //   param,
+      //   data,
+      //   _code,
+      //   message,
+      //   callbackFun
+      // });
+      // if ('function' === typeof callbackFun) {
+      //   callbackFun(data || message);
+      // }
+      // resolve({ _code, message, data });
     });
   });
 };
+
 exports.pcBridge = pcBridge;

package/libs/lib/helper/apiHelper.js

@@ -1,15 +1,21 @@
 "use strict";
 
-var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
+
 exports.genDefaultParamsDealFn = genDefaultParamsDealFn;
+
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/assign"));
+
 function genDefaultParamsDealFn(p) {
   return function (r) {
     return (0, _assign["default"])((0, _assign["default"])({}, p), r);
   };
 }
+
 ;

package/libs/lib/helper/codeMap.js

@@ -1,13 +1,19 @@
 "use strict";
 
-var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
+
 exports.electronResCodeMap = electronResCodeMap;
+
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/map"));
+
 var resCodeMap = new _map["default"]([[0, 'onSuccess'], [-1, 'onCancel'], [-2, 'onFail'], [-3, 'onProgress'], [-4, 'onSubmit']]);
+
 function electronResCodeMap(code) {
   return resCodeMap.get(code) || 'onFail';
 }

package/libs/lib/helper/event.js

@@ -1,39 +1,56 @@
 "use strict";
 
-var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
+
 exports["default"] = void 0;
-var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/array/is-array"));
-var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/index-of"));
-var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/splice"));
+
 var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/for-each"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
+
+var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/splice"));
+
+var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/index-of"));
+
+var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/array/is-array"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
-var Event = /*#__PURE__*/(0, _createClass2["default"])(function Event() {
+
+var Event = function Event() {
   var _this = this;
+
   (0, _classCallCheck2["default"])(this, Event);
+
   this.on = function (event, fn) {
     if (!event || 'function' !== typeof fn) throw 'eventName is null or handle is not a function, on fail';
     if (!(0, _isArray["default"])(_this.eventsHandle[event])) _this.eventsHandle[event] = [];
+
     _this.eventsHandle[event].push(fn);
   };
+
   this.off = function (event, fn) {
     if (!event) throw 'eventName is null, invoke off fail';
+
     if (!fn) {
       _this.eventsHandle[event] = [];
       return;
     }
+
     if ((0, _isArray["default"])(_this.eventsHandle[event])) {
       var _context, _context2;
+
       var n = (0, _indexOf["default"])(_context = _this.eventsHandle[event]).call(_context, fn);
       -1 !== n && (0, _splice["default"])(_context2 = _this.eventsHandle[event]).call(_context2, n, 1);
     }
   };
+
   this.execEvent = function (event, data) {
     var _context3;
+
     (0, _isArray["default"])(this.eventsHandle[event]) && (0, _forEach["default"])(_context3 = this.eventsHandle[event]).call(_context3, function (fn) {
       try {
         fn(data);
@@ -42,8 +59,10 @@ var Event = /*#__PURE__*/(0, _createClass2["default"])(function Event() {
       }
     });
   };
+
   this.eventsHandle = {};
-});
+};
+
 var event = new Event();
 var _default = event;
 exports["default"] = _default;