From 7d99c9d1c045f31d27676f8907c3b779039d41a2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 23 三月 2017 12:31:04 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/fragment_one.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/fragment_one.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/fragment_one.xml
index 1c727ff..5f3a1f8 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/fragment_one.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/fragment_one.xml
@@ -17,9 +17,9 @@
android:layout_weight="1"
>
<SurfaceView
+ android:id="@+id/surfaceview1"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@mipmap/ic_launcher"/>
+ android:layout_height="match_parent"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/view_size_50"
@@ -52,10 +52,10 @@
android:layout_weight="1"
android:layout_marginLeft="2dp"
>
- <SurfaceView
+ <com.bsk.zhangbo.demoforbsk.widget.MyGLSurfaceView
+ android:id="@+id/surfaceview2"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@mipmap/ic_launcher"/>
+ android:layout_height="match_parent"/>
<RelativeLayout
android:layout_width="match_parent"
@@ -84,6 +84,7 @@
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
--
Gitblit v1.8.0