Merge branch 'dev' into feature/v1.4.1

mac

2024-06-04 276156837ebca8b8b08a516e61fe105e670375fc

 app/src/main/res/layout/fragment_home_page.xml

@@ -14,7 +14,7 @@
        android:layout_height="@dimen/dp_26"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="58dp"
        android:text="@string/power_shome_page"
        android:text="@string/summarize"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

@@ -146,7 +146,7 @@
                            android:layout_below="@+id/info_rl1_text1_tv"
                            android:layout_alignStart="@+id/info_rl1_text1_tv"
                            android:layout_marginTop="3dp"
                            android:text="@string/installed_capacity" />
                            android:text="@string/string_capacity" />

                        <TextView
                            android:id="@+id/info_rl1_text3_tv"