Merge branch 'wjc_new' into wxw_new

mac

2024-05-29 51bd5829118714be826ab9de93d822615ef48a4f

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

@@ -173,7 +173,7 @@
                        android:id="@+id/home_page_station_info_rl2"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_166"
                        android:background="@drawable/bj_13_ffffff"
                        android:background="@drawable/page_station_generating_bj"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_rl1">
@@ -516,7 +516,7 @@
                            android:layout_alignBottom="@+id/social_contribution_data_1_tv"
                            android:layout_marginStart="@dimen/dp_2"
                            android:layout_toEndOf="@+id/social_contribution_data_1_tv"
                            android:text="(T)"
                            android:text="@string/t"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_12"

@@ -573,7 +573,7 @@
                            android:layout_alignBottom="@+id/social_contribution_data_2_tv"
                            android:layout_marginStart="@dimen/dp_2"
                            android:layout_toEndOf="@+id/social_contribution_data_2_tv"
                            android:text="(T)"
                            android:text="@string/t"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_12"

@@ -616,7 +616,7 @@
                            android:layout_alignParentTop="true"
                            android:layout_marginStart="@dimen/dp_10"
                            android:layout_marginTop="@dimen/dp_16"
                            android:text="13.14"
                            android:text="13"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_18"
                            android:textStyle="bold" />
@@ -628,11 +628,9 @@
                            android:layout_alignBottom="@+id/social_contribution_data_3_tv"
                            android:layout_marginStart="@dimen/dp_2"
                            android:layout_toEndOf="@+id/social_contribution_data_3_tv"
                            android:text="(T)"
                            android:text="@string/number"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_12"

                            />
                            android:textSize="@dimen/text_12" />

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