From 9ad39d2684217d16d18c8c4aec783a032338af96 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 12 Aug 2021 20:49:23 +0800
Subject: [PATCH] 初版集成
---
pages/videoCall/videoCall.nvue | 14 +++++++-------
store/mutations.js | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pages/videoCall/videoCall.nvue b/pages/videoCall/videoCall.nvue
index e1d19c5..88f936c 100644
--- a/pages/videoCall/videoCall.nvue
+++ b/pages/videoCall/videoCall.nvue
@@ -15,8 +15,8 @@
</view>
<view class="Receiver" v-if="!isMain">
<view class="Mains-t">
- <text class="activetext">是否接收来自{{callname}}的{{Otype == 'video'? '视频': '音频'}}请求</text>
- <text class="activetext">接受进入{{channel}}</text>
+ <text class="activetext">是否接收来自{{callname}}的{{Otype == 'video'? '视频': '音频'}}邀请</text>
+ <!-- <text class="activetext">接受进入{{channel}}</text> -->
<u-loading size="36" mode="flower"></u-loading>
</view>
<view class="i-control">
@@ -209,7 +209,7 @@
formName: '',
-callname: '',
+ callname: '',
@@ -297,7 +297,7 @@
// }
// console.log(that,1111111111111)
if (data.type == 'close') {
-
+
console.log('对方已挂断');
// RtcModule.leaveChannel((res) => {});
that.closeAll();
@@ -677,7 +677,7 @@
icon: 'none'
});
// success: () => {
-
+
// uni.navigateBack();
RtcModule.destroyRtc((res) => {
console.log("页面销毁", res.code);
@@ -714,10 +714,10 @@
console.log(res.data);
var data = JSON.parse(res.data)
// if (call && ) {
-
+
// }
if (data.type == 'close') {
-
+
console.log('对方已挂断');
// RtcModule.leaveChannel((res) => {});
that.closeAll();
diff --git a/store/mutations.js b/store/mutations.js
index 4052523..3fe2f25 100644
--- a/store/mutations.js
+++ b/store/mutations.js
@@ -49,8 +49,8 @@
console.log('登入数据传输成功 开始进入连接')
uni.connectSocket({
- // url: 'ws://223.82.109.183:2086/websocket'
- url: 'ws://192.168.0.111:2086/websocket'
+ url: 'ws://223.82.109.183:2086/websocket'
+ // url: 'ws://192.168.0.111:2086/websocket'
});
var socketOpen = false;
uni.onSocketOpen(function(res) {
--
Gitblit v1.9.3