Merge branch 'wjc_new' into lwj_new

mac

2024-05-21 f538aef48a6eda583b88cb5d5670fd7f2ed82135

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

@@ -21,7 +21,7 @@
            android:layout_height="@dimen/dp_25"
            android:layout_marginTop="7dp"
            android:gravity="center"
            android:text="99"
            android:text="0"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_21"
            android:textStyle="bold" />