Merge branch 'newUI'

lizhanwei

2020-05-14 8735b56eefde751618c819f5b331a56a62274a5c

 app/src/main/java/safeluck/drive/evaluation/DB/signalConfigdb/SingalConfig.java

@@ -7,19 +7,13 @@
public class SingalConfig {
    private String signalName;

    public int getId() {
        return id;
    }

    public void setId(int id) {
        this.id = id;
    }

    @PrimaryKey
    private int id;

    private int index;
    private int highLevel;//1-高电平有效
    private int mainBoard;//1-主板有效
    @PrimaryKey
    private int func_id;//1gongneng

    public int getFunc_id() {