From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/java/safeluck/drive/evaluation/bean/SignalConfigBean.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/SignalConfigBean.java b/app/src/main/java/safeluck/drive/evaluation/bean/SignalConfigBean.java
index 55de10f..b1bb620 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/SignalConfigBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/SignalConfigBean.java
@@ -11,9 +11,7 @@
private String signal_name_first;
private String signal_name_second;
private boolean one;
- private boolean two;
private boolean three;
- private boolean four;
private int port_one;
private int port_two;
@@ -35,13 +33,6 @@
this.three = three;
}
- public boolean isFour() {
- return four;
- }
-
- public void setFour(boolean four) {
- this.four = four;
- }
public String getSignal_name_second() {
return signal_name_second;
@@ -59,13 +50,6 @@
this.one = one;
}
- public boolean isTwo() {
- return two;
- }
-
- public void setTwo(boolean two) {
- this.two = two;
- }
public int getPort_one() {
return port_one;
@@ -89,10 +73,20 @@
this.signal_name_first = signal_name_first;
this.signal_name_second = signal_name_second;
this.one = one;
- this.two = two;
this.three = three;
- this.four = four;
this.port_one = port_one;
this.port_two = port_two;
}
+
+ @Override
+ public String toString() {
+ return "SignalConfigBean{" +
+ "signal_name_first='" + signal_name_first + '\'' +
+ ", signal_name_second='" + signal_name_second + '\'' +
+ ", one=" + one +
+ ", three=" + three +
+ ", port_one=" + port_one +
+ ", port_two=" + port_two +
+ '}';
+ }
}
--
Gitblit v1.8.0