From c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:11:34 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/res/layout/fragment_home_page.xml | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 19b088c..4e296a1 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -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" />
@@ -954,19 +963,19 @@
</ScrollView>
</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/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.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