完善控制设备删除功能

chenbocqu · Aug 25, 2018 · 3671901 · 3671901
1 parent c9027eb
commit 3671901
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/app/src/main/java/com/qican/ifarmmanager/MainActivity.java b/app/src/main/java/com/qican/ifarmmanager/MainActivity.java
@@ -5,7 +5,7 @@
 
 import com.qican.ifarmmanager.bean.ComUser;
 import com.qican.ifarmmanager.ui.base.TitleBarActivity;
-import com.qican.ifarmmanager.ui.device.VerifyDeviceActivity;
+import com.qican.ifarmmanager.ui.collector.CollectorListActivity;
 import com.qican.ifarmmanager.ui.farm.FarmListActivity;
 import com.qican.ifarmmanager.ui.infosysmanager.AcquisitorListActivity;
 import com.qican.ifarmmanager.ui.infosysmanager.ControlDeviceListActivity;
@@ -100,7 +100,7 @@ public void onClick(View v) {
 
             // 添加集中器，采集设备与控制设备
             case R.id.ll_jizhongqing:
-                myTool.startActivity(VerifyDeviceActivity.class);
+                myTool.startActivity(CollectorListActivity.class);
                 break;
 
             case R.id.ll_add_device:

diff --git a/app/src/main/java/com/qican/ifarmmanager/ui/collector/CollectorListActivity.java b/app/src/main/java/com/qican/ifarmmanager/ui/collector/CollectorListActivity.java
@@ -9,8 +9,8 @@
 import com.qican.ifarmmanager.R;
 import com.qican.ifarmmanager.bean.Collector;
 import com.qican.ifarmmanager.bean.ComUser;
-import com.qican.ifarmmanager.bean.DeviceType;
 import com.qican.ifarmmanager.ui.base.ComListActivity;
+import com.qican.ifarmmanager.ui.device.VerifyDeviceActivity;
 import com.qican.ifarmmanager.ui.login.LoginActivity;
 import com.qican.ifarmmanager.utils.TimeUtils;
 import com.qican.ifarmmanager.view.refresh.PullToRefreshLayout;
@@ -35,7 +35,7 @@ public class CollectorListActivity extends ComListActivity<Collector> {
 
     @Override
     public String getUITitle() {
-        return "选择设备类型";
+        return "集中器列表";
     }
 
     @Override
@@ -44,12 +44,12 @@ public void init() {
         commond = (String) myTool.getParam(String.class);
 
         mData = new ArrayList<>();
-//        setRightMenu("添加农场", new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                myTool.startActivity(AddFarmActivity.class);
-//            }
-//        });
+        setRightMenu("添加集中器", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                myTool.startActivity(VerifyDeviceActivity.class);
+            }
+        });
     }
 
     @Override

diff --git a/app/src/main/java/com/qican/ifarmmanager/ui/config/ConfigControlSysActivity.java b/app/src/main/java/com/qican/ifarmmanager/ui/config/ConfigControlSysActivity.java
@@ -84,7 +84,7 @@ public class ConfigControlSysActivity extends TitleBarActivity {
 
     @Override
     public String getUITitle() {
-        return "控制系统配置";
+        return "控制终端配置";
     }
 
     @Override

diff --git a/app/src/main/java/com/qican/ifarmmanager/ui/sys/ControlSysListActivity.java b/app/src/main/java/com/qican/ifarmmanager/ui/sys/ControlSysListActivity.java
@@ -45,6 +45,11 @@ public void init() {
         if ("".equals(syscode)) return;
 
         mData = new ArrayList<>();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         request();
     }
 

diff --git a/app/src/main/java/com/qican/ifarmmanager/ui/terminal/TerminalListActivity.java b/app/src/main/java/com/qican/ifarmmanager/ui/terminal/TerminalListActivity.java
@@ -107,7 +107,9 @@ public void onResponse(String response, int id) {
                                         t.setControlDeviceId(obj.getString("controlDeviceId"));
                                         t.setIdentify(obj.getString("terminalIdentifying"));
                                         t.setId(obj.getString("terminalId"));
-                                        t.setCreateTime(obj.getString("terminalCreateTime"));
+
+                                        if (obj.has("terminalCreateTime"))
+                                            t.setCreateTime(obj.getString("terminalCreateTime"));
 
                                         myDatas.add(t);
                                     }

diff --git a/app/src/main/res/layout/activity_add_controller.xml b/app/src/main/res/layout/activity_add_controller.xml
@@ -135,7 +135,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_margin="15dp"
         android:background="@drawable/roundbtn_bg"
-        android:text="添加采集设备"
+        android:text="添加控制设备"
         android:textColor="@color/white"
         android:textSize="14sp" />