From ecbe68b56e1ed965395d6716818e2aef148bbb8e Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 四月 2017 11:23:34 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/build/intermediates/res/merged/debug/layout/main.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/res/merged/debug/layout/main.xml b/VisitFace/RtspNativeCodec/app/build/intermediates/res/merged/debug/layout/main.xml
index f46c1a9..4e3303d 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/res/merged/debug/layout/main.xml
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/res/merged/debug/layout/main.xml
@@ -42,7 +42,23 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
+
+ <ImageView
+ android:id="@+id/addface_image"
+ android:layout_width="128px"
+ android:layout_height="128px"
+ android:src="@android:drawable/ic_input_add" />
+ <Button
+ android:id="@+id/addface_native"
+ android:text="@string/addface_native"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ />
+
</LinearLayout>
+
+
+
<LinearLayout
android:orientation="horizontal"
@@ -56,11 +72,11 @@
android:layout_height="wrap_content"
android:padding="10dip"
/>
+
<SurfaceView
android:id="@+id/surfaceview1"
android:layout_width="640px"
- android:layout_height="480px"
- />
+ android:layout_height="480px" />
</LinearLayout>
<LinearLayout
--
Gitblit v1.8.0