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

yy1717

2020-01-08 3e6b5a316fdf99835865148bcb5119464b625d9a

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

File was renamed from app/src/main/res/layout/layout_ftp_setting.xml
@@ -78,6 +78,18 @@
            android:text="192"
            android:inputType="numberDecimal"
            android:background="@android:drawable/editbox_background_normal"/>
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginLeft="10dp"
            android:text="电话："/>
        <EditText
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/et_phone"
            android:text="19234567894"
            android:inputType="numberDecimal"
            android:background="@android:drawable/editbox_background_normal"/>
    </LinearLayout>
    <View
        android:layout_width="match_parent"