From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/build/intermediates/res/merged/debug/layout/main.xml | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 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 9469a6f..cd3f689 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,29 @@
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"
@@ -63,6 +85,8 @@
android:layout_height="480px" />
</LinearLayout>
+
+
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
@@ -75,11 +99,22 @@
android:layout_height="wrap_content"
android:padding="10dip"
/>
+
+ <SurfaceView
+ android:id="@+id/surfaceview2"
+ android:layout_width="640px"
+ android:layout_height="480px" />
+
<com.example.nativecodec.MyGLSurfaceView
android:id="@+id/glsurfaceview1"
android:layout_width="640px"
- android:layout_height="480px"
- />
+ android:layout_height="480px" />
</LinearLayout>
+ <SurfaceView
+ android:id="@+id/surfaceViewDecoder1"
+ android:layout_width="1920px"
+ android:layout_height="1080px"
+ android:visibility="visible" />
+
</LinearLayout>
--
Gitblit v1.8.0