From 70f86244ae512b987a3b4b316b4f1a133a4d2117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 8 Nov 2023 16:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidPrivacy.json                         |   2 +-
 manifest.json                               |  16 +-
 pages/Industrialbutler/Industrialbutler.vue |   2 +-
 pages/Industrialbutler/video.nvue           | 225 ++++----------------
 pages/login/login.vue                       |   1 -
 5 files changed, 50 insertions(+), 196 deletions(-)

diff --git a/androidPrivacy.json b/androidPrivacy.json
index 12df862..0d726ca 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,3 +1,3 @@
 {
-    "prompt": "template"
+    "prompt" : "template"
 }
diff --git a/manifest.json b/manifest.json
index 3114413..69f9e8a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "xinelu-doctor-app",
     "appid" : "__UNI__9BA7A08",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -85,9 +85,17 @@
     "mp-weixin" : {
         "appid" : "",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "es6" : true,
+            "minified" : true,
+            "postcss" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取当前所在位置"
+            }
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true
diff --git a/pages/Industrialbutler/Industrialbutler.vue b/pages/Industrialbutler/Industrialbutler.vue
index 3abd435..8d7a3db 100644
--- a/pages/Industrialbutler/Industrialbutler.vue
+++ b/pages/Industrialbutler/Industrialbutler.vue
@@ -42,7 +42,7 @@
 		methods: {
 			govideo() {
 				uni.navigateTo({
-					url: `./video?roomId=${this.roomId}&userId=${this.userId}&userName=${this.userName}&userSig=${this.userSig}`
+					url: `./video?roomId=${this.roomId}&userId=${this.userId}&userName=${this.userName}&userSig=${this.userSig}&remoteUserId=${this.item.patientId}`
 				})
 			},
 			getUserSig() {
diff --git a/pages/Industrialbutler/video.nvue b/pages/Industrialbutler/video.nvue
index b7aeb7d..42d9511 100644
--- a/pages/Industrialbutler/video.nvue
+++ b/pages/Industrialbutler/video.nvue
@@ -1,20 +1,20 @@
 <template>
 	<div class="trtc-container">
 		<view class="trtc-video-area">
-			<view class="trtc-video-view" id='root'>
-				<trtc-local-view :viewId="userId" style="height:400rpx;flex: 1"></trtc-local-view>
+			<view class="trtc-video-view1" id='root'>
+				<trtc-local-view :viewId="userId"></trtc-local-view>
 			</view>
-			<view class="trtc-video-view">
-				<trtc-remote-view v-if="remoteUserId" :userId="remoteUserId" :viewId="remoteUserId"
-					style="height:400rpx;flex: 1">
+			<view class="trtc-video-view2">
+				<trtc-remote-view v-if="remoteUserId" :userId="remoteUserId" :viewId="remoteUserId">
 				</trtc-remote-view>
 			</view>
-			<image class="imgbtn" @click="leave" src="@/static/leave.png"></image>
 		</view>
+		<image class="imgbtn" @click="leave" src="@/static/leave.png"></image>
 	</div>
 </template>
 <script>
 	import permision from "@/TrtcCloud/permission.js";
+	import TrtcCloud from '@/TrtcCloud/lib/index';
 	import {
 		TRTCAppScene,
 		TRTCVideoStreamType,
@@ -24,7 +24,7 @@
 	} from '@/TrtcCloud/lib/TrtcDefines';
 	import TrtcLocalView from '@/TrtcCloud/view/TrtcLocalView';
 	import TrtcRemoteView from '@/TrtcCloud/view/TrtcRemoteView';
-	import TrtcCloud from '@/TrtcCloud/lib/index';
+
 	export default {
 		components: {
 			TrtcLocalView: TrtcLocalView,
@@ -42,10 +42,10 @@
 		onLoad(options) {
 			this.roomId = options.roomId
 			this.userId = options.userId
-			this.remoteUserId = options.userId
 			this.userName = options.userName
 			this.userSig = options.userSig
-			console.log(this.userSig, this.userId, this.roomId)
+			this.remoteUserId = options.remoteUserId
+			console.log(this.userSig, this.userId, this.roomId, this.remoteUserId)
 		},
 		onShow() {},
 		onBackPress() {
@@ -62,6 +62,12 @@
 			join() {
 				// 创建 TRTC 的对象实例
 				this.trtcCloud = TrtcCloud.createInstance();
+				this.trtcCloud.on('onWarning', (res) => {
+					console.log('- onWarning: ', JSON.stringify(res));
+				});
+				this.trtcCloud.on('onError', (res) => {
+					console.log('- onError: ', JSON.stringify(res));
+				});
 				// 组装 TRTC 进房参数，请将 TRTCParams 中的各字段都替换成您自己的参数
 				// Please replace each field in TRTCParams with your own parameters
 				const params = {
@@ -73,57 +79,25 @@
 				};
 				// 如果您的场景是“在线直播”，请将应用场景设置为 TRTC_APP_SCENE_LIVE
 				// If your application scenario is a video call between several people, please use "TRTC_APP_SCENE_LIVE"
-				this.trtcCloud.on('onWarning', (res) => {
-					console.log('- onWarning: ', JSON.stringify(res));
-					uni.showToast({
-						title: `onWarning: ${JSON.stringify(res)}`,
-						icon: 'none',
-					});
-				});
-				this.trtcCloud.on('onError', (res) => {
-					console.log('- onError: ', JSON.stringify(res));
-					uni.showToast({
-						title: `error: ${JSON.stringify(res)}`,
-						icon: 'none',
-					});
-				});
-				// 打开摄像头预览
-				//打开麦克风采集
 				this.trtcCloud.enterRoom(params, TRTCAppScene.TRTCAppSceneVideoCall);
-				this.trtcCloud.startLocalAudio(TRTCAudioQuality.TRTCAudioQualityDefault);
-				this.trtcCloud.startLocalPreview(true, this.userId);
 				// 进入房间
-				this.trtcCloud.on('onEnterRoom', (result) => {
-					console.log(`- onEnterRoom = ${result}`);
+				this.trtcCloud.on("onEnterRoom", (result) => {
 					if (result > 0) {
-						uni.showToast({
-							title: `进房成功，耗时: ${result}ms`,
-							icon: 'none',
-						});
-					} else {
-						console.log(`enter room failed，error code = ${result}`);
+						console.log('进房成功');
 					}
 				});
+				// 打开摄像头预览
+				this.trtcCloud.startLocalPreview(true, this.userId);
+				//打开麦克风采集
+				this.trtcCloud.startLocalAudio(TRTCAudioQuality.TRTCAudioQualityDefault);
 				// 播放远端视频流
 				this.trtcCloud.startRemoteView(this.remoteUserId, TRTCVideoStreamType.TRTCVideoStreamTypeBig, this
 					.remoteUserId);
-				this.trtcCloud.on('onExitRoom', (reason) => {
-					const reasonList = ['主动调用 exitRoom 退房', '被服务器踢出当前房间', '当前房间整个被解散'];
-					uni.showToast({
-						title: `退房 ${reasonList[reason]}`,
-						icon: 'none',
-						duration: 1000
-					});
-				});
-				this.trtcCloud.on('onFirstVideoFrame', (res) => {
-					console.log(`渲染的首帧画面响应 = ${JSON.stringify(res)}`);
+				this.trtcCloud.on('onRemoteUserEnterRoom', (userId) => {
+					console.log('remote user enter room id ', userId);
 				});
 				// 视频状态变化通知
-				this.trtcCloud.on("onRemoteUserEnterRoom", (userId) => {
-					console.log(`远端进房: userId = ${userId}`);
-				});
 				this.trtcCloud.on('onUserVideoAvailable', (res) => {
-					console.log(res)
 					const {
 						userId,
 						available
@@ -177,156 +151,29 @@
 		height: 43rpx;
 		position: absolute;
 		bottom: 20rpx;
-		left: 290rpx
+		left: 290rpx;
+		z-index: 99999;
 	}
 
 	.trtc-container {
-		background-color: #F4F4F4;
+		width: 100%;
+		height: 100vh;
 	}
 
-	.trtc-log-view {
-		position: fixed;
-		background-color: #000000;
-		height: 76.92rpx;
-		left: 0;
-		right: 0;
-	}
-
-	.trtc-log-fold-btn {
-		position: fixed;
-		right: 0;
-		width: 100rpx;
-		height: 50rpx;
-	}
-
-	.trtc-log-text {
-		width: 750rpx;
-		font-size: 23.07rpx;
-		line-height: 40rpx;
-		color: #FFFFFF;
-	}
-
-	.trtc-row-area {
-		flex-direction: row;
-		margin-left: 36.53rpx;
-		margin-right: 36.53rpx;
-		margin-top: 17.3rpx;
-		margin-bottom: 17.3rpx;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.trtc-input {
-		background-color: #FFFFFF;
-		border-radius: 9.61rpx;
-		border-color: #BBBBBB;
-		border-width: 1.92rpx;
-		border-style: solid;
-		color: #101010;
-		font-size: 26.92rpx;
-		height: 46.15rpx;
-		padding-left: 9.61rpx;
-	}
-
-	.trtc-video-area {
-		flex-direction: row;
-		flex: 1;
-		flex-wrap: wrap;
-	}
-
-	.trtc-local-view {}
-
-	.trtc-video-view {
+	.trtc-video-view1 {
 		border-width: 1.92rpx;
 		border-color: #BBBBBB;
-		/* background-color: #FFFFFF; */
-		height: 403.84rpx;
-		flex: 1;
+		height: 500rpx;
+		width: 300rpx;
+		position: fixed;
+		top: 20rpx;
+		right: 20rpx;
 	}
 
-	.trtc-video-remote-view {
+	.trtc-video-view2 {
 		border-width: 1.92rpx;
 		border-color: #BBBBBB;
-		/* background-color: #FFFFFF; */
-		height: 403.84rpx;
-		width: 375rpx;
-	}
-
-	.trtc-video-btn {
-		position: fixed;
-		background-color: #52C2FF;
-		color: #FFF;
-		font-size: 26.92rpx;
-		bottom: 11.53rpx;
-		height: 57.69rpx;
-		left: 17.3rpx;
-		right: 17.3rpx;
-	}
-
-	.trtc-video-text {
-		position: fixed;
-		margin-top: 90.38rpx;
-		font-size: 26.92rpx;
-		text-align: center;
-	}
-
-	.trtc-line {
-		background-color: #BBBBBB;
-		height: 1.92rpx;
-		flex: 1;
-	}
-
-	.trtc-title-container {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-around;
-		margin-top: 10rpx;
-	}
-
-	.trtc-title-text {
-		color: #101010;
-		font-size: 26.92rpx;
-	}
-
-	.trtc-btn-long {
-		font-size: 26.92rpx;
-		background-color: #2985FF;
-		border-color: #A3D0FD;
-		border-width: 1.92rpx;
-		margin-left: 42.3rpx;
-		margin-right: 42.3rpx;
-		margin-top: 20rpx;
-		color: #FFF;
-	}
-
-	.trtc-btn-mid {
-		background-color: #2985FF;
-		border-color: #A3D0FD;
-		color: #FFF;
-		font-size: 26.92rpx;
-		width: 292.3rpx;
-		height: 55.76rpx;
-	}
-
-	.trtc-btn-short {
-		background-color: #52C2FF;
-		border-color: #A3D0FD;
-		color: #FFF;
-		font-size: 19.23rpx;
-		width: 75rpx;
-		height: 38.46rpx;
-	}
-
-	.trtc-conent-text {
-		color: #AEAEAE;
-		font-size: 19.23rpx;
-	}
-
-	.picker-view {
-		padding: 15rpx 25rpx;
-		line-height: 50rpx;
-		font-size: 26.92rpx;
-		background: #FFF;
-		flex: 1;
+		height: 70%;
+		width: 100%;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index dc1d9dc..05747e1 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -37,7 +37,6 @@
 	export default {
 		data() {
 			return {
-				title: 'Hello',
 				personAccount: 'wangxiaoyan',
 				personPassword: 'Ww851108.',
 				form: {