Merge remote-tracking branch 'origin/master'

yy1717

2020-03-05 f430073ef8e63884eff78d57084f89e93fa0c1f0

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

@@ -5,7 +5,10 @@
  android:layout_width="0dp"
    android:layout_weight="4"
    android:layout_height="match_parent"
    android:padding="5dp"
    android:paddingTop="2dp"
    android:paddingBottom="2dp"
    android:paddingLeft="5dp"
    android:paddingRight="5dp"
    android:gravity="center"
    android:orientation="vertical"
    android:background="@color/train_bg"