From 4f12f1e3543fce41e71ae9e21a782f8d9cb41947 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 10:45:11 +0800
Subject: [PATCH] Merge branch '1.3.1' into dev
---
app/src/main/res/layout/fragment_home_page.xml | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 6b82695..4e296a1 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -37,8 +37,8 @@
android:src="@drawable/add" />
</RelativeLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
- android:id="@+id/srl"
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
+ android:id="@+id/rsl"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_10"
@@ -51,7 +51,7 @@
android:id="@+id/sl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="@dimen/dp_26">
+ android:layout_marginTop="@dimen/dp_10">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -807,6 +807,9 @@
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
+ android:ellipsize="end"
+ android:maxWidth="72dp"
+ android:maxLines="1"
android:text="13.14"
android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
@@ -860,6 +863,9 @@
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
+ android:ellipsize="end"
+ android:maxWidth="72dp"
+ android:maxLines="1"
android:text="13.14"
android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
@@ -915,6 +921,9 @@
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
+ android:ellipsize="end"
+ android:maxWidth="72dp"
+ android:maxLines="1"
android:text="13.14"
android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
@@ -952,7 +961,21 @@
</ScrollView>
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
+
+ <!-- <androidx.constraintlayout.widget.Guideline-->
+ <!-- android:id="@+id/guideline2"-->
+ <!-- android:layout_width="wrap_content"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- android:orientation="horizontal"-->
+ <!-- app:layout_constraintGuide_begin="20dp" />-->
+
+ <!-- <androidx.constraintlayout.widget.Guideline-->
+ <!-- android:id="@+id/guideline3"-->
+ <!-- android:layout_width="wrap_content"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- android:orientation="vertical"-->
+ <!-- app:layout_constraintGuide_begin="20dp" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0