更新即时通讯相关功能

MingGaoApp/App.vue

@@ -147,11 +147,12 @@
 						this.$store.commit('updateMessageList', val.data)
 
 					} else if (val.action == 'recv_video') {
-						console.warn('recv_video---------------- 1', val.data)
-						if (this.$store.state.isVideoCallRefused) {
-							this.$store.commit('updateIsRefusedCall', false)
-							return
-						}
+						console.warn('recv_video---------------- 1', val.data, this.$store.state
+							.isVideoCallRefused)
+						// if (this.$store.state.isVideoCallRefused) {
+						// 	this.$store.commit('updateIsRefusedCall', false)
+						// 	return
+						// }
 
 						// this.$store.state.video = val.data
 						this.$store.commit('updateIsRefusedCall', false)
@@ -166,7 +167,7 @@
 								data: JSON.stringify(obj),
 								async success(res) {
 
-									console.warn('占线消息发送成功1111', val.data)
+									console.warn('占线消息发送成功1111', obj)
 								}
 							});
 							return
@@ -193,10 +194,10 @@
 						}, 1500)
 					} else if (val.action == 'send_video_rsp') {
 						console.warn('recv_video---------------- response', val.data)
-						if (this.$store.state.isVideoCallRefused) {
-							this.$store.commit('updateIsRefusedCall', false)
-							return
-						}
+						// if (this.$store.state.isVideoCallRefused) {
+						// 	this.$store.commit('updateIsRefusedCall', false)
+						// 	return
+						// }
 
 						this.$store.commit('updateIsRefusedCall', false)
 						// if(this.)
@@ -219,7 +220,7 @@
 							}
 						})
 					} else if (val.action == 'reject_video_rsp') {
-						console.warn('reject_video_rsp','挂断 拒接')
+						console.warn('reject_video_rsp', '挂断 拒接')
 						// 被拒绝后挂断视频通话
 						this.$store.commit('updateIsRefusedCall', true)
 					} else if (val.action == 'occupy_rsp') {
@@ -229,13 +230,14 @@
 					} else if (val.action == 'ok') {
 						this.start(); // 心跳机制
 					} else if (val.action == 'error') {
-						if (val.data.code == 403) {
+						console.log('action error')
+						if (val.code == 403 || val.data && val.data.code == 403) {
 
 							this.close();
 							uni.setStorageSync('session_key', '')
 							if (!this.$store.state.isInLoginPage) {
 
-								uni.$u.totast(val.data.data && val.data.data.error_info ||'用户在其他地方登陆，请重新登陆')
+								uni.$u.totast(val.data.data && val.data.data.error_info || '用户在其他地方登陆，请重新登陆')
 								setTimeout(() => {
 									uni.navigateTo({
 										url: "/pages/login/login"

MingGaoApp/components/task-tabs/task-tabs.vue

@@ -53,6 +53,7 @@
 		justify-content: space-between;
 		padding: 0 14rpx;
 		margin-left: -80rpx;
+		background-color: #fff;
 
 		&::before {
 			content: '';

MingGaoApp/pages/index/components/EntrapmentAdd.vue

@@ -34,7 +34,7 @@
 				</u--input>
 				<!-- #endif -->
 				<view class="entrapment-form__close" @click="selectdelold(item,index)"
-					v-if="baseinfo.taskStatus==='处理中'">
+					v-if="baseinfo.taskStatus==='处理中' && baseinfo.comtype">
 					<uni-icons type="clear"></uni-icons>
 				</view>
 			</view>
@@ -68,7 +68,7 @@
 				<!-- #ifdef APP-NVUE -->
 				</u--input>
 				<!-- #endif -->
-				<view class="entrapment-form__close" @click="selectdel(index)">
+				<view class="entrapment-form__close" @click="selectdel(index)" v-if="baseinfo.comtype">
 					<uni-icons type="clear"></uni-icons>
 				</view>
 			</view>

MingGaoApp/pages/response/video.nvue

@@ -450,8 +450,13 @@
 				}
 
 				var that = this
-				that.engine.logoutRoom(that.videoObj.room_id); // 退出房间
-				that.$refs.uToast.show({
+				
+				if(!that.videoObj.room_id){
+					return 
+				}
+				
+				this.engine.logoutRoom(that.videoObj.room_id); // 退出房间
+				this.$refs.uToast.show({
 					type: 'default',
 					message: isRefused ? '对方正忙' : '结束视频通话！',
 				})
@@ -485,6 +490,12 @@
 
 					if (isNotice) {
 						console.log(this.videoObj, 'is notice')
+						
+						if(!that.currentReceiveUserID){
+							console.warn('当前连接的用户不存在，不是本人发起的通话.')
+							return 
+						}
+						
 						const socketData = {
 							action: 'reject_video', // 动作标识，必填
 							recv_user_id: that.currentReceiveUserID, // 接收人用户id， 非必填
@@ -538,12 +549,10 @@
 		},
 
 		async onLoad(optinos) {
-
+			console.log('onload -------------- 1213')
 			if (this.isVideoCallRefused) {
-				that.$refs.uToast.show({
-					type: 'default',
-					message: '对方正忙',
-				})
+				
+				uni.$u.toast('对方正忙')
 
 				setTimeout(() => {
 					this.handleBack();

MingGaoApp/unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/42d686f0-b349-11ed-be79-1f258e2e555f
+https://ide.dcloud.net.cn/build/download/3b32b850-b9aa-11ed-b646-51ebc4a57636

MingGaoApp/util/url.js

@@ -1,6 +1,6 @@
 export default {
-	baseUrl: process.env.NODE_ENV === 'development' ? "http://114.115.147.140:12345" : "https://www.yhswjc.com",
-	wsUrl:process.env.NODE_ENV === 'development' ? "ws://114.115.147.140:12345" : "wss://www.yhswjc.com",
+	// baseUrl: process.env.NODE_ENV === 'development' ? "http://114.115.147.140:12345" : "https://www.yhswjc.com",
+	// wsUrl:process.env.NODE_ENV === 'development' ? "ws://114.115.147.140:12345" : "wss://www.yhswjc.com",
 	// baseUrl:"https://yfznscd.com"
 	// baseUrl:"https://www.toreskj.com"
 	// baseUrl:"https://www.yhswjc.com"
@@ -8,6 +8,6 @@ export default {
 	// wsUrl:"ws://192.168.1.52:12345",
 	// baseUrl:"http://192.168.1.77:12345",
 	// baseUrl:"https://www.toreskj.com",
-	// baseUrl:"http://114.115.147.140:12345",
-	// wsUrl:"ws://114.115.147.140:12345",
+	baseUrl:"http://114.115.147.140:12345",
+	wsUrl:"ws://114.115.147.140:12345",
 }