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
---
qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml | 70 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin_setup.xml b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
similarity index 78%
rename from qihealonelibrary/src/main/res/layout/activity_admin_setup.xml
rename to qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
index 81cc81a..a3c6bc3 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_setup.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
@@ -22,6 +22,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginTop="20dp"
android:orientation="vertical">
<LinearLayout
@@ -30,30 +31,57 @@
android:layout_height="wrap_content">
<TextView
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_weight="1"
android:text="@string/eq_no"
android:textSize="@dimen/new_card_size" />
<EditText
android:id="@+id/admin_serial"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/edt_height"
+ android:layout_weight="2"
+ android:background="@drawable/editbg"
android:inputType="number"
android:maxLength="11"
+ android:paddingLeft="10dp"
android:textSize="@dimen/new_card_size" />
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/chose_address_code"
+ style="@style/newCardLL"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/address_code"
+ android:textSize="@dimen/new_card_size" />
+
+ <EditText
+ android:id="@+id/admin_address_code"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/edt_height"
+ android:layout_weight="2"
+ android:background="@drawable/editbg"
+ android:inputType="number"
+ android:paddingLeft="10dp"
+ android:textSize="@dimen/new_card_size" />
+ </LinearLayout>
<LinearLayout
android:id="@+id/chose_address"
style="@style/newCardLL"
- android:visibility="gone"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -66,29 +94,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="璇风偣鍑婚�夋嫨"
-
android:textSize="@dimen/new_card_size" />
</LinearLayout>
-
- <LinearLayout
- android:id="@+id/chose_address_code"
- style="@style/newCardLL"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/address_code"
- android:textSize="@dimen/new_card_size" />
-
- <EditText
- android:id="@+id/admin_address_code"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
-
</LinearLayout>
@@ -105,14 +112,5 @@
android:text="纭� 瀹�"
android:textSize="@dimen/text_size" />
- <com.wang.avi.AVLoadingIndicatorView
- android:id="@+id/avi"
- style="@style/AVLoadingIndicatorView"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
- android:visibility="gone"
- app:indicatorColor="@color/title_bg"
- app:indicatorName="BallClipRotatePulseIndicator" />
+
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0