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
---
app/src/main/res/layout/activity_fast_scan.xml | 102 ++++++++++++++++++---------------------------------
1 files changed, 36 insertions(+), 66 deletions(-)
diff --git a/app/src/main/res/layout/activity_fast_scan.xml b/app/src/main/res/layout/activity_fast_scan.xml
index 27f462d..584335a 100644
--- a/app/src/main/res/layout/activity_fast_scan.xml
+++ b/app/src/main/res/layout/activity_fast_scan.xml
@@ -3,79 +3,20 @@
android:id="@+id/new_capture_rl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#636363">
+ android:background="#00000000">
- <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_manual_connection"
- 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" />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerInParent="true"
+ android:background="#60000000" />
<RelativeLayout
android:id="@+id/new_capture_crop_view"
- android:layout_width="367dp"
- android:layout_height="367dp"
+ android:layout_width="300dp"
+ android:layout_height="300dp"
android:layout_centerInParent="true"
android:background="@drawable/scan_capture">
@@ -105,4 +46,33 @@
android:layout_marginBottom="13dp"
android:background="@drawable/fast_scan_light_close" />
+
+ <RelativeLayout
+ android:id="@+id/new_top_bar_view"
+ android:layout_width="match_parent"
+ android:layout_height="52dp"
+ android:layout_marginTop="@dimen/dp_22"
+ 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>
+
+
+ </RelativeLayout>
+
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0