From ad80ce23000b88857d0c012ec7809b1303f47e5c Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 04 七月 2017 17:23:30 +0800
Subject: [PATCH] aaaa
---
VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml b/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml
index 72ae34e..0676720 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml
+++ b/VisitFace/RtspNativeCodec/app/src/main/res/layout/main.xml
@@ -65,52 +65,58 @@
android:text="TextView" />
-
<LinearLayout
- android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dip"
- >
+ android:orientation="horizontal">
+
<RadioButton
android:id="@+id/radio1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="10dip"
- />
+ android:padding="10dip" />
<SurfaceView
android:id="@+id/surfaceview1"
android:layout_width="640px"
android:layout_height="480px" />
- </LinearLayout>
-
-
-
- <LinearLayout
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="8dip"
- >
- <RadioButton
- android:id="@+id/radio2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="10dip"
- />
<SurfaceView
android:id="@+id/surfaceview2"
android:layout_width="640px"
android:layout_height="480px" />
+ <SurfaceView
+ android:id="@+id/surfaceview3"
+ android:layout_width="320px"
+ android:layout_height="240px" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dip"
+ android:orientation="horizontal">
+
+ <RadioButton
+ android:id="@+id/radio2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="10dip" />
+
<com.example.nativecodec.MyGLSurfaceView
android:id="@+id/glsurfaceview1"
android:layout_width="640px"
android:layout_height="480px" />
+
+ <!--<SurfaceView
+ android:id="@+id/surfaceview2"
+ android:layout_width="640px"
+ android:layout_height="480px" />-->
</LinearLayout>
+
<SurfaceView
android:id="@+id/surfaceViewDecoder1"
android:layout_width="1920px"
--
Gitblit v1.8.0