ucservice 1.8.0 → 1.8.2

package/src/common-request.js

@@ -1,162 +0,0 @@
-let cometd = require('./lib/cometd.js');
-import { server, cometd_server } from '@/config';
-let Video = require('./scooper.video');
-let $ = require('jquery');
-/**
- * 接口请求通用方法
- * @param {*} url 
- * @param {*} param 
- * @param {*} backSuccfn 
- * @param {*} async 
- * @param {*} method 
- */
-export const loadJson = function(url, param, backSuccfn, async, method, headers) {
-  method = (method? method:'POST');
-  async = ((async == undefined || async == '')? true:async);
-  for(let key in param){ //检测手机号码， 外地号码头部（非杭州）加00，本地号码加0
-    if(/_phone01$/.test(key)){
-      let tel = key.replace(/_phone01$/, "");
-      if(param[key] == 0){ //外地号码
-        param[tel] = "00" + param[tel];
-      }else{
-        param[tel] = "0" + param[tel];
-      }
-      delete param[key];
-    }
-  }
-  let ajaxContent = {
-    'type': method,
-    'url':  url,
-    'data': param,
-    'async' : async
-  }
-  if(headers) Object.assign(ajaxContent, headers);
-  $.ajax(ajaxContent).fail(function(jqXHR,sts){
-      console.error('加载数据失败：' + sts + ", " + url);
-  }).done(function(ret){
-      if (!ret || ret.code != 0) {
-          console.error('加载数据失败：' + JSON.stringify(ret) + ", " + url);
-      }
-      if (backSuccfn) backSuccfn(ret);
-  });
-}
-
-/**
- * @param {*} sip  //用户传过来的服务ip地址 http://{ip}:{port}
- * @param {*} meetcallfunc  会议通知处理
- * @param {*} callfunc   呼叫通知处理
- * @param {*} videocallfunc 视频通知处理
- * @param {*} connectcallfunc 通讯录通知处理
- */
-export const initCometd = function(meetcallfunc, callfunc, videocallfunc, connectcallfunc, sip){ //初始
-  let server_ = sip || server;
-  let _cometd = new cometd.CometD("xjInfoReport");
-  _cometd.websocketEnabled = true;
-  let cometdUrl = server_ + cometd_server;
-  _cometd.init({
-      url: cometdUrl,
-      logLevel: "info"
-  });
-
-  _cometd.addListener("/meta/handshake", function(message) {
-      if (message.successful) {
-          console.log("handshake success.");
-      }
-  });
-
-  let _connected = false;
-  _cometd.addListener('/meta/connect', function(message) {
-      if (message.successful) {
-          if (!_connected) {
-            doSubscribe(_cometd, {meetcallfunc, callfunc, videocallfunc, connectcallfunc});
-          }
-          _connected = true;
-      } else {
-          _connected = false;
-          console.log("连接cometd后台失败");
-      }
-  });
-}
-
-function doSubscribe(_cometd, callback) {
-
-  /**
-   * 会场模块消息通知
-   */
-  if(callback.meetcallfunc){
-    _cometd.subscribe("/dispatch-web/notify/meet/#", null, function(message) {
-      callback.meetcallfunc(message);
-    });
-  }
-
-  /**
-   * 呼叫模块消息通知
-   */
-  if(callback.callfunc){
-    _cometd.subscribe("/dispatch-web/notify/call/#", null, function(message) {
-      callback.callfunc(message);
-    });
-  }
-
-  /**
-   * 视频通话状态消息通知(视频通话建立 和 中断)
-   */
-  if(callback.videocallfunc){
-    _cometd.subscribe("/server/#", null, function(message) {
-      callback.videocallfunc(message);
-    });
-  }
-
-  //'#'：多级通配，订阅所有的主题
-  if(callback.connectcallfunc){
-    _cometd.subscribe("/scooper_core/#", null, function(message) {
-      callback.connectcallfunc(message);
-    });
-  }
-}
-
-/**
- * 初始化视频获取视频对象
- * @param {*} sip  //用户传过来的服务ip地址 http://{ip}:{port}
- * @param {*} token 
- * @param {*} videoArea //展示视频的容器模块
- * 使用该方法前提是videoArea等相关dom节点必须已加载完毕
- */
-export const initVideo = function(token, videoArea, videoOpts_, sip){ //读取视频服务配置初始化视频
-  let server_ = sip || server;
-  return new Promise((resolve, reject) =>{
-    let url = server_ + '/scooper-video/conf/data';
-    let param = {};
-    $.getJSON(url,param,function (conf) {
-      // 初始化视频播放方式
-      // initplaVideoType();
-      let janusUrl = conf['video.janus.url'];
-      let videoOpts = {
-          //初始化时的界面显示的分屏树
-          windows: 4,
-          //共有哪几种分屏
-          windowsArr: [1, 2, 4, 9, 16],
-          //总的窗口数
-          windowsNum: 16,
-          conf: {
-              user: conf['video.username'],
-              passwd: conf['video.password'],
-              ip: conf['video.ip'],
-              port: conf['video.port'],
-              janusUrl: conf['video.janus.url'],
-              token: token
-          },
-          extra: false,
-          streamType: conf['video.stream'],
-          openChangeWindowStrategy: conf['video.openChangeWindowStrategy'] === 'true',
-          capImage: conf['video.cap.image'] === 'true',
-          videoCapImagePath: conf['video.cap.image.path'],
-          videoInfoInBottom: false
-      };
-      if(videoOpts_) Object.assign(videoOpts, videoOpts_);
-      conf['video.poll.time'] && (videoOpts.pollInterval = conf['video.poll.time']);
-      let videoController = new Video($(videoArea), videoOpts);
-      resolve(videoController);
-    })
-  })
-}

package/src/config.js

@@ -1,15 +0,0 @@
-import account from '@/net_url/account_net_url';   //账号
-import aduio from '@/net_url/aduio_net_url';  //音频
-import aduio_video from '@/net_url/aduio_video_net_url'; //音频、视频公共接口
-import dept_ry from '@/net_url/dept_ry_url'; //部门成员
-import dept from '@/net_url/dept_url'; //部门
-import location from '@/net_url/location_url';  //定位
-import meet from '@/net_url/meet_url';  //会议
-import message from '@/net_url/message_url';  //短信
-import record from '@/net_url/record_url';  //录音录像
-import video from '@/net_url/video_net_url';  //视频
-
-export const server = 'http://10.249.4.152:8080';   //内网服务地址
-export const cometd_server = '/scooper-msg-queue/cometd'; //
-
-export { account, aduio, aduio_video, dept_ry, dept, location, meet, message, record, video}

package/src/css/scooper.video.css

@@ -1,343 +0,0 @@
-@charset "UTF-8";
-.video-main{
-	position: absolute;
-	top: 0px;
-	left: -25px;
-	right: -12px;
-	bottom: -18px;
-}
-.video-main-full{
-	position: absolute;
-	top: 1px;
-	left: 1px;
-	right: 1px;
-	bottom: 1px;
-	/*border:1px solid #999;*/
-}
-.video-main>li, .video-main-full>li{
-	border: 1px solid #aaa;
-	float: left;
-	position: relative;
-}
-.video-main>li.loading, .video-main-full>li.loading{
-	background: #000;
-}
-.video-main>li:hover, .video-main-full>li:hover{
-	border: 1px solid #ffb951;
-}
-.video-main>li.sel, .video-main-full>li.sel{
-	border: 1px solid #ef8601;
-}
-.video-main.mode-1>li, .video-main-full.mode-1>li{
-	width: 98.5%;
-    height: 98.5%;
-	list-style: none;
-}
-.video-main.mode-1>li .info, .video-main-full.mode-1>li .info{
-    font-size:20px;
-    bottom: 40px;
-}
-.video-main > li .info-self{
-	position: absolute;
-	left: 2.5rem;
-	top: 1rem;
-	font-size: 1rem;
-	z-index: 9;
-}
-.video-main.mode-4>li{
-	width: 49%;
-    height: 49%;
-	list-style: none;
-}
-.video-main.mode-4>li .info{
-    font-size:18px;
-    bottom: 20px;
-}
-.video-main.mode-6>li{
-	width: 33.33%;
-    height: 33.33%;
-}
-.video-main.mode-6>li .info{
-    font-size:14px;
-    bottom: 13px;
-}
-.video-main.mode-6 .screen-1{
-	width: 66.66%;
-    height: 66.65%;
-}
-.video-main.mode-6 .screen-1 .info{
-	font-size:18px;
-	bottom: 30px;
-}
-.video-main.mode-9>li{
-	width: 32.5%;
-	height: 32.5%;
-	list-style: none;
-}
-.video-main.mode-9>li .info{
-	font-size:12px;
-	bottom: 14px;
-}
-.video-main.mode-16>li{
-	width: 24.5%;
-    height: 24.5%;
-	list-style: none;
-}
-.video-main.mode-16>li .info{
-	font-size:8px;
-	bottom: 10px;
-}
-.video-box{
-	object-fit: fill;
-	display:none;
-	width: 100%;
-    height: 100%;
-}
-.video-main .video-box.scale-scene{
-	width: 100%!important;
-	height: 100%!important;
-	object-fit: fill!important;
-}
-.video-main.mode-4 .close-btn {
-	width: 1.1rem;
-	height: 1.1rem;
-}
-.video-main.mode-9 .close-btn {
-	width: 0.95rem;
-	height: 0.95rem;
-}
-.video-main.mode-16 .close-btn {
-	width: 0.85rem;
-	height: 0.85rem;
-}
-.video-main.mode-4 .recv-audio-btn {
-	bottom: -4px;
-	right: 1.8rem;
-	width: 2.5rem;
-	height: 2.5rem;
-}
-.video-main.mode-9 .recv-audio-btn {
-	bottom: -3px;
-	right: 1.6rem;
-	width: 2.2rem;
-	height: 2.2rem;
-}
-.video-main.mode-16 .recv-audio-btn {
-	bottom: -2px;
-	right: 1.4rem;
-	width: 2rem;
-	height: 2rem;
-}
-.video-main.mode-4 .unrecv-audio-btn {
-	bottom: -4px;
-	right: 1.8rem;
-	width: 2.5rem;
-	height: 2.5rem;
-}
-.video-main.mode-9 .unrecv-audio-btn {
-	bottom: -3px;
-	right: 1.6rem;
-	width: 2.2rem;
-	height: 2.2rem;
-}
-.video-main.mode-16 .unrecv-audio-btn {
-	bottom: -2px;
-	right: 1.4rem;
-	width: 2rem;
-	height: 2rem;
-}
-.video-main.mode-4 .rotate-btn {
-	bottom: 3px;
-	right: 4.8rem;
-	width: 1.5rem;
-	height: 1.5rem;
-}
-.video-main.mode-9 .rotate-btn {
-	bottom: 3px;
-	right: 4.2rem;
-	width: 1.42rem;
-	height: 1.42rem;
-}
-.video-main.mode-16 .rotate-btn {
-	bottom: 3px;
-	right: 3.7rem;
-	width: 1.3rem;
-	height: 1.3rem;
-}
-
-.video-main.mode-4 .scale-btn {
-	bottom: 7px;
-	right: 7.5rem;
-	width: 1rem;
-	height: 1rem;
-}
-.video-main.mode-9 .scale-btn {
-	bottom: 6px;
-	right: 7rem;
-	width: 0.9rem;
-	height: 0.9rem;
-}
-.video-main.mode-16 .scale-btn {
-	bottom: 7px;
-	right: 6rem;
-	width: 0.8rem;
-	height: 0.8rem;
-}
-.video-main.mode-9 .stream-loading {
-	width: 11.4rem;	
-	height: 2.1rem;
-	line-height: 2.1rem;
-	font-size: 15px;
-	background-size: 15px;
-}
-.video-main.mode-16 .stream-loading {
-	width: 9.3rem;	
-	height: 2.1rem;
-	line-height: 2.1rem;
-	font-size: 14px;
-	background-size: 14px;
-	margin-left: 5.7rem;
-}
-.video-main.mode-16 .real-result, .video-main.mode-16 .result {
-	font-size: 12px;
-}
-.stream-loading{
-	width: 14rem;	
-	height: 2.1rem;
-    line-height: 2.1rem;
-    position: absolute;
-	top: 50%;
-	left: 50%;
-	margin-top: -1rem;	
-    margin-left: -7.1rem;
-    color: #fff;
-	font-size: 1.14rem;
-	padding-left: 2.1rem;	
-    /* background: transparent url("~@/img/loading.gif") no-repeat 10px center; */
-}
-.info{
-    position: absolute;
-    float: left;
-    color: #fff;
-    left: 10px;
-    width: 67%;
-/*  bottom: 10px;
-    width: 320px;
-    height: 30px;
-    text-align: center; */
-    z-index:1;
-}
-
-.operate-btn{
-    position: absolute;
-    width: 1.5rem;
-    height: 1.5rem;
-    float: left;
-    right: 1px;
-    bottom: 2px;
-    z-index:1;
-    cursor: pointer;
-}
-
-.send-audio-btn {
-	position: absolute;
-	bottom: -8px;
-	right: 70px;
-	border: 0;
-	width: 3rem;
-    height: 3rem;
-    float: left;
-	/* background:url("~@/img/yy.png"); */
-	background-size: 100% 100%;
-	background-color: rgba(0,0,0,0);
-}
-
-.unsend-audio-btn {
-	position: absolute;
-	bottom: -8px;
-	right: 70px;
-	border: 0;
-	width: 3rem;
-    height: 3rem;
-    float: left;
-	/* background-image: url("~@/img/yy_gb.png"); */
-    background-size: 100% 100%;
-    background-color: rgba(0,0,0,0);
-}
-.rotate-btn {
-	position: absolute;
-	bottom: 1px;
-	right: 6.07rem;
-	border: 0;
-	width: 1.75rem;
-	height: 1.75rem;
-	float: left;
-/* background-image: url("~@/img/yy_gb.png"); */
-	background-size: 100% 100%;
-	background-color: rgba(0,0,0,0);
-}
-.rotate-btn.bggray, .scale-btn.bggray{
-	filter: contrast(0.5);
-}
-.scale-btn {
-	position: absolute;
-	bottom: 5px;
-	right: 9.5rem;
-	border: 0;
-	width: 1.25rem;
-	height: 1.25rem;
-	float: left;
-/* background-image: url("~@/img/yy_gb.png"); */
-	background-size: 100% 100%;
-	background-color: rgba(0,0,0,0);
-}
-.recv-audio-btn {
-	position: absolute;
-	bottom: -8px;
-	right: 30px;
-	border: 0;
-	width: 3rem;
-    height: 3rem;
-    float: left;
-	/* background:url("~@/img/hm_shengyin_sel.png"); */
-	background-size: 100% 100%;
-	background-color: rgba(0,0,0,0);
-}
-
-.unrecv-audio-btn {
-	position: absolute;
-	bottom: -8px;
-	right: 30px;
-	border: 0;
-	width: 3rem;
-    height: 3rem;
-    float: left;
-	/* background-image: url("~@/img/hm_jingyin_sel.png"); */
-    background-size: 100% 100%;
-    background-color: rgba(0,0,0,0);
-}
-
-.close-btn {
-	position: absolute;
-	bottom: 5px;
-	right: 5px;
-	border: 0;
-	width: 1.25rem;
-    height: 1.25rem;
-    float: left;
-	/* background-image: url("~@/img/close.png"); */
-    background-size: 100% 100%;
-    background-color: rgba(0,0,0,0);
-}
-.operation {
-	position: absolute;
-	width: 100%;
-	height: 12%;
-	bottom: 0;
-	background: rgba(0,0,0,0.3);
-	color: #fff;
-}
-
-.hide {
-  	display: none;
-}