From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。

---
 ZigbeeApp/GateWay.Droid/Resources/layout/zxing_layout.xml |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Resources/layout/zxing_layout.xml b/ZigbeeApp/GateWay.Droid/Resources/layout/zxing_layout.xml
new file mode 100755
index 0000000..54437c8
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Resources/layout/zxing_layout.xml
@@ -0,0 +1,58 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent">
+
+      <GateWay.Droid.ZXingOverlayView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"/>
+    <RelativeLayout
+    android:layout_width="fill_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="top"
+    android:background="#99000000">
+<!--
+    <ImageButton
+        android:id="@+id/capture_imageview_back"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_centerVertical="true"
+        android:background="@drawable/abc_ic_ab_back_material"/>
+-->
+    <TextView
+        android:id="@+id/tv_zxing_scan"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textColor="#ffffffff"
+        android:textSize="20sp"
+        android:text="鎵竴鎵�"/>
+
+</RelativeLayout>
+
+  <TextView
+      android:id="@+id/tv_zxing_back"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textColor="#FFFFFF"
+      android:textSize="18sp"
+      android:paddingLeft="10dp"
+      android:paddingBottom="10dp"
+      android:text="@android:string/cancel"
+      android:layout_alignParentLeft ="true"
+      android:layout_alignParentBottom="true"/>
+  <TextView
+      android:id="@+id/tv_zxing_flash"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textSize="18sp"
+      android:textColor="#FFFFFF"
+      android:paddingRight="10dp"
+      android:paddingBottom="10dp"
+      android:text="闂厜鐏�"
+      android:layout_alignParentRight ="true"
+      android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
+

--
Gitblit v1.8.0