diff --git a/app/src/main/java/cn/edu/siso/rlxapf/DeviceListActivity.java b/app/src/main/java/cn/edu/siso/rlxapf/DeviceListActivity.java index faecbe0..481410c 100644 --- a/app/src/main/java/cn/edu/siso/rlxapf/DeviceListActivity.java +++ b/app/src/main/java/cn/edu/siso/rlxapf/DeviceListActivity.java @@ -14,6 +14,7 @@ import android.widget.ImageButton; import android.widget.SimpleAdapter; import android.widget.Spinner; +import android.widget.TextView; import android.widget.Toast; import com.alibaba.fastjson.JSON; @@ -84,6 +85,8 @@ public static enum HTTP_REQ_TYPE { private List> deviceListGprsData = null; private int currGprsIndex = 0; + private TextView deviceListComment = null; + private Button deviceConnectBtn = null; // 当前HTTP请求类型 @@ -180,6 +183,8 @@ protected void onCreate(Bundle savedInstanceState) { deviceListGprs.setAdapter(deviceListGprsAdapter); deviceListGprs.setOnItemSelectedListener(this); + deviceListComment = (TextView) findViewById(R.id.device_list_comment); + deviceConnectBtn = (Button) findViewById(R.id.device_connect_btn); httpHandler = new HttpHandler(); @@ -609,6 +614,7 @@ public void handleMessage(Message msg) { if (currHttpReqType == HTTP_REQ_TYPE.REQ_DEVICE) { deviceData = JSON.parseArray(resultData, DeviceBean.class); + deviceListComment.setText(deviceData.get(0).getComment()); } } diff --git a/app/src/main/java/cn/edu/siso/rlxapf/bean/DeviceBean.java b/app/src/main/java/cn/edu/siso/rlxapf/bean/DeviceBean.java index 1f0f42f..e9abe9a 100644 --- a/app/src/main/java/cn/edu/siso/rlxapf/bean/DeviceBean.java +++ b/app/src/main/java/cn/edu/siso/rlxapf/bean/DeviceBean.java @@ -21,6 +21,7 @@ public class DeviceBean { private String authority = StringUtils.EMPTY; private String onoff = StringUtils.EMPTY; private String deleted = StringUtils.EMPTY; + private String comment = StringUtils.EMPTY; private String address = StringUtils.EMPTY; private String contact = StringUtils.EMPTY; private String phone = StringUtils.EMPTY; @@ -172,6 +173,14 @@ public void setDeleted(String deleted) { this.deleted = deleted; } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + public String getAddress() { return address; } diff --git a/app/src/main/res/layout/activity_device_list.xml b/app/src/main/res/layout/activity_device_list.xml index 9638fd6..c4c0fe1 100644 --- a/app/src/main/res/layout/activity_device_list.xml +++ b/app/src/main/res/layout/activity_device_list.xml @@ -218,6 +218,35 @@ + + + + + + + + + +