Merge remote-tracking branch 'origin/lowprecision'

endian11

2020-10-26 a5c2e37286dd29b02fff10247e6f3201ad5f58cd

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

@@ -1,15 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<FrameLayout
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
<LinearLayout

    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">
    <safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        app:txt_des_tvedit = "学校/车站/横道区域最高速度"
        app:et_input="25"
        android:id="@+id/cross_school_max_speed"
        app:txt_des_tvedit = "学校/车站/横道区域最高速度KM/H"
        app:et_input="30"
        />
    <safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        app:txt_des_tvedit = "通过学校/车站/横道，距离检查点的有效距离(米)"
        android:id="@+id/crossing_break_valid_distance"
        app:et_input="30"
        />
    <safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        app:txt_des_tvedit = "停止线外需停车时，距停止线有效距离(米)"
        android:id="@+id/crossing_stop_valid_distance"
        app:et_input="3.0"
        />

    <safeluck.drive.evaluation.fragment.rulefragments.cview.TextCheckBox
@@ -19,3 +38,18 @@


</LinearLayout>
    <Button
        android:id="@+id/btn_setting_save"
        android:layout_width="100dp"
        android:layout_height="@dimen/ui_margin_60dp"
        android:layout_marginLeft="16dp"
        android:layout_marginRight="16dp"
        android:layout_marginTop="32dp"
        android:layout_gravity="bottom|center"

        android:background="@drawable/btn_start_bg"
        android:textAllCaps="false"
        android:textColor="@android:color/white"
        android:textSize="@dimen/network_train_textsize32px"
        android:text="保存"/>
</FrameLayout>