From 80faceb86399017851f9f72feaaef868a37ff23f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 10:50:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lss' into temp-wxr

---
 HDL-ON_Android/Resources/layout/activity_video_phone.xml |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/HDL-ON_Android/Resources/layout/activity_video_phone.xml b/HDL-ON_Android/Resources/layout/activity_video_phone.xml
new file mode 100644
index 0000000..e5116dd
--- /dev/null
+++ b/HDL-ON_Android/Resources/layout/activity_video_phone.xml
@@ -0,0 +1,66 @@
+锘�<?xml version="1.0" encoding="UTF-8" ?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="#FFFFFF"
+	android:orientation="vertical">
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="44dp">
+
+		<ImageView
+			android:id="@+id/videoBackImg"
+			android:layout_width="wrap_content"
+			android:layout_height="20dp"
+			android:layout_marginLeft="10dp"
+			android:layout_centerVertical="true"
+			android:contentDescription="@string/video_icon"
+			android:src="@drawable/back_icon"/>
+
+		<TextView
+			android:id="@+id/nameText"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textColor="@color/colorBlack"
+			android:layout_gravity="center_horizontal"
+			android:textSize="@dimen/tipTitleTextSize"
+			android:layout_centerInParent="true"
+			android:text="@string/video_device"/>
+	</RelativeLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="210"
+		android:orientation="vertical"
+		android:background="@drawable/video_background">
+
+		<FrameLayout
+			android:id="@+id/locaVideo"
+			android:layout_width="1px"
+			android:layout_height="1px"
+			android:visibility="invisible"/>
+
+		<FrameLayout
+			android:id="@+id/remoteFrame"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="393"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:id="@+id/content"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="horizontal"/>
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

--
Gitblit v1.8.0