From 8ac39f2f962329f30ee61ee8a7abe6d6b5940dd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 13:45:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-LC' into wxr4

---
 HDL-ON_Android/Resources/layout/activity_video_phone.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_Android/Resources/layout/activity_video_phone.xml b/HDL-ON_Android/Resources/layout/activity_video_phone.xml
index e5116dd..2c9e2b4 100644
--- a/HDL-ON_Android/Resources/layout/activity_video_phone.xml
+++ b/HDL-ON_Android/Resources/layout/activity_video_phone.xml
@@ -30,7 +30,8 @@
 			android:text="@string/video_device"/>
 	</RelativeLayout>
 
-	<LinearLayout
+	<FrameLayout
+		android:id="@+id/live_window"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="210"
@@ -48,7 +49,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"/>
 
-	</LinearLayout>
+	</FrameLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"

--
Gitblit v1.8.0