From 7e916a6d5541f91c2b746f7e55aedfee8cc4a8fe Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 23 六月 2017 13:38:58 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml b/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml
index 9469a6f..72ae34e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml
+++ b/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml
@@ -25,24 +25,46 @@
</LinearLayout>
<LinearLayout
- android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dip"
- >
+ android:orientation="horizontal">
+
<Button
android:id="@+id/start_native"
- android:text="@string/start_native"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- />
+ android:text="@string/start_native" />
+
<Button
android:id="@+id/rewind_native"
- android:text="@string/rewind_native"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- />
+ android:text="@string/rewind_native" />
+
+ <ImageView
+ android:id="@+id/addface_image"
+ android:layout_width="128px"
+ android:layout_height="128px"
+ android:scaleType="fitCenter"
+ android:src="@android:drawable/ic_input_add" />
+
+ <Button
+ android:id="@+id/addface_native"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/addface_native" />
+
</LinearLayout>
+
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="match_parent"
+ android:layout_height="87dp"
+ 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