From 243369fef8970eeb635ff21a22b07b495343a7d0 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 16:31:34 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/build/intermediates/res/merged/debug/layout/main.xml | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 9469a6f..7a3123c 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,8 +42,28 @@
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>
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="match_parent"
+ android:layout_height="90dp"
+ android:text="TextView" />
+
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
--
Gitblit v1.8.0