Merge branch 'heads/v1.4.2'

mac

2024-10-21 8f5fe758de9464a5118bd306814c170b768fe695

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

@@ -6,37 +6,45 @@
    android:layout_height="match_parent"
    android:background="@drawable/bj"
    tools:context=".ui.home.HomePageFragment">

    <TextView
        android:id="@+id/home_page_title_tv"
        style="@style/Text20Style"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_26"
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/title_cl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="58dp"
        android:text="@string/summarize"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <ImageView
        android:id="@+id/home_page_station_add_iv"
        android:layout_width="@dimen/dp_31"
        android:layout_height="@dimen/dp_31"
        android:layout_marginTop="53dp"
        android:layout_marginEnd="@dimen/dp_24"
        android:src="@drawable/add"
        android:layout_marginTop="@dimen/dp_38"
        android:layout_marginEnd="@dimen/dp_16"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">


        <TextView
            android:id="@+id/home_page_title_tv"
            style="@style/Text20Style"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:text="@string/power_home_page" />

        <ImageView
            android:id="@+id/home_page_station_add_iv"
            android:layout_width="@dimen/dp_31"
            android:layout_height="@dimen/dp_31"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:src="@drawable/add" />
    </RelativeLayout>

    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/srl"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginTop="@dimen/dp_26"
        android:layout_marginTop="@dimen/dp_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv">
        app:layout_constraintTop_toBottomOf="@+id/title_cl">

        <ScrollView
            android:id="@+id/sl"
@@ -101,7 +109,7 @@
                            android:layout_height="102dp"
                            android:layout_marginTop="@dimen/dp_22"
                            android:background="@drawable/disc">

                            <!--用富文本实现-->
                            <TextView
                                android:id="@+id/info_rl1_f_text1_tv"
                                android:layout_width="wrap_content"
@@ -109,11 +117,11 @@
                                android:layout_centerInParent="true"
                                android:layout_marginStart="@dimen/dp_6"
                                android:gravity="end|center_vertical"
                                android:text="88"
                                android:text="0"
                                android:textColor="@color/text_E6000000"
                                android:textSize="@dimen/text_26"
                                android:textStyle="bold" />

                            <!--先隐藏-->
                            <TextView
                                android:id="@+id/home_page_station_info_rl1_f_text2_tv"
                                android:layout_width="wrap_content"
@@ -124,7 +132,8 @@
                                android:layout_toEndOf="@+id/info_rl1_f_text1_tv"
                                android:text="%"
                                android:textColor="@color/text_191919"
                                android:textSize="@dimen/text_12" />
                                android:textSize="@dimen/text_12"
                                android:visibility="gone" />
                        </RelativeLayout>


@@ -281,7 +290,7 @@
                        <TextView
                            android:id="@+id/day_tv"
                            style="@style/Text14Style"
                            android:layout_width="86dp"
                            android:layout_width="85dp"
                            android:layout_height="match_parent"
                            android:gravity="center"
                            android:text="@string/day" />
@@ -295,7 +304,7 @@
                        <TextView
                            android:id="@+id/month_tv"
                            style="@style/Text14Style"
                            android:layout_width="86dp"
                            android:layout_width="85dp"
                            android:layout_height="match_parent"
                            android:gravity="center"
                            android:text="@string/month" />
@@ -309,7 +318,7 @@
                        <TextView
                            android:id="@+id/year_tv"
                            style="@style/Text14Style"
                            android:layout_width="86dp"
                            android:layout_width="85dp"
                            android:layout_height="match_parent"
                            android:gravity="center"
                            android:text="@string/year" />