Merge branch 'master' of https://gitee.com/endian11/DriveJudge

yy1717

2020-02-26 432b34202aed7b34d7c1719d4a056651b656ec62

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

@@ -15,7 +15,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@android:color/black"
                android:text="BDS数据输入："/>
                android:text="考试平台地址："/>
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
@@ -24,7 +24,8 @@
            <EditText
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="192.168.23.12"
                android:text="47.93.157.103"
                android:id="@+id/et_platform_ip"
                android:background="@android:drawable/editbox_background_normal"/>
            <TextView
                android:layout_width="wrap_content"
@@ -34,7 +35,8 @@
            <EditText
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="8080"
                android:text="2020"
                android:id="@+id/et_platform_port"
                android:background="@android:drawable/editbox_background_normal"/>
        </LinearLayout>
        <View
@@ -109,6 +111,7 @@
                        android:entries="@array/spinnerarr"/>
                </TableRow>
                <TableRow android:gravity="center_horizontal"
                    android:visibility="gone"
                    android:layout_marginBottom="10dp">
                    <TextView
                        android:layout_width="wrap_content"
@@ -193,6 +196,7 @@
        <Button
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/btn_save_platform"
            android:text="保存"/>
    </LinearLayout>