From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
third-zxing/src/main/res/layout/activity_capture.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/third-zxing/src/main/res/layout/activity_capture.xml b/third-zxing/src/main/res/layout/activity_capture.xml
index 66698cd..48c5581 100644
--- a/third-zxing/src/main/res/layout/activity_capture.xml
+++ b/third-zxing/src/main/res/layout/activity_capture.xml
@@ -6,7 +6,6 @@
android:background="#636363">
-
<RelativeLayout
android:id="@+id/top_bar_view"
android:layout_width="match_parent"
@@ -20,8 +19,7 @@
android:layout_width="56dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:orientation="horizontal"
- >
+ android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
@@ -29,8 +27,7 @@
android:layout_gravity="center"
android:layout_marginLeft="16dp"
android:scaleType="centerInside"
- android:src="@drawable/back"
- />
+ android:src="@drawable/back" />
</LinearLayout>
<!--2.鏍囬鏂囨湰-->
@@ -73,8 +70,8 @@
<SurfaceView
android:id="@+id/capture_preview"
- android:layout_width="367dp"
- android:layout_height="367dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:layout_centerInParent="true"
/>
--
Gitblit v1.8.0