From 5265d4d26f006d4a0dab77c49d9d740e0bbb97b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 02 八月 2024 11:55:49 +0800
Subject: [PATCH] 2024年08月02日11:55:40
---
app/src/main/res/layout/fragment_me.xml | 2
app/src/main/res/layout/fragment_house_list.xml | 3 -
app/src/main/res/layout/me_change_password_line.xml | 2
app/src/main/res/layout/activity_home_login.xml | 59 +++++++++++++++++------------
app/src/main/res/layout/fragment_message.xml | 8 ++-
app/src/main/res/layout/activity_power_stations_list.xml | 2
app/src/main/res/layout/activity_message_center_list.xml | 4 -
7 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 687c05c..8c2b73f 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/logo_bj"
-
+ android:scaleType="centerCrop"
tools:context="com.hdl.photovoltaic.ui.LoginActivity">
@@ -243,30 +243,41 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
- <ImageView
- android:id="@+id/home_login_privacy_check_iv"
- android:layout_width="@dimen/dp_20"
- android:layout_height="@dimen/dp_20"
- android:layout_marginStart="@dimen/dp_42"
- android:layout_marginBottom="@dimen/dp_62"
- android:background="@drawable/yesandnoselected"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
- <TextView
- android:id="@+id/home_login_privacy_tv"
- android:layout_width="287dp"
- android:layout_height="@dimen/dp_40"
- android:layout_marginStart="@dimen/dp_6"
- android:gravity="start|center"
- android:singleLine="false"
- android:tag="click"
- android:text="@string/home_login_consent_service_agreement"
- android:textColor="@color/text_FF000000"
- android:textSize="@dimen/text_14"
- app:layout_constraintBottom_toBottomOf="@+id/home_login_privacy_check_iv"
- app:layout_constraintStart_toEndOf="@+id/home_login_privacy_check_iv"
- app:layout_constraintTop_toTopOf="@+id/home_login_privacy_check_iv" />
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:gravity="center"
+ android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/home_login_tv">
+
+ <ImageView
+ android:id="@+id/home_login_privacy_check_iv"
+ android:layout_width="@dimen/dp_20"
+ android:layout_height="@dimen/dp_20"
+ android:background="@drawable/yesandnoselected" />
+
+ <View
+ android:layout_width="@dimen/dp_6"
+ android:layout_height="match_parent" />
+
+ <TextView
+ android:id="@+id/home_login_privacy_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_40"
+ android:layout_marginStart="@dimen/dp_6"
+ android:gravity="start|center"
+ android:singleLine="false"
+ android:tag="click"
+ android:text="@string/home_login_consent_service_agreement"
+ android:textColor="@color/text_FF000000"
+ android:textSize="@dimen/text_14" />
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index fd02bb0..49427e2 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -134,9 +134,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/message_content_rl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
+ android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
diff --git a/app/src/main/res/layout/activity_power_stations_list.xml b/app/src/main/res/layout/activity_power_stations_list.xml
index b34e5e6..e8ddd13 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_list.xml
@@ -15,7 +15,7 @@
android:id="@+id/fragment_house_srl"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginTop="@dimen/dp_10"
+ android:layout_marginTop="@dimen/dp_12"
app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 2661f75..3c6a826 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -300,8 +300,7 @@
android:id="@+id/fragment_house_srl_list_rc"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
+ />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 9e7be5e..8e7e0af 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -35,7 +35,7 @@
android:id="@+id/fragment_me_icon_parent_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_13"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_cl">
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 1148b86..742ac4a 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -241,12 +241,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/message_cl">
+ <!-- android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_16"
+ 搴曢儴闂磋窛
+ -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/message_rcv"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
+ android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
diff --git a/app/src/main/res/layout/me_change_password_line.xml b/app/src/main/res/layout/me_change_password_line.xml
index ddc2d9e..76c444d 100644
--- a/app/src/main/res/layout/me_change_password_line.xml
+++ b/app/src/main/res/layout/me_change_password_line.xml
@@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_24"
+ android:layout_marginTop="@dimen/dp_21"
android:textColor="@color/text_65000000"
android:textSize="@dimen/text_14"
/>
--
Gitblit v1.8.0