Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -21,7 +21,7 @@
    <LinearLayout
        android:id="@+id/my_power_station_bottom_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_49"
        android:layout_height="@dimen/dp_64"
        android:background="@drawable/module_13_ffffff"
        android:orientation="horizontal"
        app:layout_constraintBottom_toBottomOf="parent"