cnhis-design-vue 2.1.34 → 2.1.36

package/es/utils/UniRTCv2.js

@@ -7,14 +7,14 @@ var _socket2 = _interopRequireDefault(require("socket.io-client"));
 
 var _chatFetch = _interopRequireWildcard(require("./chatFetch"));
 
+var _vexutils = _interopRequireDefault(require("../utils/vexutils"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 function UniRTCObject(appId, tokenProvider, vueSelf) {
   if (appId == null || appId == '') {
     console.error('参数appId必填');
@@ -142,6 +142,8 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
       msg.deviceArray.push(obj);
     }
 
+    console.log('设备参数', msg);
+
     _socket.emit('onlineStatusQuery', JSON.stringify(msg));
 
     console.log('检查设备状态[' + JSON.stringify(msg) + ']');
@@ -193,13 +195,11 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 
 
   this.onCallAccepted = function (outing) {
-    console.log('呼出被接callback', outing);
-
-    var videoData = _extends({}, outing.guestConfig.videoData, {
-      inviteResult: 1
-    });
-
-    this.vueSelf.subscribeAcceptedJST(videoData);
+    console.log('呼出被接callback', outing); // let videoData = {
+    // 	...outing.guestConfig.videoData,
+    // 	inviteResult: 1
+    // }
+    // this.vueSelf.subscribeAcceptedJST(videoData)
   }; // 呼出被拒callback
 
 
@@ -215,11 +215,42 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
 
   this.onStatusChecked = function (stat) {
     console.log('设备状态检查', stat);
+    var index = stat.findIndex(function (item) {
+      return item.status == '0';
+    });
+    var outtings = [];
+    outtings.push.apply(outtings, stat);
+    var targetInfo = _this.vueSelf.targetInfo;
+
+    if (index != -1) {
+      if (_this.vueSelf.callTimer) {
+        clearInterval(_this.vueSelf.callTimer);
+
+        _this.vueSelf.setCallTimer(null);
+      }
 
-    if (stat[0].status == '0') {
       _this.vueSelf.setCallerStatus('在线');
+
+      _this.startCall(stat[index].deviceToken, '腾讯视频', 'tencent', {
+        sdkAppId: Number(_this.vueSelf.sdkInfo.sdkAppId),
+        userId: _this.vueSelf.isServer ? _this.vueSelf.serviceId : _this.vueSelf.clientId,
+        userSig: _this.vueSelf.videoData.token,
+        roomId: Number(_this.vueSelf.roomId),
+        videoData: _this.vueSelf.videoData
+      }, {
+        sdkAppId: Number(_this.vueSelf.sdkInfo.sdkAppId),
+        userId: targetInfo.username,
+        userSig: targetInfo.token,
+        roomId: Number(_this.vueSelf.videoData.roomId),
+        videoData: _this.vueSelf.videoData // privateMapKey
+
+      });
+
+      _this.vueSelf.setOuting(outtings);
     } else {
       _this.vueSelf.setCallerStatus('离线');
+
+      _this.vueSelf.sendVideoCall();
     }
   }; // 会议挂断callback
 
@@ -358,10 +389,12 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
     } else {
       console.error('设备登录失败[' + msg + ']'); // alert('设备登录失败\n' + msg);
     }
-  } // 对方拒绝接听回调
+  }
+
+  var customerConfirmDebounce = _vexutils.default.debounce(customerConfirm, 2000); // 对方接听/拒绝接听回调
 
 
-  function customerRefuse(vuePage) {
+  function customerConfirm(vuePage, accept) {
     var curScrollParam = vuePage.getRefuseParam();
     var videoData = vuePage.videoData;
     var params = {
@@ -370,7 +403,7 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
       userId: curScrollParam.userId,
       sessionId: videoData.sessionId,
       recordId: videoData.recordId,
-      inviteResult: 0,
+      inviteResult: accept ? 1 : 0,
       isExpire: ''
     };
 
@@ -378,7 +411,7 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
       var data = _ref.data;
 
       if (data.result === 'SUCCESS') {
-        vuePage.$message.info('对方拒绝接听');
+        vuePage.$message.info(accept ? '接入成功' : '对方拒绝接听');
       }
     });
   } // 呼出反馈handler
@@ -390,6 +423,8 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
     var target, outing; // 如果对方接听，就向对方发送视频配置
 
     if (data.code == '0') {
+      // 接听调用接口
+      customerConfirmDebounce(_this.vueSelf, true);
       target = data.deviceToken;
       outing = _outing.get(target);
 
@@ -414,7 +449,7 @@ function UniRTCObject(appId, tokenProvider, vueSelf) {
       console.error(msg); // alert(data.msg);
     } else if (data.code === '3001') {
       console.log('错误号：' + data.code + '====>错误编码:' + data.msg);
-      customerRefuse(_this.vueSelf);
+      customerConfirmDebounce(_this.vueSelf, false);
       target = data.deviceToken;
       outing = _outing.get(target);
 

package/es/verification-code/index.js

@@ -801,7 +801,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"54b2b90d-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/verification-code.vue?vue&type=template&id=39c11d42&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"832f7c18-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/verification-code.vue?vue&type=template&id=39c11d42&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"verification-code-container"},[_c('a-input',_vm._g(_vm._b({on:{"change":_vm.verifyCodeChange},model:{value:(_vm.verifyCode),callback:function ($$v) {_vm.verifyCode=$$v},expression:"verifyCode"}},'a-input',_vm.$attrs,false),_vm.$listeners),[_c('template',{slot:"addonAfter"},[_c('span',{staticClass:"captcha-wrap"},[_c('span',{class:['get-code', { disabled: _vm.count }],on:{"click":_vm.sendVerify}},[_vm._v(" "+_vm._s(_vm.getText)+" ")])])])],2)],1)}
 var staticRenderFns = []
 
@@ -967,7 +967,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var verification_code = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"54b2b90d-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/SlideVerify.vue?vue&type=template&id=738bb298&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"832f7c18-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/verification-code/SlideVerify.vue?vue&type=template&id=738bb298&scoped=true&
 var SlideVerifyvue_type_template_id_738bb298_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"slide"},[(_vm.title)?_c('div',{staticClass:"verify-title"},[_c('span',[_vm._v(_vm._s(_vm.title))]),_c('div',{staticClass:"right-icon",on:{"click":_vm.cancelVerify}},[_c('a-icon',{attrs:{"type":"close"}})],1)]):_vm._e(),_c('div',{staticClass:"verify-div"},[_c('div',{staticClass:"verify-container"},[_c('div',{staticClass:"slide-verify"},[_c('div',{staticClass:"bg-wrap"},[_c('img',{staticClass:"bg-img",style:(_vm.resourceStyle),attrs:{"src":_vm.resource.resourceImg,"alt":""}})]),_c('a-icon',{staticClass:"slide-verify-refresh-icon",attrs:{"type":"redo"},on:{"click":_vm.refresh}}),_c('img',{ref:"block",staticClass:"slide-verify-block",style:(_vm.puzzleStyle),attrs:{"src":_vm.resource.puzzleImg,"draggable":"false"},on:{"mousedown":_vm.sliderDown}}),_c('div',{staticClass:"slide-verify-slider",class:{
             'container-active': _vm.containerActive,
             'container-success': _vm.containerSuccess,