From 7562541202056446945028026f1cbc64bb2407db Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 14:49:07 +0800
Subject: [PATCH] 2024年06月25日14:48:56
---
third-zxing/src/main/res/layout/activity_capture.xml | 183 ++++++++++++++++++++++++---------------------
1 files changed, 97 insertions(+), 86 deletions(-)
diff --git a/third-zxing/src/main/res/layout/activity_capture.xml b/third-zxing/src/main/res/layout/activity_capture.xml
index 48c5581..4c7ebbf 100644
--- a/third-zxing/src/main/res/layout/activity_capture.xml
+++ b/third-zxing/src/main/res/layout/activity_capture.xml
@@ -1,93 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/capture_container"
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#636363">
+ android:layout_height="match_parent">
-
- <RelativeLayout
- android:id="@+id/top_bar_view"
- android:layout_width="match_parent"
- android:layout_height="52dp"
- android:background="#245EC3"
- android:orientation="horizontal">
-
- <!--1.杩斿洖鎸夐挳 澧炲ぇ鐐瑰嚮鍖哄煙-->
- <LinearLayout
- android:id="@+id/top_back_ll"
- android:layout_width="56dp"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
- <ImageView
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:layout_marginLeft="16dp"
- android:scaleType="centerInside"
- android:src="@drawable/back" />
- </LinearLayout>
-
- <!--2.鏍囬鏂囨湰-->
- <TextView
- android:id="@+id/top_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:layout_marginLeft="60dp"
- android:layout_marginRight="60dp"
- android:fontFamily="sans-serif-medium"
- android:gravity="center"
- android:maxLines="1"
- android:text="蹇�熸壂鐮�"
- android:textColor="#FFFFFFFF"
- android:textSize="18sp" />
-
- <!--3.鏇村鎸夐挳 榛樿闅愯棌-->
- <LinearLayout
- android:id="@+id/top_more_btn"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentEnd="true"
- android:gravity="center_vertical"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/top_more_iv"
- android:layout_width="28dp"
- android:layout_height="28dp"
- android:layout_marginStart="20dp"
- android:layout_marginEnd="20dp"
- android:adjustViewBounds="true"
- android:scaleType="centerInside"
- android:visibility="gone" />
-
- </LinearLayout>
-
- </RelativeLayout>
+ <!-- <include
+ android:id="@+id/top_bar"
+ layout="@layout/toolbar"/>-->
<SurfaceView
android:id="@+id/capture_preview"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_centerInParent="true"
-
/>
-
<RelativeLayout
- android:id="@+id/capture_crop_view"
- android:layout_width="367dp"
- android:layout_height="367dp"
- android:layout_centerInParent="true"
- android:background="@drawable/scan_capture">
+ android:id="@+id/capture_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ >
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="367dp"
- android:layout_marginTop="182dp">
+ android:layout_height="50dp"
+ >
+
+ <RelativeLayout
+ android:id="@+id/rl_back"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="32dp">
+
+ <TextView
+ android:id="@+id/tv_text_cancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:text="@string/scan_cancel"
+ android:textColor="#ffffff"
+ android:textSize="18sp" />
+ </RelativeLayout>
+
+ <TextView
+ android:id="@+id/tv_text_scan"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="@string/scan_title"
+ android:textColor="#ffffff"
+ android:textSize="18sp" />
+
+ </RelativeLayout>
+
+
+ <ImageView
+ android:id="@+id/capture_mask_top"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_above="@+id/capture_crop_view"
+ android:background="@drawable/ic_shadow"/>
+
+ <ImageView
+ android:id="@+id/capture_mask_bottom"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_below="@+id/capture_crop_view"
+ android:background="@drawable/ic_shadow"/>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/capture_mask_bottom"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@+id/capture_mask_top"
+ android:layout_toLeftOf="@+id/capture_crop_view"
+ android:background="@drawable/ic_shadow"/>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/capture_mask_bottom"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/capture_mask_top"
+ android:layout_toRightOf="@+id/capture_crop_view"
+ android:background="@drawable/ic_shadow"/>
+
+ <RelativeLayout
+ android:id="@+id/capture_crop_view"
+ android:layout_width="267dp"
+ android:layout_height="267dp"
+ android:layout_centerInParent="true"
+ android:background="@drawable/scan_capture">
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="267dp"
+ android:layout_below="@+id/capture_mask_top"
+ android:layout_centerInParent="true">
<ImageView
android:id="@+id/capture_scan_line"
@@ -99,16 +111,15 @@
android:src="@drawable/scan_line" />
</RelativeLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/capture_crop_view"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:text=""
+ android:textColor="#ffffffff"
+ android:textSize="14sp"/>
</RelativeLayout>
-
- <ImageView
- android:id="@+id/light_iv"
- android:layout_width="127dp"
- android:layout_height="127dp"
- android:layout_alignParentBottom="true"
- android:layout_centerInParent="true"
- android:layout_marginBottom="13dp"
- android:background="@drawable/fast_scan_light_close" />
-
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0