Merge branch 'dev' into feature/v1.4.1

mac

2024-06-05 31de722a45e886eae89cfea2f1740c1f4d3b0216

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

@@ -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/my_power_station_installed_capacity" />
                            android:text="@string/string_capacity" />

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