|
@@ -73,7 +73,7 @@ Meeting.prototype = {
|
|
|
initSocket(userCode, callback) {
|
|
|
const self = this;
|
|
|
//初始websocket实例,保存在window中方便调用。一个浏览器tab页面只能初始化一次。所有的控件窗口,通过该websocket实例去生成不同的窗口实例,不同的控件窗口通过自己的窗口实例去调用初始化、关闭、隐藏等
|
|
|
- window.theSocket= this.theSocket = new InitWebSocketClass(
|
|
|
+ window.theSocket = this.theSocket = new InitWebSocketClass(
|
|
|
userCode,
|
|
|
localStorage.getItem("token"), {
|
|
|
//客户端登陆成功通知;
|
|
@@ -93,7 +93,7 @@ Meeting.prototype = {
|
|
|
data.method === "createVideoDialogReuslt" &&
|
|
|
data.params.result === 0
|
|
|
) {
|
|
|
- if (data.params.handleName === "#"+this.targetid) {
|
|
|
+ if (data.params.handleName === "#" + this.targetid) {
|
|
|
//客户端窗口创建好后,界面显示窗口;
|
|
|
callback && callback()
|
|
|
self[self.targetid].resize();
|
|
@@ -157,7 +157,7 @@ Meeting.prototype = {
|
|
|
};
|
|
|
//左边窗口实例
|
|
|
window[this.targetid] = this[this.targetid] = new VideoPlay(
|
|
|
- "#"+this.targetid,
|
|
|
+ "#" + this.targetid,
|
|
|
window.theSocket.websocket, //一个浏览器tab页面公用一个
|
|
|
window.theSocket.socketCode, //一个浏览器tab页面公用一个
|
|
|
typeObj
|
|
@@ -207,10 +207,10 @@ Meeting.prototype = {
|
|
|
// },
|
|
|
//设备视频拉流
|
|
|
pullFlow(chinnelId) {
|
|
|
-
|
|
|
+
|
|
|
if (chinnelId) {
|
|
|
this[this.targetid].showBrower(true);
|
|
|
- this[this.targetid].dragResize(0,0,0,0);
|
|
|
+ this[this.targetid].dragResize(0, 0, 0, 0);
|
|
|
window[this.targetid] && window[this.targetid].realTimeVideo && window[this.targetid].realTimeVideo([{
|
|
|
"channelId": chinnelId
|
|
|
}]);
|
|
@@ -327,15 +327,15 @@ Meeting.prototype = {
|
|
|
} catch (E) {}
|
|
|
},
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
deleteAllMeeting(callback) {
|
|
|
let _this = this;
|
|
|
let s = "?";
|
|
|
- var index =0;
|
|
|
- var doindex=0;
|
|
|
+ var index = 0;
|
|
|
+ var doindex = 0;
|
|
|
let searchParams = {
|
|
|
"userDomain": "",
|
|
|
"userId": _this.localUserInfo.userId,
|
|
@@ -382,24 +382,24 @@ Meeting.prototype = {
|
|
|
success: function(res) {
|
|
|
//obj
|
|
|
doindex++;
|
|
|
- if(doindex == index){
|
|
|
+ if (doindex == index) {
|
|
|
callback();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
error: function(data) {
|
|
|
//obj
|
|
|
doindex++;
|
|
|
- if(doindex == index){
|
|
|
+ if (doindex == index) {
|
|
|
callback();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
});
|
|
|
|
|
|
}
|
|
|
});
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
callback();
|
|
|
}
|
|
|
_this._debug("查询所有该用户参与的会商success", allRelateMeeting);
|
|
@@ -556,6 +556,16 @@ Meeting.prototype = {
|
|
|
// this.theSocket.closeAllVideo && this.theSocket.closeAllVideo();
|
|
|
this[this.targetid].closeAllVideo();
|
|
|
this[this.targetid].showBrower(false);
|
|
|
+ setTimeout(() => {
|
|
|
+ this[this.targetid].showBrower(false);
|
|
|
+ }, 100);
|
|
|
+ setTimeout(() => {
|
|
|
+ this[this.targetid].showBrower(false);
|
|
|
+ }, 100);
|
|
|
+ setTimeout(() => {
|
|
|
+ this[this.targetid].showBrower(false);
|
|
|
+ }, 100);
|
|
|
+
|
|
|
} catch (E) {}
|
|
|
},
|
|
|
/* 获取群聊fromName */
|
|
@@ -616,12 +626,12 @@ Meeting.prototype = {
|
|
|
// let container = _this.$el.querySelector("#meetResBack textarea");
|
|
|
// container.scrollTop = container.scrollHeight;
|
|
|
},
|
|
|
- settargetId(id){
|
|
|
+ settargetId(id) {
|
|
|
let _this = this;
|
|
|
- if(id!=""){
|
|
|
+ if (id != "") {
|
|
|
_this.targetid = id;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
_this.initWnd();
|
|
|
|
|
|
}
|