From a1ac20d9cbe90b566bffe3ed39a6e07700c3248f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 19 六月 2023 10:30:06 +0800
Subject: [PATCH] Merge branch 'wjc'
---
app/src/main/res/layout/activity_fast_scan.xml | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 104 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/activity_fast_scan.xml b/app/src/main/res/layout/activity_fast_scan.xml
index ce5b771..66cbe7f 100644
--- a/app/src/main/res/layout/activity_fast_scan.xml
+++ b/app/src/main/res/layout/activity_fast_scan.xml
@@ -1,9 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/new_capture_rl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ui.device.FastScanActivity">
+ android:background="#636363">
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+ <RelativeLayout
+ android:id="@+id/new_top_bar_view"
+ android:layout_width="match_parent"
+ android:layout_height="52dp"
+ android:background="#245EC3"
+ android:orientation="horizontal">
+
+ <!--1.杩斿洖鎸夐挳 澧炲ぇ鐐瑰嚮鍖哄煙-->
+ <LinearLayout
+ android:id="@+id/new_top_back_btn"
+ 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/new_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/new_top_more_btn"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/new_top_connect_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="20dp"
+ android:layout_marginEnd="20dp"
+ android:text="@string/device_鎵嬪姩杩炴帴"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ </LinearLayout>
+
+ </RelativeLayout>
+
+ <SurfaceView
+ android:id="@+id/new_capture_preview"
+ android:layout_width="367dp"
+ android:layout_height="367dp"
+ android:layout_centerInParent="true" />
+
+ <RelativeLayout
+ android:id="@+id/new_capture_crop_view"
+ android:layout_width="367dp"
+ android:layout_height="367dp"
+ android:layout_centerInParent="true"
+ android:background="@drawable/scan_capture">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="367dp"
+ android:layout_marginTop="182dp">
+
+ <ImageView
+ android:id="@+id/new_capture_scan_line"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
+ android:src="@drawable/scan_line" />
+ </RelativeLayout>
+
+ </RelativeLayout>
+
+ <ImageView
+ android:id="@+id/new_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