sxq2024
/
chunwan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口调用

Browse Source
main
123456 1 month ago
parent 01a0364aa5
commit 8098ad5f47
16 changed files with 1642 additions and 672 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 141
      App.vue
  2. 4
      api/socket.js
  3. 127
      main.js
  4. 105
      pages/index/index.vue
  5. 315
      pages/pipei/shipin/detail.nvue
  6. 1
      pages/pipei/shipin/index.vue
  7. 2
      pages/user/index.vue
  8. 2
      pages/users/yuyin/index.vue
  9. 2
      pages/xiaoxi/index.vue
  10. BIN
      static/arrow-left.png
  11. 2
      uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoLocalView.nvue
  12. 2
      uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoRemoteView.nvue
  13. 612
      unpackage/dist/dev/app-plus/app-service.js
  14. 3
      unpackage/dist/dev/app-plus/app-view.js
  15. 880
      unpackage/dist/dev/app-plus/pages/pipei/shipin/detail.js
  16. BIN
      unpackage/dist/dev/app-plus/static/arrow-left.png

141
App.vue
Unescape View File

@ -4,7 +4,146 @@
console.log('App Launch') console.log('App Launch')
}, },
onShow: function() { onShow: function() {
console.log('App Show') let timer = null;
//socket
uni.$on("openSocket",function(res){
uni.connectSocket({
url: 'wss://api.lyiyuan.cn/websocket?userId='+uni.getStorageSync('userInfo').id
});
uni.onSocketOpen(function (res) {
uni.sendSocketMessage({data:JSON.stringify({"userId": uni.getStorageSync("userInfo").id,"topic":"heart_beat"})});
xintiao()
console.log('WebSocket连接已打开！');
uni.setStorageSync("isOpen",true)
uni.onSocketMessage(function (res) {
const obj = res.data?JSON.parse(res.data):{}
if(obj.topic == 'message'){
if(obj.type>=8){
if(uni.getStorageSync("userInfo").id == obj.sellerId){
if(obj.type == 12){
uni.$emit("watchEvent",obj)
}
if(obj.type == 9){
if(obj.userMsgVoice == 1){
uni.$emit("playAudio")
}
if(obj.userMsgShock == 1){
uni.vibrateLong({
complete: function (res) {
console.log('success',res);
}
});
}
uni.showModal({
title: '温馨提示',
content: '来自'+obj.userNickname+"发起的视频匹配，是否同意",
cancelText: '拒绝',
confirmText: '同意',
success: res => {
if(res.confirm){
console.log(obj, uni.getStorageSync("userInfo"))
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: obj.userId,
type: 10,
"topic":"message"
})})
if(uni.getStorageSync("userInfo").id == obj.sellerId){
console.log("toChat",uni.getStorageSync("userInfo").id , obj.userId)
uni.navigateTo({
url: "/pages/pipei/shipin/detail?type=2&id="+obj.userId
})
}
}else{
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: obj.userId,
type: 11,
"topic":"message"
})})
}
},
fail: () => {},
complete: () => {}
});
}
if(obj.type == 8){
if(obj.userMsgVoice == 1){
uni.$emit("playAudio")
}
if(obj.userMsgShock == 1){
uni.vibrateLong({
complete: function (res) {
console.log('success',res);
}
});
}
uni.showModal({
title: '温馨提示',
content: '来自'+obj.userNickname+"发起的语音匹配，是否同意",
cancelText: '拒绝',
confirmText: '同意',
success: res => {
if(res.confirm){
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: data.id,
type: 10,
"topic":"message"
})})
}else{
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: data.id,
type: 11,
"topic":"message"
})})
}
},
fail: () => {},
complete: () => {}
});
}
}
}
}
});
});
uni.onSocketClose(function (res) {
clearInterval(timer)
uni.closeSocket();
uni.removeStorageSync("isOpen")
console.log('WebSocket 已关闭！');
setTimeout(()=>{
if(uni.getStorageSync("userInfo").id){
uni.$emit("openSocket")
}
},1000)
});
})
function xintiao() {
clearInterval(timer)
timer = setInterval(()=>{
uni.setStorageSync("isOpen",true)
uni.sendSocketMessage({data:JSON.stringify({"userId": uni.getStorageSync("userInfo").id,"topic":"heart_beat"})});
}, 30000)
}
setTimeout(()=>{
if(uni.getStorageSync("userInfo").id){
uni.$emit("openSocket")
}
},1000)
const bgAudioManager = uni.getBackgroundAudioManager();
uni.$on("playAudio",res=>{
bgAudioManager.src = 'https://api.lyiyuan.cn/profile/upload/static/tishiyin.mp3';
bgAudioManager.play();
})
}, },
onHide: function() { onHide: function() {
console.log('App Hide') console.log('App Hide')

4
api/socket.js
Unescape View File

@ -0,0 +1,4 @@
const socket = {
}
export default socket

127
main.js
Unescape View File

@ -34,133 +34,6 @@ const app = new Vue({
}) })
app.$mount() app.$mount()
// #endif // #endif
let timer = null;
//socket
uni.$on("openSocket",function(res){
uni.connectSocket({
url: 'wss://api.lyiyuan.cn/websocket?userId='+uni.getStorageSync('userInfo').id
});
uni.onSocketOpen(function (res) {
console.log('WebSocket连接已打开！');
uni.setStorageSync("isOpen",true)
uni.sendSocketMessage({data:JSON.stringify({"userId": uni.getStorageSync("userInfo").id,"topic":"heart_beat"})});
xintiao()
});
uni.onSocketMessage(function (res) {
const obj = res.data?JSON.parse(res.data):{}
console.log("onSocketMessage",obj)
if(obj.topic == 'message'){
if(obj.type>=8){
if(uni.getStorageSync("userInfo").id == obj.sellerId){
if(obj.type == 9){
if(obj.userMsgVoice == 1){
uni.$emit("playAudio")
}
if(obj.userMsgShock == 1){
uni.vibrateLong({
complete: function (res) {
console.log('success',res);
}
});
}
uni.showModal({
title: '温馨提示',
content: '来自'+obj.userNickname+"发起的视频匹配，是否同意",
cancelText: '拒绝',
confirmText: '同意',
success: res => {
if(res.confirm){
console.log(obj, uni.getStorageSync("userInfo"))
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: obj.userId,
type: 10,
"topic":"message"
})})
if(uni.getStorageSync("userInfo").id == obj.sellerId){
console.log("toChat",uni.getStorageSync("userInfo").id , obj.userId)
uni.navigateTo({
url: "/pages/pipei/shipin/detail?type=2&id="+obj.userId
})
}
}else{
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: obj.userId,
type: 11,
"topic":"message"
})})
}
},
fail: () => {},
complete: () => {}
});
}
if(obj.type == 8){
if(obj.userMsgVoice == 1){
uni.$emit("playAudio")
}
if(obj.userMsgShock == 1){
uni.vibrateLong({
complete: function (res) {
console.log('success',res);
}
});
}
uni.showModal({
title: '温馨提示',
content: '来自'+obj.userNickname+"发起的语音匹配，是否同意",
cancelText: '拒绝',
confirmText: '同意',
success: res => {
if(res.confirm){
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: data.id,
type: 10,
"topic":"message"
})})
}else{
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: data.id,
type: 11,
"topic":"message"
})})
}
},
fail: () => {},
complete: () => {}
});
}
}
}else{
console.log("挂断了")
}
}
});
uni.onSocketClose(function (res) {
clearInterval(timer)
uni.closeSocket();
uni.removeStorageSync("isOpen")
console.log('WebSocket 已关闭！');
});
})
function xintiao() {
clearInterval(timer)
timer = setInterval(()=>{
console.log("xintiao")
uni.setStorageSync("isOpen",true)
uni.sendSocketMessage({data:JSON.stringify({"userId": uni.getStorageSync("userInfo").id,"topic":"heart_beat"})});
}, 30000)
}
setTimeout(()=>{
if(uni.getStorageSync("userInfo").id){
uni.$emit("openSocket")
}
},1000)
// #ifdef VUE3 // #ifdef VUE3
import { createSSRApp } from 'vue' import { createSSRApp } from 'vue'
export function createApp() { export function createApp() {

105
pages/index/index.vue
Unescape View File

@ -58,7 +58,7 @@
</view> </view>
<view class="info" @click="openPage(6,a.id)"> <view class="info" @click="openPage(6,a.id)">
<view class="name">{{a.nickname}}<view class="vip" v-if="a.memberflag>=1">VIP{{a.memberflag}}</view></view> <view class="name">{{a.nickname}}<view class="vip" v-if="a.memberflag>=1">VIP{{a.memberflag}}</view></view>
<view class="desc">{{a.age}}岁/{{a.height}}cm</view> <view class="desc">{{a.age}}岁/{{a.height}}</view>
</view> </view>
<view class="chat" @click="openPage(7,a)"> <view class="chat" @click="openPage(7,a)">
<image src="@/static/xin.png"></image> <image src="@/static/xin.png"></image>
@ -107,6 +107,7 @@
const that = this; const that = this;
if(uni.getStorageSync("userInfo").id){ if(uni.getStorageSync("userInfo").id){
uni.$emit("openSocket"); uni.$emit("openSocket");
that.watchSocket();
} }
setTimeout(()=>{ setTimeout(()=>{
if(that.current == 0){ if(that.current == 0){
@ -184,6 +185,14 @@
that.show=false that.show=false
} }
}) })
uni.$on("duanYinship",obj=>{
uni.sendSocketMessage({data:JSON.stringify({
"userId": obj.userId,
"sellerId": obj.sellerId,
type: 12,
"topic":"message"
})})
})
if(uni.getStorageSync("userInfo").id){ if(uni.getStorageSync("userInfo").id){
this.watchSocket(); this.watchSocket();
} }
@ -225,11 +234,9 @@
if(obj.type <=7){ if(obj.type <=7){
if(uni.getStorageSync("userInfo").id == obj.sellerId){ if(uni.getStorageSync("userInfo").id == obj.sellerId){
if(obj.userMsgVoice == 1){ if(obj.userMsgVoice == 1){
console.log(222)
uni.$emit("playAudio") uni.$emit("playAudio")
} }
if(obj.userMsgShock == 1){ if(obj.userMsgShock == 1){
console.log(2233)
uni.vibrateLong({ uni.vibrateLong({
complete: function (res) { complete: function (res) {
console.log('success',res); console.log('success',res);
@ -245,17 +252,99 @@
uni.switchTab({ uni.switchTab({
url: "/pages/xiaoxi/index" url: "/pages/xiaoxi/index"
}) })
}else{
// uni.sendSocketMessage({
// data: JSON.stringify({event: 3, "room_id": obj.room_id, "to_id": obj.from_user_data.fromUserId,'from_id':0})
// });
} }
} }
}) })
} }
}
if(obj.type>=8){
if(uni.getStorageSync("userInfo").id == obj.sellerId){
if(obj.type == 12){
uni.$emit("watchEvent",obj)
}
if(obj.type == 9){
if(obj.userMsgVoice == 1){
uni.$emit("playAudio")
}
if(obj.userMsgShock == 1){
uni.vibrateLong({
complete: function (res) {
console.log('success',res);
}
});
}
uni.showModal({
title: '温馨提示',
content: '来自'+obj.userNickname+"发起的视频匹配，是否同意",
cancelText: '拒绝',
confirmText: '同意',
success: res => {
if(res.confirm){
console.log(obj, uni.getStorageSync("userInfo"))
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: obj.userId,
type: 10,
"topic":"message"
})})
if(uni.getStorageSync("userInfo").id == obj.sellerId){
console.log("toChat",uni.getStorageSync("userInfo").id , obj.userId)
uni.navigateTo({
url: "/pages/pipei/shipin/detail?type=2&id="+obj.userId
})
}
}else{ }else{
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: obj.userId,
type: 11,
"topic":"message"
})})
}
},
fail: () => {},
complete: () => {}
});
}
if(obj.type == 8){
if(obj.userMsgVoice == 1){
uni.$emit("playAudio")
}
if(obj.userMsgShock == 1){
uni.vibrateLong({
complete: function (res) {
console.log('success',res);
}
});
}
uni.showModal({
title: '温馨提示',
content: '来自'+obj.userNickname+"发起的语音匹配，是否同意",
cancelText: '拒绝',
confirmText: '同意',
success: res => {
if(res.confirm){
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: data.id,
type: 10,
"topic":"message"
})})
}else{
uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id,
sellerId: data.id,
type: 11,
"topic":"message"
})})
}
},
fail: () => {},
complete: () => {}
});
}
}
} }
} }
}); });

315
pages/pipei/shipin/detail.nvue
Unescape View File

@ -1,41 +1,86 @@
<template> <template>
<view class="room" :style="{'width': winWidth+'px', 'height': winHeight+'px'}"> <view class="room" :style="{'width': winWidth+'px', 'height': winHeight+'px'}">
<view class="room-hd"> <view class="room-navbar" :style="{'width': winWidth+'px', 'height': (statusBarHeight+44)+'px'}">
<zego-remote-view class="video-view" :style="{'width': winWidth+'px', 'height': winHeight+'px'}" :streamID="sellerStreamId"></zego-remote-view> <view class="navbar" :style="{'width': winWidth+'px', 'margin-top': (statusBarHeight)+'px'}">
<zego-local-view class="shitu"></zego-local-view> <view class="back" @click="onBack()">
<image class="img" src="@/static/arrow-left.png"></image>
</view> </view>
<view class="title" :style="{'width': winWidth+'px'}"><text class="txt">{{title}}</text></view>
<view class="room-fd" :style="{'width': winWidth+'px'}"> </view>
</view>
<view v-if="type == 2 || type == 4">
<view class="room-hd" v-if="isToggle">
<zego-local-view class="video-view" :style="{'width': winWidth+'px', 'height': winHeight+'px'}"></zego-local-view>
<zego-remote-view class="shitu" :streamID="sellerStreamId" :style="{'top': (statusBarHeight+60)+'px'}"></zego-remote-view>
</view>
<view class="room-hd" v-else>
<zego-remote-view class="video-view" :streamID="sellerStreamId" :style="{'width': winWidth+'px', 'height': winHeight+'px'}"></zego-remote-view>
<zego-local-view class="shitu" :style="{'top': (statusBarHeight+60)+'px'}"></zego-local-view>
</view>
</view>
<view class="room-bd" :style="{'width': winWidth+'px', 'height': winHeight+'px'}" v-if="type == 1 || type == 3">
<image class="pic" src="@/static/yuyin-bg.png"></image>
</view>
<view class="room-fd" v-if="type==1 || type==3" :style="{'width': winWidth+'px'}" >
<view class="item"> <view class="item">
<view class="pic"> <view class="pic" @click="toggleYuyin()">
<image class="pimg" src="@/static/yuyin-01-on.png"></image> <image v-if="isYuyin" class="pimg" src="@/static/yuyin-01.png"></image>
<image v-else class="pimg" src="@/static/yuyin-01-on.png"></image>
</view> </view>
<view class="txt"><text>开启</text></view>
</view> </view>
<view class="item"> <view class="item">
<view class="pic"> <view class="pic">
<image class="pimg" src="@/static/yuyin-02.png"></image> <image v-if="isJieshou" @click="toGuaduan()" class="pimg" src="@/static/yuyin-02.png"></image>
<image v-else class="pimg" @click="toJieshou()" src="@/static/yuyin-05.png"></image>
</view>
</view>
<view class="item">
<view class="pic" @click="toggleYangsheng()">
<image class="pimg" v-if="isYangshengqi" src="@/static/yuyin-03.png"></image>
<image class="pimg" v-else src="@/static/yuyin-03-on.png"></image>
</view>
</view>
</view>
<view class="room-fd" v-if="type==2 || type==4" :style="{'width': winWidth+'px'}" >
<view class="item">
<view class="pic" @click="toggleYuyin()">
<image v-if="isYuyin" class="pimg" src="@/static/yuyin-01.png"></image>
<image v-else class="pimg" src="@/static/yuyin-01-on.png"></image>
</view>
</view>
<view class="item">
<view class="pic" @click="toggleYangsheng()">
<image class="pimg" v-if="isYangshengqi" src="@/static/yuyin-03.png"></image>
<image class="pimg" v-else src="@/static/yuyin-03-on.png"></image>
</view> </view>
<view class="txt"><text>开启</text></view>
</view> </view>
<view class="item"> <view class="item">
<view class="pic" @click="toggleShexiang()">
<image class="pimg" v-if="isShexiang" src="@/static/yuyin-04.png"></image>
<image class="pimg" v-else src="@/static/yuyin-04-on.png"></image>
</view>
</view>
</view>
<view class="room-fd1" v-if="type==2 || type==4" :style="{'width': winWidth+'px'}" >
<view class="items">
<view class="pic"> <view class="pic">
<image class="pimg" src="@/static/yuyin-03.png"></image> <image v-if="isJieshou" @click="toGuaduan()" class="pimg" src="@/static/yuyin-02.png"></image>
<image v-else class="pimg" @click="toJieshou()" src="@/static/yuyin-05.png"></image>
</view> </view>
<view class="txt"><text>开启</text></view> <image class="off" @click="toggleHuamian()" src="@/static/yuyin-off.png"></image>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
let timer = null;
import api from '@/api/index.js' import api from '@/api/index.js'
import permision from "@/js_sdk/wa-permission/permission.js" import permision from "@/js_sdk/wa-permission/permission.js"
//导入 ZEGO Express SDK //导入 ZEGO Express SDK
import ZegoExpressEngine from '@/uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/lib/ZegoExpressEngine'; import ZegoExpressEngine from '@/uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/lib/ZegoExpressEngine';
import ZegoRemoteView from "@/uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoRemoteView"; import ZegoRemoteView from "@/uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoRemoteView";
import ZegoLocalView from "@/uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoLocalView"; import ZegoLocalView from "@/uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoLocalView";
let roomConfig = {}; let roomConfig = {};
roomConfig.isUserStatusNotify = true; roomConfig.isUserStatusNotify = true;
const profile = { const profile = {
@ -50,11 +95,18 @@
}, },
data() { data() {
return { return {
isYuyin: true,
isGuaduan: true,
isYangshengqi: true,
isShexiang: true,
isJieshou: true,
isToggle: true,
winWidth: 0, winWidth: 0,
winHeight: 0, winHeight: 0,
userInfo: {}, userInfo: {},
playStreamId: "", playStreamId: "",
title: "视频语音", title: "",
count: 0,
background: { background: {
// 导航栏背景图 // 导航栏背景图
background: 'url(https://api.lyiyuan.cn/profile/upload/static/yuyin-bg.png) center top no-repeat', background: 'url(https://api.lyiyuan.cn/profile/upload/static/yuyin-bg.png) center top no-repeat',
@ -63,20 +115,35 @@
}, },
engine: null, engine: null,
roomId: "", roomId: "",
sellerStreamId: "" type: 2,
statusBarHeight: 0,
sellerStreamId: "",
viewModeIndex: 0,
isCamera: true
} }
}, },
onLoad(o) { onLoad(o) {
this.id = o.id; this.id = o.id;
this.type=o.type; this.type=o.type;
this.title = (this.type == 2||this.type == 4)?"语音通话":"视频通话",
this.isShexiang = (this.type == 2 || this.type == 4)?true:false
this.winWidth = uni.getSystemInfoSync().windowWidth; this.winWidth = uni.getSystemInfoSync().windowWidth;
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
this.winHeight = uni.getSystemInfoSync().windowHeight; this.winHeight = uni.getSystemInfoSync().windowHeight;
}, },
mounted() { async onReady() {
this.toPermission(); const that = this;
}, uni.onSocketMessage(function (res) {
methods: { const obj = res.data?JSON.parse(res.data):{};
async toPermission() { console.log(obj)
if(obj.topic == 'message'){
if(obj.type == 12){
if(uni.getStorageSync("userInfo").id == obj.sellerId){
that.toGuaduan(1)
}
}
}
})
// #ifdef APP-PLUS // #ifdef APP-PLUS
if (uni.getSystemInfoSync().platform === "android") { if (uni.getSystemInfoSync().platform === "android") {
const res = await permision.requestAndroidPermission( const res = await permision.requestAndroidPermission(
@ -89,13 +156,76 @@
return ; return ;
} }
// #endif // #endif
if(this.type <= 2){
this.toPermission();
}
},
methods: {
onBack() {
const that = this;
uni.showModal({
title: "温馨提示",
content: "是否要退出房间？",
confirmColor: "#000000",
success(res) {
if(res.confirm){
that.isGuaduan = false
that.toGuaduan();
}
}
})
},
toGuaduan(type) {
if(type !=1){
uni.$emit("duanYinship",{
"userId": uni.getStorageSync("userInfo").id,
sellerId: this.id,
type: 12,
"topic":"message",
})
}
clearInterval(timer)
this.isGuaduan = false
/** 停止推流 */
this.engine?.stopPublishingStream();
/** 停止本地预览 */
this.engine?.stopPreview();
/** 停止拉流 */
this.engine?.stopPlayingStream(this.sellerStreamId);
/** 退出房间 */
this.engine?.logoutRoom(this.roomId);
/** 销毁引擎 */
ZegoExpressEngine.destroyEngine();
uni.navigateBack({
delta: 1
})
},
toJieshou() {
this.toPermission();
},
toggleYuyin() {
this.isYuyin = !this.isYuyin;
this.engine.muteMicrophone(this.isYuyin)
},
toggleShexiang() {
this.isShexiang = !this.isShexiang;
this.engine.enableCamera(this.isShexiang)
},
toggleHuamian() {
this.isCamera = ! this.isCamera
this.engine.useFrontCamera(this.isCamera)
},
toggleYangsheng() {
this.isYangshengqi = ! this.isYangshengqi
this.engine.setAudioRouteToSpeaker(this.isCamera)
},
async toPermission() {
this.getUserInfo(); this.getUserInfo();
}, },
//查询个人信息 //查询个人信息
async getUserInfo() { async getUserInfo() {
const { code, data , msg} = await api.findUserInfo({userId: uni.getStorageSync("userInfo").id}); const { code, data , msg} = await api.findUserInfo({userId: uni.getStorageSync("userInfo").id});
if(code == 200){ if(code == 200){
console.log("getUserInfo",data)
this.userInfo = data; this.userInfo = data;
this.loginRoom(); this.loginRoom();
}else{ }else{
@ -116,11 +246,11 @@
// 获取token传入 // 获取token传入
roomConfig.token = res.data.token; roomConfig.token = res.data.token;
this.playStreamId = res.data.userStreamId; this.playStreamId = res.data.userStreamId;
this.sellerStreamId = res.data.userStreamId; this.sellerStreamId = res.data.sellerStreamId;
this.roomId = res.data.roomId; this.roomId = res.data.roomId;
console.log("loginRoom11",res.data) console.log("loginRoom11",res.data)
this.engine = await ZegoExpressEngine.createEngineWithProfile(profile); this.engine = await ZegoExpressEngine.createEngineWithProfile(profile);
this.engine.enableCamera(this.type == 1?true:false) this.engine.enableCamera(this.isShexiang)
this.engine.enableEffectsBeauty(true); this.engine.enableEffectsBeauty(true);
// 创建美颜参数对象 // 创建美颜参数对象
@ -132,7 +262,7 @@
beautyParam.sharpenIntensity = this.userInfo.reserved8; beautyParam.sharpenIntensity = this.userInfo.reserved8;
// 设置美颜参数 // 设置美颜参数
this.engine.setEffectsBeautyParam(beautyParam); this.engine.setEffectsBeautyParam(beautyParam);
this.engine.useFrontCamera(true) this.engine.useFrontCamera(this.isCamera)
// 以下为常用的房间相关回调 // 以下为常用的房间相关回调
this.engine.on('roomStateUpdate', (roomID, state, errorCode, extendedData) => { this.engine.on('roomStateUpdate', (roomID, state, errorCode, extendedData) => {
console.log("roomStateUpdate",roomID) console.log("roomStateUpdate",roomID)
@ -141,7 +271,7 @@
this.engine.on('roomUserUpdate', (roomID, updateType, userList) => { this.engine.on('roomUserUpdate', (roomID, updateType, userList) => {
// 用户状态更新，登录房间后，当房间内有用户新增或删除时，SDK会通过该回调通知 // 用户状态更新，登录房间后，当房间内有用户新增或删除时，SDK会通过该回调通知
console.log("roomUserUpdate",roomID,userList) console.log("roomUserUpdate",roomID,updateType,userList)
}); });
this.engine.on('playerStateUpdate', (roomID, updateType, streamList) => { this.engine.on('playerStateUpdate', (roomID, updateType, streamList) => {
@ -149,7 +279,7 @@
// 调用拉流接口成功后，当拉流器状态发生变更，如出现网络中断导致推流异常等情况，SDK在重试拉流的同时，会通过该回调通知 // 调用拉流接口成功后，当拉流器状态发生变更，如出现网络中断导致推流异常等情况，SDK在重试拉流的同时，会通过该回调通知
}); });
this.engine.on('roomStreamUpdate', (roomID, updateType, streamList) => { this.engine.on('roomStreamUpdate', (roomID, updateType, streamList) => {
console.log("playerStateUpdate",streamList) console.log("roomStreamUpdate",updateType,streamList)
// 流状态更新，登录房间后，当房间内有用户新推送或删除音视频流时，SDK会通过该回调通知 // 流状态更新，登录房间后，当房间内有用户新推送或删除音视频流时，SDK会通过该回调通知
// this.sellerStreamId = streamList[0].streamID; // this.sellerStreamId = streamList[0].streamID;
}); });
@ -167,44 +297,88 @@
}, },
roomConfig roomConfig
); );
// this.viewModeIndex = ZegoViewMode.AspectFit;
this.engine.startPreview(); this.engine.startPreview();
this.engine.startPublishingStream(this.playStreamId); this.engine.startPublishingStream(this.playStreamId);
this.isJieshou = true;
clearInterval(timer);
that.title = that.formatFun(that.count)
timer = setInterval(()=>{
that.count ++;
that.title = that.formatFun(that.count)
},1000)
setTimeout(()=>{ setTimeout(()=>{
this.toTuiliu() this.toTuiliu()
},100) },100)
} }
}, },
formatFun(num){
let str = "",h,m,s;
h=Math.floor(num/3600);
m=Math.floor((num-h*3600)/60);
s=(num-h*3600-m*60);
str = (h<=9?'0'+h:h)+":"+(m<=9?'0'+m:m)+":"+(s<=9?'0'+s:s)
return str;
},
toTuiliu() { toTuiliu() {
const that = this; const that = this;
console.log(this.sellerStreamId) console.log("toTuiliu",this.sellerStreamId)
that.engine.startPlayingStream(this.sellerStreamId); that.engine.startPlayingStream(this.sellerStreamId);
ZegoExpressEngine.instance().on("playerStateUpdate", (streamID, state, errorCode, extendedData) => { ZegoExpressEngine.instance().on("playerStateUpdate", (streamID, state, errorCode, extendedData) => {
/** 调用拉流接口成功后，当拉流器状态发生变更，如出现网络中断导致推流异常等情况，SDK在重试拉流的同时，会通过该回调通知 */ /** 调用拉流接口成功后，当拉流器状态发生变更，如出现网络中断导致推流异常等情况，SDK在重试拉流的同时，会通过该回调通知 */
console.log("playerStateUpdate",streamID)
console.log("playerStateUpdate",roomID)
}); });
} }
}, },
onBackPress() { onBackPress() {
uni.sendSocketMessage({data:JSON.stringify({ if(this.isGuaduan){
"userId": uni.getStorageSync("userInfo").id, this.toGuaduan();
type: 11, }
"topic":"message"
})})
/** 停止推流 */
this.engine?.stopPublishingStream();
/** 停止本地预览 */
this.engine?.stopPreview();
/** 停止拉流 */
this.engine?.stopPlayingStream(this.sellerStreamId);
/** 退出房间 */
this.engine?.logoutRoom(this.roomId);
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.room{ .room{
&-navbar{
height: 44px;
position: fixed;
left: 0;
top: 0;
z-index: 22;
display: flex;
flex-direction: row;
.navbar{
flex-direction: row;
height: 44px;
line-height: 44px;
position: relative;
text-align: center;
font-size: 30px;
.txt{
font-size: 20px;
color: #ffffff;
}
.title{
display: flex;
align-items: center;
justify-content: center;
}
.back{
width: 50px;
height: 44px;
position: absolute;
left: 15px;
top: 10px;
z-index: 1;
.img{
width: 20px;
height: 20px;
}
}
}
}
&-hd{ &-hd{
flex-direction: column; flex-direction: column;
position: relative; position: relative;
@ -213,17 +387,24 @@
height: 300rpx; height: 300rpx;
border-radius: 10rpx; border-radius: 10rpx;
overflow: hidden; overflow: hidden;
position: fixed; position: absolute;
right: 20rpx; right: 20rpx;
top: 150rpx; top: 120rpx;
z-index: 1222; z-index: 12;
}
}
&-hd{
.pic{
width: 100%;
height: 100%;
display: block;
} }
} }
&-fd{ &-fd{
height: 220rpx; height: 220rpx;
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 40rpx; bottom: 180rpx;
z-index: 44; z-index: 44;
flex-direction: row; flex-direction: row;
.item{ .item{
@ -244,7 +425,6 @@
.pic{ .pic{
width: 130rpx; width: 130rpx;
height: 130rpx; height: 130rpx;
background-color: rgba(0, 0, 0,0.36);
border-radius: 50%; border-radius: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -258,6 +438,47 @@
} }
} }
}
&-fd1{
height: 220rpx;
position: fixed;
left: 0;
bottom: 40rpx;
z-index: 44;
flex-direction: row;
flex-wrap: wrap;
.items{
flex: 1;
margin-top: 70rpx;
position: relative;
flex-direction: row;
display: flex;
justify-content: center;
align-items: center;
.pic{
width: 130rpx;
height: 130rpx;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
margin: 0 auto;
margin-bottom: 10rpx;
.pimg{
width: 130rpx;
height: 130rpx;
}
}
.off{
width: 49rpx;
height: 44rpx;
position: absolute;
right: 200rpx;
z-index: 2;
top: 50rpx;
}
}
} }
} }
</style> </style>

1
pages/pipei/shipin/index.vue
Unescape View File

@ -171,7 +171,6 @@
if(code == 200){ if(code == 200){
this.isSucess = 2; this.isSucess = 2;
this.info = data this.info = data
console.log("userSpeedDating",data)
uni.sendSocketMessage({data:JSON.stringify({ uni.sendSocketMessage({data:JSON.stringify({
"userId": uni.getStorageSync("userInfo").id, "userId": uni.getStorageSync("userInfo").id,
sellerId: data.id, sellerId: data.id,

2
pages/user/index.vue
Unescape View File

@ -254,8 +254,6 @@
}) })
} }
}else{
console.log("挂断了")
} }
} }
}); });

2
pages/users/yuyin/index.vue
Unescape View File

@ -215,7 +215,7 @@
name: 'file', name: 'file',
formData: { formData: {
userId: uni.getStorageSync("userInfo").id, userId: uni.getStorageSync("userInfo").id,
voiceTime: that.formatFun2(that.yuyinInfo.voiceTime) voiceTime: that.formatFun2(that.yuyinInfo.voiceTime)+1
}, },
complete: (res) => { complete: (res) => {
console.log({ console.log({

2
pages/xiaoxi/index.vue
Unescape View File

@ -111,8 +111,6 @@
} }
that.getList() that.getList()
} }
}else{
console.log("挂断了")
} }
} }
}); });

BIN
static/arrow-left.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

2
uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoLocalView.nvue
Unescape View File

@ -13,7 +13,7 @@
props: { props: {
viewMode: { viewMode: {
type: Number, type: Number,
default: ZegoViewMode.AspectFit default: ZegoViewMode.ScaleToFill
}, },
channel: { channel: {
type: Number, type: Number,

2
uni_modules/zego-ZegoExpressUniApp-JS/components/zego-ZegoExpressUniApp-JS/zego-view/ZegoRemoteView.nvue
Unescape View File

@ -12,7 +12,7 @@
props: { props: {
viewMode: { viewMode: {
type: Number, type: Number,
default: ZegoViewMode.AspectFit default: ZegoViewMode.ScaleToFill
}, },
canvasType: { canvasType: {
type: Number, type: Number,

612
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

3
unpackage/dist/dev/app-plus/app-view.js vendored
Unescape View File

@ -4983,8 +4983,7 @@ var render = function () {
_vm._v( _vm._v(
_vm._$g("41-" + $31, "t0-0") + _vm._$g("41-" + $31, "t0-0") +
"岁/" + "岁/" +
_vm._$g("41-" + $31, "t0-1") + _vm._$g("41-" + $31, "t0-1")
"cm"
), ),
] ]
), ),

880
unpackage/dist/dev/app-plus/pages/pipei/shipin/detail.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
unpackage/dist/dev/app-plus/static/arrow-left.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

Write Preview
Loading…
Cancel
Save