From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。

---
 ZigbeeApp/GateWay.Droid/Resources/layout/activity_video_phone.xml |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 119 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Resources/layout/activity_video_phone.xml b/ZigbeeApp/GateWay.Droid/Resources/layout/activity_video_phone.xml
new file mode 100755
index 0000000..da56d3e
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Resources/layout/activity_video_phone.xml
@@ -0,0 +1,119 @@
+锘�<?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="#ffffffff"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <LinearLayout        
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="#f5f6fa">
+        
+        <LinearLayout
+            
+		    android:layout_width="match_parent"
+		    android:layout_height="40dp"
+		    android:background="#FFFFFF"
+		    android:gravity="center_vertical"   
+		    android:orientation="vertical"
+		    android:minWidth="25px"
+		    android:minHeight="25px">		
+
+		<ImageView
+			android:id="@+id/icon_back"
+			android:layout_width="35dp"
+			android:layout_height="35dp"
+            android:layout_marginStart="15dp"
+			android:gravity="center"
+			android:scaleType="centerInside"
+			android:src="@drawable/back" />
+	</LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="25dp"
+        android:background="@drawable/video_background"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp"
+                android:gravity="center"
+                android:textColor="#FF000000"
+                android:text="浜屾纭鏈�"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="211"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:id="@+id/localVideo"
+                android:layout_width="1px"
+                android:layout_height="1px"
+                android:visibility="invisible"/>
+            <FrameLayout
+                android:id="@+id/remoteFrame"
+                android:layout_width="match_parent"
+                android:background="#FFFFFF"
+                android:layout_height="match_parent"/>
+           
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="36"
+            android:background="#ff232323"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:src="@drawable/floor"
+                android:layout_marginLeft="20dp"/>
+
+            <TextView
+                android:id="@+id/tv_roomName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:layout_marginLeft="5dp"
+                android:textColor="#FFFFFF"
+                android:text="1鏍�203"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="279"
+            android:orientation="vertical">
+            <LinearLayout
+                android:id="@+id/content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"/>
+           
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

--
Gitblit v1.8.0