From e79ced190337222c7475409363c8071c976c7de9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 06 五月 2024 10:03:04 +0800
Subject: [PATCH] 1.修复两个工程因layout名字一样导致的bug
---
baselibrary/src/main/res/layout/password_dialog.xml | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/baselibrary/src/main/res/layout/password_dialog.xml b/baselibrary/src/main/res/layout/password_dialog.xml
index 97e7ee7..1e0163c 100644
--- a/baselibrary/src/main/res/layout/password_dialog.xml
+++ b/baselibrary/src/main/res/layout/password_dialog.xml
@@ -7,35 +7,41 @@
android:orientation="vertical">
<LinearLayout
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_margin="@dimen/dialog_bg_margin"
+ android:padding="5dp"
android:background="@drawable/base_bg_dialog_top_stroke"
android:gravity="center"
- android:orientation="vertical"
- android:padding="20dp">
+ android:orientation="vertical">
<EditText
android:id="@+id/pw_et"
- android:layout_width="300dp"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
+ android:layout_marginRight="20dp"
+ android:background="@drawable/editbg"
android:hint="璇疯緭鍏ョ鐞嗗瘑鐮�"
- android:textColor="#000000"
- android:inputType="textPassword" />
+ android:inputType="textPassword"
+ android:paddingLeft="15dp"
+ android:textColor="#000000" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2px"
+ android:layout_marginTop="20dp"
+ android:background="@color/line_bg" />
<TextView
android:id="@+id/pw_ok"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
- android:background="@drawable/base_login_btn"
- android:paddingBottom="5dp"
- android:paddingLeft="15dp"
- android:paddingRight="15dp"
- android:paddingTop="5dp"
- android:text="纭"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dialog_btn_height"
+ android:gravity="center"
+ android:text="纭� 璁�"
+ android:textColor="@color/dialog_btn"
android:textSize="@dimen/text_size" />
</LinearLayout>
--
Gitblit v1.8.0