From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
third-zxing/src/main/res/layout/activity_capture.xml | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/third-zxing/src/main/res/layout/activity_capture.xml b/third-zxing/src/main/res/layout/activity_capture.xml
index 417171b..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"
@@ -16,12 +15,11 @@
<!--1.杩斿洖鎸夐挳 澧炲ぇ鐐瑰嚮鍖哄煙-->
<LinearLayout
- android:id="@+id/top_back_btn"
+ android:id="@+id/top_back_ll"
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