Merge branch 'newUI'

lizhanwei

2020-05-14 8735b56eefde751618c819f5b331a56a62274a5c

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

@@ -3,8 +3,8 @@
    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    android:background="@color/home_bg_color">
<include layout="@layout/networktoolbar"/>
    style="@style/ui_margin"
    >
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"