Merge commit 'a3df920503cc34606777e77b1bc87016b68b2a7b'

App.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 	// #ifdef APP-PLUS
 	import { setSdkLanguageFromSystem } from '@/uni_modules/tuikit-atomic-x/utils/setSdkLanguageFromSystem'
-	import * as call from "@/uni_modules/RongCloud-CallWrapper/lib/index"
+	// import * as call from "@/uni_modules/RongCloud-CallWrapper/lib/index"
 	// #endif
 	import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
 	import { reLaunch } from './utils/router'
@@ -42,7 +42,7 @@
 
 		// #ifdef APP-PLUS
 		setSdkLanguageFromSystem()
-		onAllListeners()
+		// onAllListeners()
 		// #endif
 	})
 
@@ -61,120 +61,7 @@
 		console.log('App Hide333')
 	})
 	
-	function onAllListeners () {
-		call.onCallReceived( (res)=> {
-			console.log(res)
-			console.log("Engine:OnCallReceived=>"+"监听通话呼入, 目标id=>", res.data.targetId);
-			if (res.data.targetId) {
-				// let url = res.data.mediaType == 0 ? "" : "/pages/room/room"
-				uni.setStorageSync('room-parameters', {
-					callType: 'in',
-					mediaType: res.data.mediaType === 0 ? 'audio' : 'video'
-				});
-				uni.showToast({
-					title:"有通话呼入该跳转了"+res.data.targetId,
-					duration:3000
-				})
-				navigateTo("/pages/room/incom", {
-					type: res.data.extra,
-					callType: 'in',
-					mediaType: res.data.mediaType == 0 ? "audio" : "video",
-					userID: res.data.mine.userId // 对方的用户id
-				})
-			}
-		});
-		call.onCallDisconnected((res)=>{
-			console.log(res)
-			console.log("Engine:OnCallDisconnected=>"+"通话挂断/拒绝, 挂断原因=>", res.data.reason);
-			// 重新渲染视频视图
-			// uni.$emit('OnCallDisconnected');
-			uni.showToast({
-				title:reasonDeal(res.data.reason),
-				error:"error",
-				icon:'none',
-				duration:2000
-			})
-			goback()
-		});
-		call.onCallConnected((res)=>{
-			console.log(res)
-			console.log("Engine:OnCallConnected=>"+"已建立通话通话接通时，通过回调 onCallConnected 通知当前 call 的详细信息", res);
-		});
-		call.onRemoteUserInvited((res)=>{
-			console.log("Engine:OnRemoteUserInvited=>"+"通话中的某一个参与者，邀请好友加入通话 ,远端Id为=>", res.data.userId);
-			uni.$emit('OnCallConnected');
-		})
-		call.onRemoteUserJoined((res)=>{
-			console.log("Engine:OnRemoteUserJoined=>"+"主叫端拨出电话，被叫端收到请求后，加入通话，对端Id为=>", res.data.userId);
-			uni.$emit('OnCallConnected');
-		})
-		call.onRemoteUserLeft((res)=>{
-			console.log("Engine:OnRemoteUserLeft=>"+"远端用户挂断(群聊触发)，远端Id为=>", res.data.reason);
-			uni.$emit('OnCallConnected');
-			uni.showToast({
-				title:reasonDeal(res.data.reason),
-				error:"error",
-				icon:'none',
-				duration:2000
-			})
-		})
-		call.onCallOutgoing((res)=>{
-			console.log('电话已拨出 主叫端拨出电话后，通过回调 onCallOutgoing 通知当前 call 的详细信息')
-		})
-		call.onRemoteUserRinging((res)=>{
-			console.log('被叫端正在振铃，主叫端拨出电话，被叫端收到请求，发出振铃响应时，回调 onRemoteUserRingin,对端Id为=>', res.data.userId)
-		})
-		call.onError((res)=>{
-			console.log('通话过程中，发生异常')
-			uni.showToast({
-				title:errorDeal(res.data.reason),
-				error:"error",
-				icon:'none',
-				duration:2000
-			});
-			goback()
-		})
-		call.onRemoteUserMediaTypeChanged((res)=>{
-			console.log('当通话中的某一个参与者切换通话类型，例如由 audio 切换至 video，回调 onMediaTypeChanged,切换媒体类型的Id为=>',res.data.user.userId);
-		})
-	}
 	
-	function goback () {
-		const pages = getCurrentPages()
-		console.log('pages: ',pages);
-		if (pages.length > 1) {
-			console.log("走返回");
-			uni.showToast({
-				title:"走返回",
-				duration:3000
-			})
-			uni.navigateBack({
-				delta: 1
-			})
-			const currentPage = pages[pages.length - 1]
-			const prevPage = pages[pages.length - 2]
-			
-			// 判断上一页是否是 tabBar 页面
-			// const isPrevPageTabBar = isTabBarPage(currentPage.route)
-			// if(!isPrevPageTabBar){
-				
-			// }
-		}
-	}
-	
-	// 判断页面是否是 tabBar 页面
-	function isTabBarPage(route) {
-		// 这里根据你的 pages.json 配置来判断
-		const tabBarPages = [
-			'TUIKit/components/TUIConversation/index',
-			'TUIKit/components/TUIContact/index',
-			'pages/discover/discover',
-			'pages/my-index/my-index'
-		]
-		
-		// 判断路由是否在 tabBar 页面列表中
-		return tabBarPages.includes(route)
-	}
 	
 	function removeAllListeners(){
 		call.unInit();

manifest.json

@@ -56,7 +56,8 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "debuggable" : true
             },
             /* ios打包配置 */
             "ios" : {

pages/room/incom.vue

@@ -3,83 +3,104 @@
 	<view class="incoming-call">
 		<!-- 背景模糊层 -->
 		<view class="blur-background" v-if="callBackground">
-            <image
+			<image :src="callBackground" mode="aspectFill" class="bg-image"></image>
-                    :src="callBackground"
-                    mode="aspectFill"
-                    class="bg-image"
-            ></image>
 			<view class="bg-overlay"></view>
 		</view>
 
+		<!-- 顶部栏 -->
+		<view class="top-bar">
+			<view class="top-left">
+				<!-- 通话时间显示 -->
+				<view v-if="callState === 'dialogue'" class="call-time-container">
+					<uni-icons type="sound" size="16" color="#fff"></uni-icons>
+					<text class="call-time">{{ formattedTime }}</text>
+				</view>
+			</view>
+		</view>
+
 		<!-- 主内容区 -->
 		<view class="caller-info">
 			<view class="caller-avatar-container">
 				<view class="caller-avatar" :class="{ 'avatar-ring': isRinging }">
-                    <image
+					<image v-if="callerInfo?.avatar" :src="callerInfo?.avatar" class="avatar-image"></image>
-                            v-if="callerInfo?.avatar"
+					<uni-icons v-else type="contact-filled" size="50" color="#fff"></uni-icons>
-                            :src="callerInfo?.avatar"
-                            class="avatar-image"
-                    ></image>
-                    <uni-icons
-                            v-else
-                            type="contact-filled"
-                            size="50"
-                            color="#fff"
-                    ></uni-icons>
 				</view>
 			</view>
 			<text class="caller-name">
 				{{ callerInfo?.nick || callerInfo?.userID }}
 			</text>
 			<text class="call-type">
-                {{ callState === 'call' ? '呼叫中，等待对方接受邀请...' : '对话中...' }}
+				{{ callState === 'call' ? '呼叫中，等待对方接受邀请...' : callState === 'answer' ? '等待接听...' : '对话中...' }}
 			</text>
 			<text class="call-status">{{ mediaType === 'audio' ? "语音通话" : "视频通话" }}</text>
 		</view>
 
 		<!-- 控制按钮 -->
 		<view class="incoming-controls">
+			<!-- 麦克风控制按钮（仅在通话中显示） -->
+			<view v-if="callState === 'dialogue'" class="incoming-control" @click="toggleMicrophone">
+				<view class="call-btn mic-btn" :class="{ 'btn-active': activeBtn === 'mic', 'mic-muted': isMicMuted }">
+					<uni-icons v-if="!isMicMuted" type="mic" size="28" color="#fff"></uni-icons>
+					<uni-icons v-else type="micoff" size="28" color="#fff"></uni-icons>
+				</view>
+				<text class="btn-text">{{ isMicMuted ? '开启' : '静音' }}</text>
+			</view>
+
+			<!-- 挂断/拒绝按钮 -->
 			<view class="incoming-control" @click="cutFn(false)">
-                <view
+				<view class="call-btn decline-btn" :class="{ 'btn-active': activeBtn === 'decline' }">
-                        class="call-btn decline-btn"
-                        :class="{ 'btn-active': activeBtn === 'decline' }"
-                >
 					<uni-icons type="closeempty" size="32" color="#fff"></uni-icons>
 				</view>
 				<text class="btn-text">{{ callState === 'call' || callState == 'dialogue' ? "挂断" : "拒绝" }}</text>
 			</view>
 
-            <view
+			<!-- 接听按钮 -->
-                    v-if="callState === 'answer'"
+			<view v-if="callState === 'answer'" class="incoming-control" @click="cutFn(true)">
-                    class="incoming-control"
+				<view class="call-btn accept-btn" :class="{ 'btn-active': activeBtn === 'accept' }">
-                    @click="cutFn(true)"
+					<uni-icons type="checkmarkempty" size="28" color="#fff"></uni-icons>
-            >
-                <view
-                        class="call-btn accept-btn"
-                        :class="{ 'btn-active': activeBtn === 'accept' }"
-                >
-                    <uni-icons
-                            type="checkmarkempty"
-                            size="28"
-                            color="#fff"
-                    ></uni-icons>
 				</view>
 				<text class="btn-text">接听</text>
 			</view>
+
+			<!-- 扬声器控制按钮（仅在通话中显示） -->
+			<view v-if="callState === 'dialogue'" class="incoming-control" @click="toggleSpeaker">
+				<view class="call-btn speaker-btn" :class="{ 'btn-active': activeBtn === 'speaker', 'speaker-on': isSpeakerOn }">
+					<uni-icons v-if="!isSpeakerOn" type="sound" size="28" color="#fff"></uni-icons>
+					<uni-icons v-else type="sound-filled" size="28" color="#fff"></uni-icons>
+				</view>
+				<text class="btn-text">扬声器</text>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
 	import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
-import { ref, watch } from 'vue'
+	import {
-import { onLoad, onUnload, onHide } from '@dcloudio/uni-app'
+		ref,
-import { TUIUserService } from '@tencentcloud/chat-uikit-engine-lite'
+		watch,
-import { useUI } from '../../utils/use-ui'
+		onUnmounted
-import { navigateBack } from '../../utils/router'
+	} from 'vue'
+	import {
+		onLoad,
+		onUnload,
+		onHide
+	} from '@dcloudio/uni-app'
+	import {
+		TUIUserService
+	} from '@tencentcloud/chat-uikit-engine-lite'
+	import {
+		useUI
+	} from '../../utils/use-ui'
+	import {
+		navigateBack
+	} from '../../utils/router'
 
 
-const { showLoading, hideLoading } = useUI()
+	const {
+		showLoading,
+		hideLoading
+	} = useUI()
 	const callBackground = ref('/static/images/public/random2.png')
 	/** 呼叫用户信息 */
 	const callerInfo = ref({})
@@ -87,6 +108,17 @@ const callerInfo = ref({})
 	const isRinging = ref(true)
 	/** 控制按钮状态 */
 	const activeBtn = ref(null)
+	/** 麦克风是否静音 */
+	const isMicMuted = ref(false)
+	/** 扬声器是否开启 */
+	const isSpeakerOn = ref(false)
+	/** 通话计时器 */
+	const timer = ref(null)
+	/** 通话时长（秒） */
+	const callDuration = ref(0)
+	/** 格式化后的时间 */
+	const formattedTime = ref('00:00')
+
 	/**
 	 * 拨打状态
 	 * call: 发起呼叫
@@ -101,9 +133,10 @@ CallLib.onRemoteUserJoined(res => {
 			res.data.userId
 		)
 		callState.value = 'dialogue'
+		// 开始计时
+		startTimer()
 	})
 
-
 	// CallLib.onRemoteUserRinging(res => {
 	//   console.log(
 	//     '主叫端拨出电话，被叫端收到请求，发出振铃响应时触发，对端Id为=>',
@@ -115,6 +148,48 @@ CallLib.onRemoteUserJoined(res => {
 	//   console.log('通话过程中，发生异常，异常原因=>', res.data.reason)
 	// })
 
+	/** 开始通话计时 */
+	const startTimer = () => {
+		stopTimer() // 先停止之前的计时器
+		timer.value = setInterval(() => {
+			callDuration.value++
+			formatTime()
+		}, 1000)
+	}
+
+	/** 停止通话计时 */
+	const stopTimer = () => {
+		if (timer.value) {
+			clearInterval(timer.value)
+			timer.value = null
+		}
+	}
+
+	/** 格式化时间显示 */
+	const formatTime = () => {
+		const minutes = Math.floor(callDuration.value / 60)
+		const seconds = callDuration.value % 60
+		formattedTime.value = `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`
+	}
+
+	/** 切换麦克风状态 */
+	const toggleMicrophone = () => {
+		isMicMuted.value = !isMicMuted.value
+		// 调用融云SDK的麦克风控制
+		CallLib.enableMicrophone(!isMicMuted.value)
+		activeBtn.value = 'mic'
+		setTimeout(() => activeBtn.value = null, 200)
+	}
+
+	/** 切换扬声器状态 */
+	const toggleSpeaker = () => {
+		isSpeakerOn.value = !isSpeakerOn.value
+		// 调用融云SDK的扬声器控制
+		CallLib.enableSpeaker(isSpeakerOn.value)
+		activeBtn.value = 'speaker'
+		setTimeout(() => activeBtn.value = null, 200)
+	}
+
 	/** 按钮状态 */
 	const cutFn = show => {
 		if (show) {
@@ -124,12 +199,16 @@ const cutFn = show => {
 			}
 			CallLib.accept()
 			callState.value = 'dialogue'
+			// 开始计时
+			startTimer()
 			if (mediaType.value === 'video') {
 				uni.redirectTo({
 					url: "/pages/room/room"
 				})
 			}
 		} else {
+			// 停止计时
+			stopTimer()
 			// 取消接听，返回上一页
 			CallLib.hangup()
 			// navigateBack()
@@ -160,6 +239,14 @@ onLoad(async e => {
 		console.log('===好友信息', res)
 	})
 
+	// 组件卸载时清理计时器
+	onUnload(() => {
+		stopTimer()
+	})
+
+	onUnmounted(() => {
+		stopTimer()
+	})
 </script>
 
 <style lang="scss" scoped>
@@ -175,6 +262,39 @@ onLoad(async e => {
 		justify-content: space-between;
 		background-color: #000;
 
+		/* 顶部栏样式 */
+		.top-bar {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 120rpx;
+			display: flex;
+			align-items: center;
+			padding: 0 40rpx;
+			z-index: 2;
+			box-sizing: border-box;
+			padding-top: env(safe-area-inset-top);
+
+			.top-left {
+				.call-time-container {
+					display: flex;
+					align-items: center;
+					background: rgba(255, 255, 255, 0.15);
+					padding: 8rpx 20rpx;
+					border-radius: 30rpx;
+					backdrop-filter: blur(10px);
+
+					.call-time {
+						font-size: 28rpx;
+						color: #fff;
+						font-weight: 500;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+
 		.blur-background {
 			position: absolute;
 			top: 0;
@@ -251,31 +371,19 @@ onLoad(async e => {
 				font-size: 28rpx;
 				color: rgba(255, 255, 255, 0.7);
 			}
-
-    .call-timer {
-      margin-top: 30rpx;
-      padding: 10rpx 30rpx;
-      background: rgba(255, 255, 255, 0.1);
-      border-radius: 30rpx;
-
-      .timer-text {
-        font-size: 32rpx;
-        color: #fff;
-        font-weight: 500;
-      }
-    }
 		}
 
 		.incoming-controls {
 			display: flex;
 			justify-content: space-around;
-    padding: 80rpx 100rpx 120rpx;
+			padding: 80rpx 40rpx 120rpx;
 			z-index: 1;
 
 			.incoming-control {
 				display: flex;
 				flex-direction: column;
 				align-items: center;
+				min-width: 120rpx;
 
 				.call-btn {
 					width: 120rpx;
@@ -304,49 +412,38 @@ onLoad(async e => {
 							background-color: #06ad56;
 						}
 					}
+
+					&.mic-btn {
+						background-color: rgba(255, 255, 255, 0.2);
+
+						&.mic-muted {
+							background-color: rgba(255, 255, 255, 0.1);
+						}
+
+						&.btn-active {
+							transform: scale(0.9);
+							background-color: rgba(255, 255, 255, 0.3);
+						}
+					}
+
+					&.speaker-btn {
+						background-color: rgba(255, 255, 255, 0.2);
+
+						&.speaker-on {
+							background-color: rgba(255, 255, 255, 0.3);
+						}
+
+						&.btn-active {
+							transform: scale(0.9);
+							background-color: rgba(255, 255, 255, 0.3);
+						}
+					}
 				}
 
 				.btn-text {
-        font-size: 28rpx;
-        color: #fff;
-      }
-    }
-  }
-
-  .action-bar {
-    position: absolute;
-    bottom: 60rpx;
-    left: 0;
-    width: 100%;
-    display: flex;
-    justify-content: space-around;
-    padding: 0 60rpx;
-    z-index: 1;
-
-    .action-item {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-
-      .action-icon {
-        width: 100rpx;
-        height: 100rpx;
-        border-radius: 50%;
-        background-color: rgba(255, 255, 255, 0.2);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-bottom: 20rpx;
-        transition: all 0.3s;
-
-        &.active {
-          background-color: rgba(255, 255, 255, 0.4);
-        }
-      }
-
-      .action-text {
 					font-size: 24rpx;
 					color: #fff;
+					text-align: center;
 				}
 			}
 		}
@@ -369,11 +466,7 @@ onLoad(async e => {
 	/* 响应式调整 */
 	@media (max-height: 600px) {
 		.incoming-controls {
-    padding: 40rpx 100rpx 80rpx !important;
+			padding: 40rpx 30rpx 80rpx !important;
-  }
-
-  .action-bar {
-    bottom: 40rpx !important;
 		}
 	}
 </style>

pages/room/room.nvue

@@ -1,5 +1,15 @@
 <template>
 	<view class="content">
+		<!-- 顶部栏 -->
+		<view class="top-bar">
+			<view class="top-left">
+				<!-- 通话时间显示  -->
+				<view v-if="callState === 'dialogue'" class="call-time-container">
+					<uni-icons type="sound" size="16" color="#fff"></uni-icons>
+					<text class="call-time">{{ formattedTime }}</text>
+				</view>
+			</view>
+		</view>
 		<!-- 单人视频 -->
 		<view v-if="users.length <= 2">
 			<RongCloud-Call-RCUniCallView
@@ -12,7 +22,7 @@
 			></RongCloud-Call-RCUniCallView>
 			<RongCloud-Call-RCUniCallView
 				class="smallVideoView"
-				:style="{ width: 200 + 'upx', height: 200 + 'upx' }"
+				:style="{ width: 400 + 'upx', height: 400 + 'upx' }"
 				ref="smallVideoView"
 			></RongCloud-Call-RCUniCallView>
 		</view>
@@ -111,7 +121,11 @@
 				ruddyVal: 0,
 				buffingVal: 0,
 				brightnessVal: 5,
-				isChecked: false
+				isChecked: false,
+				formattedTime: "00:00",
+				callState: "123",
+				callDuration: 0,
+				timer: null
 			}
 		},
 		onLoad: function () {
@@ -150,6 +164,7 @@
 		},  
 		onUnload() {
 			call.hangup()
+			this.stopTimer()
 		},
 		onHide() {
 			const session = call.getCurrentCallSession()
@@ -158,8 +173,31 @@
 			}
 			uni.$off('OnCallDisconnected')
 			uni.$off('OnCallConnected')
+			this.stopTimer()
 		},
 		methods: {
+			/** 开始通话计时 */
+			startTimer(){
+				this.stopTimer() // 先停止之前的计时器
+				this.timer = setInterval(() => {
+					this.callDuration++
+					this.formatTime()
+				}, 1000)
+			},
+			
+			/** 停止通话计时 */
+			stopTimer(){
+				if (this.timer) {
+					clearInterval(this.timer)
+					this.timer = null
+				}
+			},
+			/** 格式化时间显示 */
+			formatTime(){
+				const minutes = Math.floor(this.callDuration / 60)
+				const seconds = this.callDuration % 60
+				this.formattedTime = `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`
+			},
 			changeMediaType() {
 				if (this.mediaTypeCur == 'video') {
 					this.mediaTypeCur = 'audio'
@@ -369,6 +407,8 @@
 			},
 			
 			processCallSession(){
+				this.callState = "dialogue"
+				this.startTimer()
 				// call.enableSpeaker(true)
 				this.mediaTypeCur = this.mediaType
 				this.currentCallSession = call.getCurrentCallSession()
@@ -473,7 +513,49 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+	.top-bar {
+		position: fixed;
+		top: 30rpx;
+		left: 0;
+		width: 750rpx;
+		height: 120rpx;
+		flex-direction: row;
+		align-items: left;
+		padding-left: 40rpx;
+		padding-right: 40rpx;
+		padding-top: var(--safe-area-inset-top, 0);
+		z-index: 99;
+		box-sizing: border-box;
+		
+		.top-left {
+			width: 140rpx;
+			height: 120rpx;
+			justify-content: center;
+			align-items: left;
+			
+			.call-time-container {
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				background-color: rgba(255, 255, 255, 0.15);
+				padding-left: 20rpx;
+				padding-right: 20rpx;
+				padding-top: 8rpx;
+				padding-bottom: 8rpx;
+				border-radius: 30rpx;
+				/* nvue不支持backdrop-filter，可以改用透明度或移除 */
+				/* backdrop-filter: blur(10px); */
+			}
+			
+			.call-time {
+				font-size: 28rpx;
+				color: #ffffff;
+				font-weight: 500;
+				margin-left: 10rpx;
+			}
+		}
+	}
 	.nav-box {
 		position: fixed;
 		left: 0;

stores/user.js

@@ -68,6 +68,7 @@ import {
 	getRongYunLoginInfo
 } from '../api'
 import permision from "@/js_sdk/wa-permission/permission.js"
+import { navigateTo } from '@/utils/router'
 
 export const useUserStore = defineStore('user', () => {
 	const {
@@ -198,6 +199,7 @@ export const useUserStore = defineStore('user', () => {
 				permision.requestAndroidPermission('android.permission.CAMERA');
 				permision.requestAndroidPermission('android.permission.RECORD_AUDIO');
 			}
+			onAllListeners()
 		});
 		let code = await imEngine.value.connect(tencentUserSig.value.ryToken, 10)
 		if (code != 0) {
@@ -209,6 +211,121 @@ export const useUserStore = defineStore('user', () => {
 		}
 	}
 	
+	function onAllListeners () {
+		CallLib.onCallReceived( (res)=> {
+			console.log(res)
+			console.log("Engine:OnCallReceived=>"+"监听通话呼入, 目标id=>", res.data.targetId);
+			if (res.data.targetId) {
+				// let url = res.data.mediaType == 0 ? "" : "/pages/room/room"
+				uni.setStorageSync('room-parameters', {
+					callType: 'in',
+					mediaType: res.data.mediaType === 0 ? 'audio' : 'video'
+				});
+				uni.showToast({
+					title:"有通话呼入该跳转了"+res.data.targetId,
+					duration:3000
+				})
+				navigateTo("/pages/room/incom", {
+					type: res.data.extra,
+					callType: 'in',
+					mediaType: res.data.mediaType == 0 ? "audio" : "video",
+					userID: res.data.mine.userId // 对方的用户id
+				})
+			}
+		});
+		CallLib.onCallDisconnected((res)=>{
+			console.log(res)
+			console.log("Engine:OnCallDisconnected=>"+"通话挂断/拒绝, 挂断原因=>", res.data.reason);
+			// 重新渲染视频视图
+			// uni.$emit('OnCallDisconnected');
+			uni.showToast({
+				title:reasonDeal(res.data.reason),
+				error:"error",
+				icon:'none',
+				duration:2000
+			})
+			goback()
+		});
+		CallLib.onCallConnected((res)=>{
+			console.log(res)
+			console.log("Engine:OnCallConnected=>"+"已建立通话通话接通时，通过回调 onCallConnected 通知当前 call 的详细信息", res);
+		});
+		CallLib.onRemoteUserInvited((res)=>{
+			console.log("Engine:OnRemoteUserInvited=>"+"通话中的某一个参与者，邀请好友加入通话 ,远端Id为=>", res.data.userId);
+			uni.$emit('OnCallConnected');
+		})
+		CallLib.onRemoteUserJoined((res)=>{
+			console.log("Engine:OnRemoteUserJoined=>"+"主叫端拨出电话，被叫端收到请求后，加入通话，对端Id为=>", res.data.userId);
+			uni.$emit('OnCallConnected');
+		})
+		CallLib.onRemoteUserLeft((res)=>{
+			console.log("Engine:OnRemoteUserLeft=>"+"远端用户挂断(群聊触发)，远端Id为=>", res.data.reason);
+			uni.$emit('OnCallConnected');
+			uni.showToast({
+				title:reasonDeal(res.data.reason),
+				error:"error",
+				icon:'none',
+				duration:2000
+			})
+		})
+		CallLib.onCallOutgoing((res)=>{
+			console.log('电话已拨出 主叫端拨出电话后，通过回调 onCallOutgoing 通知当前 call 的详细信息')
+		})
+		CallLib.onRemoteUserRinging((res)=>{
+			console.log('被叫端正在振铃，主叫端拨出电话，被叫端收到请求，发出振铃响应时，回调 onRemoteUserRingin,对端Id为=>', res.data.userId)
+		})
+		CallLib.onError((res)=>{
+			console.log('通话过程中，发生异常')
+			uni.showToast({
+				title:errorDeal(res.data.reason),
+				error:"error",
+				icon:'none',
+				duration:2000
+			});
+			goback()
+		})
+		CallLib.onRemoteUserMediaTypeChanged((res)=>{
+			console.log('当通话中的某一个参与者切换通话类型，例如由 audio 切换至 video，回调 onMediaTypeChanged,切换媒体类型的Id为=>',res.data.user.userId);
+		})
+	}
+	
+	function goback () {
+		const pages = getCurrentPages()
+		console.log('pages: ',pages);
+		if (pages.length > 1) {
+			console.log("走返回");
+			uni.showToast({
+				title:"走返回",
+				duration:3000
+			})
+			uni.navigateBack({
+				delta: 1
+			})
+			const currentPage = pages[pages.length - 1]
+			const prevPage = pages[pages.length - 2]
+			
+			// 判断上一页是否是 tabBar 页面
+			// const isPrevPageTabBar = isTabBarPage(currentPage.route)
+			// if(!isPrevPageTabBar){
+				
+			// }
+		}
+	}
+	
+	// 判断页面是否是 tabBar 页面
+	function isTabBarPage(route) {
+		// 这里根据你的 pages.json 配置来判断
+		const tabBarPages = [
+			'TUIKit/components/TUIConversation/index',
+			'TUIKit/components/TUIContact/index',
+			'pages/discover/discover',
+			'pages/my-index/my-index'
+		]
+		
+		// 判断路由是否在 tabBar 页面列表中
+		return tabBarPages.includes(route)
+	}
+
 	/**
 	 * 清除用户信息（退出登录）
 	 */