Merge remote-tracking branch 'origin/master'

yy1717

2020-03-12 c125fc0a5ee47ef32db587899d972491231167ee

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

@@ -44,7 +44,7 @@
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="呼叫请求"
            android:text="结束考试"
            android:id="@+id/tv_stop"
            android:textColor="@android:color/white"
            android:padding="10dp"