修复已知问题
This commit is contained in:
bobobobo
@@ -1,119 +1,102 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<!-- 单人视频 -->
|
||||
<view v-if="users.length<=2">
|
||||
<RongCloud-Call-RCUniCallView class="bigVideoView"
|
||||
:style="{width:windowWidth+'px',height:windowHeight+'px'}" ref="bigVideoView">
|
||||
</RongCloud-Call-RCUniCallView>
|
||||
<RongCloud-Call-RCUniCallView class="smallVideoView" :style="{width:200+'upx',height:200+'upx'}"
|
||||
ref="smallVideoView">
|
||||
</RongCloud-Call-RCUniCallView>
|
||||
</view>
|
||||
<!-- 多人视频 -->
|
||||
<view v-else>
|
||||
<RongCloud-Call-RCUniCallView class="bigVideoView" :style="{width:windowWidth+'px',height:300+'px'}"
|
||||
ref="bigVideoView">
|
||||
</RongCloud-Call-RCUniCallView>
|
||||
<view class="smallViews">
|
||||
<RongCloud-Call-RCUniCallView v-for="(item,index) in viewArr" :key="item.userId" class="smallView"
|
||||
:ref="item.userId">
|
||||
</RongCloud-Call-RCUniCallView>
|
||||
</view>
|
||||
</view>
|
||||
<view class="nav">
|
||||
<text class="nav-com" v-if="callWay === 1" @click="isMark=true">
|
||||
邀请
|
||||
</text>
|
||||
<text class="nav-com" @click="closeCameraCur">
|
||||
{{curCamera?'关闭':'开启'}}摄像头
|
||||
</text>
|
||||
<text class="nav-com" @click="switchCamera">
|
||||
切换摄像头
|
||||
</text>
|
||||
<text class="nav-com" @click="microphone">
|
||||
{{isMicrophone?'关闭':'开启'}}麦克风
|
||||
</text>
|
||||
<text class="nav-com" @click="enableSpeaker">
|
||||
{{isEnableSpeaker?'关闭':'开启'}}扬声器
|
||||
</text>
|
||||
<text class="nav-com" v-if="mediaTypeCur === 'video'" @click.stop="isBeauty=!isBeauty">
|
||||
美颜
|
||||
</text>
|
||||
</view>
|
||||
<view class="container" :style="{width:windowWidth+'px'}">
|
||||
<text class="hangup" @click="hangup">挂断 </text>
|
||||
<text v-if="mediaTypeCur === 'video' " class="hangup" @click="changeMediaType">切换语音 </text>
|
||||
</view>
|
||||
<view class="box-mark" v-if="isMark" :style="{width:windowWidth+'px',height:windowHeight+'px'}" @click.stop="">
|
||||
<view class="box-cen">
|
||||
<text class="box-des">被邀请者ID:</text>
|
||||
<view class="box-bot">
|
||||
<input v-model="inviteUsersIds" ref="inviteInput" class="box-input" type="text"
|
||||
placeholder="请输入被邀请者ID">
|
||||
<text class="box-tit">必填；需加入群后，方可收到邀请，多个userId用英文半角逗号分开</text>
|
||||
</view>
|
||||
<view class="box-btns">
|
||||
<button class="box-btn" type="default" @click="inviteUsers(false)">取消</button>
|
||||
<button class="box-btn" type="default" @click="inviteUsers(true)">确定</button>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="users.length <= 2">
|
||||
<RongCloud-Call-RCUniCallView
|
||||
class="bigVideoView"
|
||||
:style="{
|
||||
width: windowWidth + 'px',
|
||||
height: windowHeight + 'px'
|
||||
}"
|
||||
ref="bigVideoView"
|
||||
></RongCloud-Call-RCUniCallView>
|
||||
<RongCloud-Call-RCUniCallView
|
||||
class="smallVideoView"
|
||||
:style="{ width: 200 + 'upx', height: 200 + 'upx' }"
|
||||
ref="smallVideoView"
|
||||
></RongCloud-Call-RCUniCallView>
|
||||
</view>
|
||||
|
||||
<view class="beauty" v-if="isBeauty" :style="{width:windowWidth+'px'}" @click.stop="">
|
||||
<view class="beauty-btn">
|
||||
<view class="change-btn">
|
||||
<text class="ch-tit">美颜</text><text class="switch-btn"
|
||||
@click="switchChange">{{isChecked?'开启':'关闭'}}</text>
|
||||
</view>
|
||||
<view class="close-btn">
|
||||
<text class="close-tit" @click="isBeauty=false">X</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="beauty-view">
|
||||
<view v-if="curIndex === '0'" class="beauty-tab filte-view">
|
||||
<view class="tab-item" v-for="(item) in filteArr" :key="item.id" @click="cutFilte(item.id)"
|
||||
:class="{current: item.id === curFilte}">
|
||||
<text>{{item.name}}</text>
|
||||
<!-- 底部按钮 -->
|
||||
<view class="nav-box">
|
||||
<view class="control-row">
|
||||
<view class="icon-item" @click="microphone">
|
||||
<view class="control-icon">
|
||||
<uni-icons
|
||||
:type="isMicrophone ? 'mic' : 'micoff'"
|
||||
size="24"
|
||||
color="#fff"
|
||||
></uni-icons>
|
||||
</view>
|
||||
<text class="btn-text">
|
||||
{{ isMicrophone ? '关闭' : '开启' }}麦克风
|
||||
</text>
|
||||
</view>
|
||||
<!-- 美白 -->
|
||||
<view v-if="curIndex === '1'" class="white-view com-view">
|
||||
<slider :value="whiteVal" min="0" max="9" @change="whiteChange" show-value />
|
||||
<view class="icon-item" @click="closeCameraCur">
|
||||
<view class="control-icon">
|
||||
<uni-icons
|
||||
:type="curCamera ? 'eye' : 'eye-slash'"
|
||||
size="24"
|
||||
color="#fff"
|
||||
></uni-icons>
|
||||
</view>
|
||||
<text class="btn-text">
|
||||
{{ curCamera ? '关闭' : '开启' }}摄像头
|
||||
</text>
|
||||
</view>
|
||||
<!-- 红润 -->
|
||||
<view v-if="curIndex === '2'" class="ruddy-view com-view">
|
||||
<slider :value="ruddyVal" min="0" max="9" @change="ruddyChange" show-value />
|
||||
</view>
|
||||
<!-- 磨皮 -->
|
||||
<view v-if="curIndex === '3'" class="buffing-view com-view">
|
||||
<slider :value="buffingVal" min="0" max="9" @change="buffingChange" show-value />
|
||||
</view>
|
||||
<!-- 亮度 -->
|
||||
<view v-if="curIndex === '4'" class="brightness-view com-view">
|
||||
<slider :value="brightnessVal" min="0" max="9" @change="brightnessChange" show-value />
|
||||
<view class="icon-item" @click="enableSpeaker">
|
||||
<view class="control-icon">
|
||||
<uni-icons
|
||||
:type="isEnableSpeaker ? 'sound' : 'sound'"
|
||||
size="24"
|
||||
color="#fff"
|
||||
></uni-icons>
|
||||
</view>
|
||||
<text class="btn-text">
|
||||
{{ isEnableSpeaker ? '关闭' : '开启' }}扬声器
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="beauty-tab">
|
||||
<view class="tab-item" v-for="(item) in tabArr" :key="item.id" @click="curIndex = item.id"
|
||||
:class="{current: item.id === curIndex}">
|
||||
<text>{{item.text}}</text>
|
||||
<view class="control-row" :style="{ width: windowWidth + 'px' }">
|
||||
<view class="icon-item" @click="changeMediaType">
|
||||
<view class="control-icon">
|
||||
<uni-icons
|
||||
:type="mediaTypeCur === 'video' ? 'phone' : 'videocam'"
|
||||
size="24"
|
||||
color="#fff"
|
||||
></uni-icons>
|
||||
</view>
|
||||
<text class="btn-text">
|
||||
{{ mediaTypeCur === 'video' ? '切换语音' : '切换视频' }}
|
||||
</text>
|
||||
</view>
|
||||
<view class="hangup-btn icon-item" @click="hangup">
|
||||
<view class="hangup-icon control-icon">
|
||||
<uni-icons type="phone" size="28" color="#fff"></uni-icons>
|
||||
</view>
|
||||
<text class="hangup-text">挂断</text>
|
||||
</view>
|
||||
<view class="icon-item" @click="switchCamera">
|
||||
<view class="control-icon">
|
||||
<uni-icons type="refresh" size="24" color="#fff"></uni-icons>
|
||||
</view>
|
||||
<text class="btn-text">翻转</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import * as call from "@/uni_modules/RongCloud-CallWrapper/lib/index"
|
||||
import * as call from '@/uni_modules/RongCloud-CallWrapper/lib/index'
|
||||
// import * as im from "@/uni_modules/RongCloud-IMWrapper/js_sdk/index"
|
||||
// import RCBeautyEngine from "@/uni_modules/RongCloud-BeautyWrapper/lib/RCBeautyEngine"
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
mediaType: "video",
|
||||
callType: "out",
|
||||
mediaType: 'video',
|
||||
callType: 'out',
|
||||
callWay: 0, //呼叫方式 0 单聊 1 群聊
|
||||
targetId: "",
|
||||
targetId: '',
|
||||
bottomHeight: 0,
|
||||
isConnected: false,
|
||||
isSelf: false,
|
||||
@@ -134,44 +117,6 @@
|
||||
inviteUsersIds: '',
|
||||
mediaTypeCur: 'audio',
|
||||
isBeauty: false,
|
||||
tabArr: [{
|
||||
id: '0',
|
||||
text: '滤镜'
|
||||
},
|
||||
{
|
||||
id: '1',
|
||||
text: '美白'
|
||||
},
|
||||
{
|
||||
id: '2',
|
||||
text: '红润'
|
||||
},
|
||||
{
|
||||
id: '3',
|
||||
text: '磨皮'
|
||||
},
|
||||
{
|
||||
id: '4',
|
||||
text: '亮度'
|
||||
},
|
||||
],
|
||||
filteArr: [{
|
||||
id: 0,
|
||||
name: '原画'
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
name: '唯美'
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: '清新'
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
name: '浪漫'
|
||||
}
|
||||
],
|
||||
curIndex: '0',
|
||||
curFilte: 0,
|
||||
whiteVal: 0,
|
||||
@@ -181,201 +126,272 @@
|
||||
isChecked: false
|
||||
}
|
||||
},
|
||||
onLoad: function() {
|
||||
console.log("来room页面了？");
|
||||
var _this = this;
|
||||
onLoad: function () {
|
||||
var _this = this
|
||||
uni.getStorage({
|
||||
key: "room-parameters",
|
||||
success: (res) => {
|
||||
this.mediaType = res.data.mediaType;
|
||||
this.callType = res.data.callType ? res.data.callType : 'in';
|
||||
this.groupId = res.data.groupId ? res.data.groupId : '';
|
||||
this.userIds = res.data.userIds ? res.data.userIds : '';
|
||||
key: 'room-parameters',
|
||||
success: res => {
|
||||
this.mediaType = res.data.mediaType
|
||||
this.callType = res.data.callType ? res.data.callType : 'in'
|
||||
this.groupId = res.data.groupId ? res.data.groupId : ''
|
||||
this.userIds = res.data.userIds ? res.data.userIds : ''
|
||||
if (this.callType === 'out') {
|
||||
console.log('呼出out')
|
||||
this.targetId = res.data.targetId;
|
||||
this.startCall();
|
||||
this.targetId = res.data.targetId
|
||||
this.startCall()
|
||||
} else {
|
||||
console.log('呼入接受')
|
||||
this.accept();
|
||||
this.accept()
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
uni.getSystemInfo({
|
||||
success: function(res) {
|
||||
_this.windowWidth = res.windowWidth;
|
||||
_this.windowHeight = res.windowHeight;
|
||||
success: function (res) {
|
||||
_this.windowWidth = res.windowWidth
|
||||
_this.windowHeight = res.windowHeight
|
||||
}
|
||||
})
|
||||
uni.$on('OnCallConnected', this.onCallConnected)
|
||||
uni.$on('OnCallDisconnected', this.onCallDisconnected)
|
||||
// this.initBeautyOpton();
|
||||
this.initBeautyOpton()
|
||||
},
|
||||
beforeDestroy() {
|
||||
uni.$off('OnCallDisconnected');
|
||||
uni.$off('OnCallConnected');
|
||||
uni.$off('OnCallDisconnected')
|
||||
uni.$off('OnCallConnected')
|
||||
},
|
||||
onUnload() {
|
||||
call.hangup();
|
||||
call.hangup()
|
||||
},
|
||||
onHide() {
|
||||
const session = call.getCurrentCallSession();
|
||||
const session = call.getCurrentCallSession()
|
||||
if (session) {
|
||||
call.hangup();
|
||||
call.hangup()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
changeMediaType() {
|
||||
this.mediaTypeCur = 'audio';
|
||||
call.changeMediaType(0);
|
||||
if (this.mediaTypeCur == 'video') {
|
||||
this.mediaTypeCur = 'audio'
|
||||
} else {
|
||||
this.mediaTypeCur = 'video'
|
||||
}
|
||||
call.changeMediaType(0)
|
||||
},
|
||||
inviteUsers(flag) {
|
||||
if (flag) {
|
||||
if (this.inviteUsersIds === '') {
|
||||
uni.showToast({
|
||||
title: "请输入被邀请者ID",
|
||||
icon: "error",
|
||||
title: '请输入被邀请者ID',
|
||||
icon: 'error',
|
||||
duration: 2000
|
||||
})
|
||||
return;
|
||||
return
|
||||
}
|
||||
let userIdsArr = this.inviteUsersIds.split(',');
|
||||
call.inviteUsers(userIdsArr, []);
|
||||
let userIdsArr = this.inviteUsersIds.split(',')
|
||||
call.inviteUsers(userIdsArr, [])
|
||||
}
|
||||
this.$refs.inviteInput.blur();
|
||||
this.isMark = false;
|
||||
this.$refs.inviteInput.blur()
|
||||
this.isMark = false
|
||||
},
|
||||
switchVideo() {
|
||||
this.isMe = !this.isMe;
|
||||
let session = call.getCurrentCallSession();
|
||||
this.isMe = !this.isMe
|
||||
let session = call.getCurrentCallSession()
|
||||
if (this.isMe) {
|
||||
switch (uni.getSystemInfoSync().platform) {
|
||||
case 'android':
|
||||
call.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0, false);
|
||||
call.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0, true);
|
||||
break;
|
||||
call.setVideoView(
|
||||
session.targetId,
|
||||
this.$refs.bigVideoView.ref,
|
||||
0,
|
||||
false
|
||||
)
|
||||
call.setVideoView(
|
||||
session.mine.userId,
|
||||
this.$refs.smallVideoView.ref,
|
||||
0,
|
||||
true
|
||||
)
|
||||
break
|
||||
case 'ios':
|
||||
call.setVideoView(session.targetId, this.$refs.bigVideoView.ref, 0);
|
||||
call.setVideoView(session.mine.userId, this.$refs.smallVideoView.ref, 0);
|
||||
break;
|
||||
call.setVideoView(
|
||||
session.targetId,
|
||||
this.$refs.bigVideoView.ref,
|
||||
0
|
||||
)
|
||||
call.setVideoView(
|
||||
session.mine.userId,
|
||||
this.$refs.smallVideoView.ref,
|
||||
0
|
||||
)
|
||||
break
|
||||
default:
|
||||
console.log('运行在开发者工具上')
|
||||
break;
|
||||
break
|
||||
}
|
||||
} else {
|
||||
switch (uni.getSystemInfoSync().platform) {
|
||||
case 'android':
|
||||
call.setVideoView(session.mine.userId, this.$refs.bigVideoView.ref, 0, false);
|
||||
call.setVideoView(session.targetId, this.$refs.smallVideoView.ref, 0, true);
|
||||
break;
|
||||
call.setVideoView(
|
||||
session.mine.userId,
|
||||
this.$refs.bigVideoView.ref,
|
||||
0,
|
||||
false
|
||||
)
|
||||
call.setVideoView(
|
||||
session.targetId,
|
||||
this.$refs.smallVideoView.ref,
|
||||
0,
|
||||
true
|
||||
)
|
||||
break
|
||||
case 'ios':
|
||||
call.setVideoView(session.mine.userId, this.$refs.bigVideoView.ref, 0);
|
||||
call.setVideoView(session.targetId, this.$refs.smallVideoView.ref, 0);
|
||||
break;
|
||||
call.setVideoView(
|
||||
session.mine.userId,
|
||||
this.$refs.bigVideoView.ref,
|
||||
0
|
||||
)
|
||||
call.setVideoView(
|
||||
session.targetId,
|
||||
this.$refs.smallVideoView.ref,
|
||||
0
|
||||
)
|
||||
break
|
||||
default:
|
||||
console.log('运行在开发者工具上')
|
||||
break;
|
||||
break
|
||||
}
|
||||
}
|
||||
},
|
||||
closeCameraCur() {
|
||||
this.curCamera = !this.curCamera;
|
||||
let camera = call.currentCamera();
|
||||
this.curCamera = !this.curCamera
|
||||
let camera = call.currentCamera()
|
||||
call.enableCamera(this.curCamera, camera)
|
||||
},
|
||||
closeCameraBack() {
|
||||
this.backCamera = !this.backCamera;
|
||||
this.backCamera = !this.backCamera
|
||||
call.enableCamera(this.backCamera, 1)
|
||||
},
|
||||
switchCamera() {
|
||||
call.switchCamera();
|
||||
call.switchCamera()
|
||||
},
|
||||
microphone() {
|
||||
this.isMicrophone = !this.isMicrophone;
|
||||
call.enableMicrophone(this.isMicrophone);
|
||||
this.isMicrophone = !this.isMicrophone
|
||||
call.enableMicrophone(this.isMicrophone)
|
||||
},
|
||||
enableSpeaker() {
|
||||
this.isEnableSpeaker = !this.isEnableSpeaker;
|
||||
call.enableSpeaker(this.isEnableSpeaker);
|
||||
this.isEnableSpeaker = !this.isEnableSpeaker
|
||||
call.enableSpeaker(this.isEnableSpeaker)
|
||||
},
|
||||
hangup() {
|
||||
this.isSelf = true;
|
||||
// RCBeautyEngine.resetBeauty();
|
||||
call.hangup();
|
||||
this.isSelf = true
|
||||
call.hangup()
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
})
|
||||
},
|
||||
accept() {
|
||||
call.accept();
|
||||
call.accept()
|
||||
},
|
||||
startCall() {
|
||||
const type = this.mediaType === 'audio' ? 0 : 1;
|
||||
this.mediaTypeCur = this.mediaType;
|
||||
const type = this.mediaType === 'audio' ? 0 : 1
|
||||
this.mediaTypeCur = this.mediaType
|
||||
if (this.targetId.length > 0) {
|
||||
call.enableSpeaker(true);
|
||||
call.startSingleCall(this.targetId, type, null);
|
||||
this.currentCallSession = call.getCurrentCallSession();
|
||||
this.users = this.currentCallSession.users ? this.currentCallSession.users : [];
|
||||
call.enableSpeaker(true)
|
||||
call.startSingleCall(this.targetId, type, null)
|
||||
this.currentCallSession = call.getCurrentCallSession()
|
||||
this.users = this.currentCallSession.users
|
||||
? this.currentCallSession.users
|
||||
: []
|
||||
} else {
|
||||
call.startGroupCall(this.groupId, this.userIds, [], type, '');
|
||||
this.users = this.userIds;
|
||||
call.startGroupCall(this.groupId, this.userIds, [], type, '')
|
||||
this.users = this.userIds
|
||||
|
||||
console.log(this.users);
|
||||
this.currentCallSession = call.getCurrentCallSession();
|
||||
this.users = this.currentCallSession.users ? this.currentCallSession.users : [];
|
||||
console.log(this.users)
|
||||
this.currentCallSession = call.getCurrentCallSession()
|
||||
this.users = this.currentCallSession.users
|
||||
? this.currentCallSession.users
|
||||
: []
|
||||
}
|
||||
let _this = this;
|
||||
let _this = this
|
||||
// im.getCurrentUserId(function(result){
|
||||
// _this.systemInfoSync(result.userId,_this.$refs.bigVideoView.ref,false);
|
||||
// })
|
||||
if (this.currentCallSession) {
|
||||
this.systemInfoSync(this.currentCallSession.mine.userId, this.$refs.bigVideoView.ref, false);
|
||||
this.systemInfoSync(
|
||||
this.currentCallSession.mine.userId,
|
||||
this.$refs.bigVideoView.ref,
|
||||
false
|
||||
)
|
||||
}
|
||||
},
|
||||
|
||||
onCallConnected() {
|
||||
let context = this;
|
||||
console.log('oncallconnected接收了');
|
||||
this.mediaTypeCur = this.mediaType;
|
||||
call.enableSpeaker(true);
|
||||
this.currentCallSession = call.getCurrentCallSession();
|
||||
this.callWay = this.currentCallSession.callType;
|
||||
this.users = this.currentCallSession.users ? this.currentCallSession.users : [];
|
||||
let isHasMine = this.users.findIndex((item) => {
|
||||
return item.userId === this.currentCallSession.mine.userId;
|
||||
});
|
||||
let context = this
|
||||
console.log('oncallconnected接收了')
|
||||
this.mediaTypeCur = this.mediaType
|
||||
call.enableSpeaker(true)
|
||||
this.currentCallSession = call.getCurrentCallSession()
|
||||
this.callWay = this.currentCallSession.callType
|
||||
this.users = this.currentCallSession.users
|
||||
? this.currentCallSession.users
|
||||
: []
|
||||
let isHasMine = this.users.findIndex(item => {
|
||||
return item.userId === this.currentCallSession.mine.userId
|
||||
})
|
||||
if (isHasMine === -1) {
|
||||
this.users.push(this.currentCallSession.mine);
|
||||
this.users.push(this.currentCallSession.mine)
|
||||
}
|
||||
if (this.currentCallSession && this.currentCallSession.users.length > 0) {
|
||||
if (
|
||||
this.currentCallSession &&
|
||||
this.currentCallSession.users.length > 0
|
||||
) {
|
||||
//视频是两个的时候
|
||||
if (this.currentCallSession.users.length <= 2) {
|
||||
setTimeout(() => {
|
||||
this.systemInfoSync(this.currentCallSession.mine.userId, this.$refs.smallVideoView.ref,
|
||||
true);
|
||||
this.viewArr = this.currentCallSession.users.filter((item) => {
|
||||
return item.userId !== this.currentCallSession.mine.userId;
|
||||
});
|
||||
this.viewArr.forEach((itm) => {
|
||||
this.targetId = itm.userId;
|
||||
this.systemInfoSync(itm.userId, this.$refs.bigVideoView.ref, false);
|
||||
});
|
||||
}, 100);
|
||||
|
||||
this.systemInfoSync(
|
||||
this.currentCallSession.mine.userId,
|
||||
this.$refs.smallVideoView.ref,
|
||||
true
|
||||
)
|
||||
this.viewArr = this.currentCallSession.users.filter(
|
||||
item => {
|
||||
return (
|
||||
item.userId !== this.currentCallSession.mine.userId
|
||||
)
|
||||
}
|
||||
)
|
||||
this.viewArr.forEach(itm => {
|
||||
this.targetId = itm.userId
|
||||
this.systemInfoSync(
|
||||
itm.userId,
|
||||
this.$refs.bigVideoView.ref,
|
||||
false
|
||||
)
|
||||
})
|
||||
}, 100)
|
||||
} else {
|
||||
// 视频超过三个
|
||||
this.$nextTick(() => {
|
||||
this.systemInfoSync(this.currentCallSession.mine.userId, this.$refs.bigVideoView.ref,
|
||||
false);
|
||||
this.viewArr = this.currentCallSession.users.filter((item) => {
|
||||
return item.userId !== this.currentCallSession.mine.userId;
|
||||
});
|
||||
this.systemInfoSync(
|
||||
this.currentCallSession.mine.userId,
|
||||
this.$refs.bigVideoView.ref,
|
||||
false
|
||||
)
|
||||
this.viewArr = this.currentCallSession.users.filter(
|
||||
item => {
|
||||
return (
|
||||
item.userId !== this.currentCallSession.mine.userId
|
||||
)
|
||||
}
|
||||
)
|
||||
setTimeout(() => {
|
||||
this.viewArr.forEach((itm) => {
|
||||
this.systemInfoSync(itm.userId, this.$refs[itm.userId][0].ref,
|
||||
false);
|
||||
});
|
||||
this.viewArr.forEach(itm => {
|
||||
this.systemInfoSync(
|
||||
itm.userId,
|
||||
this.$refs[itm.userId][0].ref,
|
||||
false
|
||||
)
|
||||
})
|
||||
}, 100)
|
||||
})
|
||||
}
|
||||
@@ -384,18 +400,18 @@
|
||||
systemInfoSync(userId, ref, isZOrderOnTop) {
|
||||
switch (uni.getSystemInfoSync().platform) {
|
||||
case 'android':
|
||||
call.setVideoView(userId, ref, 0, isZOrderOnTop);
|
||||
break;
|
||||
call.setVideoView(userId, ref, 0, isZOrderOnTop)
|
||||
break
|
||||
case 'ios':
|
||||
call.setVideoView(userId, ref, 0);
|
||||
break;
|
||||
call.setVideoView(userId, ref, 0)
|
||||
break
|
||||
default:
|
||||
console.log('运行在开发者工具上')
|
||||
break;
|
||||
break
|
||||
}
|
||||
},
|
||||
onCallDisconnected() {
|
||||
this.isMe = true;
|
||||
this.isMe = true
|
||||
if (!this.isSelf) {
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
@@ -403,103 +419,89 @@
|
||||
}
|
||||
},
|
||||
switchChange() {
|
||||
this.isChecked = !this.isChecked;
|
||||
this.isChecked = !this.isChecked
|
||||
if (!this.isChecked) {
|
||||
this.reset();
|
||||
this.reset()
|
||||
} else {
|
||||
this.setBeautyOption();
|
||||
this.setBeautyOption()
|
||||
}
|
||||
},
|
||||
//设置美颜
|
||||
setBeautyOption() {
|
||||
let option = {
|
||||
whitenessLevel: this.whiteVal,
|
||||
ruddyLevel: this.ruddyVal,
|
||||
smoothLevel: this.buffingVal,
|
||||
brightLevel: this.brightnessVal
|
||||
}
|
||||
if (this.isChecked) { //开启
|
||||
console.log('设置美颜')
|
||||
// RCBeautyEngine.setBeautyOptions(this.isChecked, option);
|
||||
}
|
||||
},
|
||||
//切换滤镜
|
||||
cutFilte(id) {
|
||||
//切换滤镜打开美颜
|
||||
if (!this.isChecked) {
|
||||
this.isChecked = true;
|
||||
}
|
||||
let option = {
|
||||
whitenessLevel: this.whiteVal,
|
||||
ruddyLevel: this.ruddyVal,
|
||||
smoothLevel: this.buffingVal,
|
||||
brightLevel: this.brightnessVal
|
||||
}
|
||||
//打开滤镜
|
||||
this.curFilte = id;
|
||||
// this.isChecked ? RCBeautyEngine.setBeautyOptions(this.isChecked, option) : '';
|
||||
// RCBeautyEngine.setBeautyFilter(this.curFilte);
|
||||
},
|
||||
//美白
|
||||
whiteChange(e) {
|
||||
console.log('美白', e.detail.value);
|
||||
//打开美颜
|
||||
if (!this.isChecked) {
|
||||
this.isChecked = true;
|
||||
}
|
||||
this.whiteVal = e.detail.value;
|
||||
this.setBeautyOption();
|
||||
},
|
||||
//红润
|
||||
ruddyChange(e) {
|
||||
console.log('红润', e.detail.value);
|
||||
//打开美颜
|
||||
if (!this.isChecked) {
|
||||
this.isChecked = true;
|
||||
}
|
||||
this.ruddyVal = e.detail.value;
|
||||
this.setBeautyOption();
|
||||
},
|
||||
//磨皮
|
||||
buffingChange(e) {
|
||||
console.log('磨皮', e.detail.value);
|
||||
//打开美颜
|
||||
if (!this.isChecked) {
|
||||
this.isChecked = true;
|
||||
}
|
||||
this.buffingVal = e.detail.value;
|
||||
this.setBeautyOption();
|
||||
},
|
||||
//亮度
|
||||
brightnessChange(e) {
|
||||
console.log('亮度', e.detail.value);
|
||||
//打开美颜
|
||||
if (!this.isChecked) {
|
||||
this.isChecked = true;
|
||||
}
|
||||
this.brightnessVal = e.detail.value;
|
||||
this.setBeautyOption();
|
||||
},
|
||||
//重置
|
||||
reset() {
|
||||
// RCBeautyEngine.resetBeauty();
|
||||
// this.initBeautyOpton();
|
||||
},
|
||||
// initBeautyOpton() {
|
||||
// //初始化滤镜
|
||||
// this.curFilte = RCBeautyEngine.getCurrentBeautyFilter();
|
||||
// //初始化美颜参数
|
||||
// let beautyOption = RCBeautyEngine.getCurrentBeautyOptions();
|
||||
// this.whiteVal = beautyOption.whitenessLevel;
|
||||
// this.ruddyVal = beautyOption.ruddyLevel;
|
||||
// this.buffingVal = beautyOption.smoothLevel;
|
||||
// this.brightnessVal = beautyOption.brightLevel;
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.nav-box {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 99;
|
||||
/* height: 220rpx; */
|
||||
width: 750rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding-bottom: 60rpx;
|
||||
}
|
||||
|
||||
.hangup-btn {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 8rpx;
|
||||
}
|
||||
|
||||
.hangup-icon {
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
background: #ff3b30 !important;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.hangup-text {
|
||||
font-size: 14rpx;
|
||||
color: #fff;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.btn-text {
|
||||
font-size: 14rpx;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.control-row {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
gap: 40rpx;
|
||||
/* width: 100%; */
|
||||
flex-direction: row;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.icon-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 8rpx;
|
||||
margin: 10rpx;
|
||||
}
|
||||
|
||||
.control-icon {
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
background: rgba(255, 255, 255, 0.3);
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
|
||||
.content {
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
@@ -539,12 +541,6 @@
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.nav {
|
||||
position: fixed;
|
||||
bottom: 200upx;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.camera {
|
||||
background: #ccc;
|
||||
}
|
||||
@@ -555,25 +551,13 @@
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
}
|
||||
|
||||
.hangup {
|
||||
width: 200upx;
|
||||
height: 100upx;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
line-height: 100upx;
|
||||
background: red;
|
||||
margin-right: 50upx;
|
||||
border-radius: 50upx;
|
||||
}
|
||||
|
||||
.box-mark {
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 0;
|
||||
background: rgba(0, 0, 0, .5);
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
z-index: 9999;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
@@ -679,7 +663,6 @@
|
||||
background: #ccc;
|
||||
padding-left: 30upx;
|
||||
padding-right: 30upx;
|
||||
|
||||
}
|
||||
|
||||
.beauty-tab {
|
||||
@@ -693,7 +676,8 @@
|
||||
padding-top: 40upx;
|
||||
}
|
||||
|
||||
.filte-view {}
|
||||
.filte-view {
|
||||
}
|
||||
|
||||
.tab-item {
|
||||
width: 100upx;
|
||||
@@ -708,5 +692,6 @@
|
||||
background: yellow;
|
||||
}
|
||||
|
||||
.white-view {}
|
||||
</style>
|
||||
.white-view {
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user