From 21e38bfe17d3077d7ab0e05ee065f59547536692 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 十二月 2024 10:33:19 +0800
Subject: [PATCH] 1.添加当前巡检状态的功能。 2.修复工单界面刷新已完成列表导致未完成列表数据被清除的bug
---
app/src/main/res/layout/activity_login.xml | 88 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 77 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 20d17fe..20ac86a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -14,19 +14,22 @@
android:layout_above="@+id/psLL"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
- android:layout_marginBottom="20dp"
+ android:layout_marginBottom="10dp"
android:background="@drawable/ic_edt_gray_bg"
android:hint="璇疯緭鍏ヨ处鍙�"
- android:paddingLeft="15dp" />
+ android:maxLines="1"
+ android:text="admin"
+ android:paddingLeft="15dp"
+ android:singleLine="true" />
<RelativeLayout
android:id="@+id/psLL"
android:layout_width="match_parent"
android:layout_height="45dp"
- android:layout_above="@+id/loginBtn"
+ android:layout_above="@+id/codeLL"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
- android:layout_marginBottom="30dp"
+ android:layout_marginBottom="10dp"
android:background="@drawable/ic_edt_gray_bg"
android:gravity="center"
android:orientation="horizontal">
@@ -36,21 +39,73 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
+ android:layout_margin="5dp"
android:layout_toLeftOf="@+id/passwordBtn"
android:background="@color/white"
android:hint="璇疯緭鍏ュ瘑鐮�"
android:inputType="textPassword"
- android:paddingLeft="15dp"
- />
+ android:maxLines="1"
+ android:text="dyyjy"
+ android:paddingLeft="10dp"
+ android:singleLine="true" />
<ImageView
android:id="@+id/passwordBtn"
android:layout_width="40dp"
android:layout_height="25dp"
- android:src="@drawable/vt_ps_close"
- android:layout_marginRight="5dp"
android:layout_alignParentRight="true"
- android:layout_centerVertical="true" />
+ android:layout_centerVertical="true"
+ android:layout_marginRight="5dp"
+ android:src="@drawable/vt_ps_close" />
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/codeLL"
+ android:layout_width="match_parent"
+ android:layout_height="45dp"
+ android:layout_above="@+id/loginBtn"
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginBottom="15dp"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:visibility="gone">
+
+ <EditText
+ android:id="@+id/code"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_centerVertical="true"
+ android:layout_toLeftOf="@+id/codeImg"
+ android:background="@drawable/ic_edt_gray_bg"
+ android:gravity="center"
+ android:hint="璇疯緭鍏ラ獙璇佺爜"
+ android:inputType="number"
+ android:maxLines="1"
+ android:singleLine="true" />
+
+ <ImageView
+ android:id="@+id/codeImg"
+ android:layout_width="150dp"
+ android:layout_height="35dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="5dp" />
+
+ <TextView
+ android:id="@+id/codeError"
+ android:layout_width="120dp"
+ android:layout_height="35dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="5dp"
+ android:background="@drawable/ic_edt_gray_bg"
+ android:gravity="center"
+ android:text="鑾峰彇澶辫触\n鐐瑰嚮閲嶈瘯"
+ android:textSize="10sp"
+ android:visibility="gone" />
+
+
</RelativeLayout>
<TextView
@@ -60,12 +115,23 @@
android:layout_alignParentBottom="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
- android:layout_marginBottom="50dp"
- android:background="@drawable/ic_blue_background"
+ android:layout_marginBottom="40dp"
+ android:background="@drawable/btn_ripple"
android:gravity="center"
android:text="鐧� 褰�"
android:textColor="@color/white"
android:textSize="20sp" />
+ <TextView
+ android:id="@+id/version"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginRight="20dp"
+ android:text="V1.0"
+ android:textColor="@color/white"
+ android:textSize="15sp"
+ />
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0