diff --git a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java index 626180d..3834ac3 100644 --- a/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java +++ b/app/src/main/java/com/ckkj/water/device/DeviceControlActivity.java @@ -59,7 +59,7 @@ public class DeviceControlActivity extends BaseActivity map, IndexContract.CallBack callBack) { - String deviceID = map.get("id"); + String deviceID = map.get("deviceNo"); NetWorkManager.getRequest().getDeviceDetailInfo(NetWorkManager.getToken(), deviceID) .subscribeOn(Schedulers.io()) .unsubscribeOn(Schedulers.io()) @@ -132,9 +132,9 @@ public class DeviceImpl implements DeviceContract.DataModel{ * @param callBack */ @Override - public void deleteDevice(String devID, IndexContract.CallBack callBack) { + public void deleteDevice(String deviceNo, IndexContract.CallBack callBack) { try { - NetWorkManager.getRequest().unBindDevice(NetWorkManager.getToken(), devID) + NetWorkManager.getRequest().unBindDevice(NetWorkManager.getToken(), deviceNo) .subscribeOn(Schedulers.io()) .unsubscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java b/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java index 2d3e375..cf3c212 100644 --- a/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java +++ b/app/src/main/java/com/ckkj/water/device/mvp/DevicePresenter.java @@ -55,11 +55,11 @@ public class DevicePresenter extends BasePresenter { /** * 获取设备详情信息 - * @param deviceID + * @param deviceNo */ - public void getDeviceDetailInfo(String deviceID) { + public void getDeviceDetailInfo(String deviceNo) { Map map = new HashMap<>(); - map.put("id",deviceID); + map.put("deviceNo",deviceNo); impl.getDeviceInfomation(map, new IndexContract.CallBack() { @Override public void success(WaterDeviceEntity bean, int total) { @@ -84,7 +84,7 @@ public class DevicePresenter extends BasePresenter { public void updateDeviceInfo(WaterDeviceEntity mDeviceEntity) { try { JSONObject json = new JSONObject(); - json.put("id",mDeviceEntity.getId()); + json.put("deviceNo",mDeviceEntity.getDeviceNo()); json.put("deviceName",mDeviceEntity.getDeviceName()); json.put("wifiName",mDeviceEntity.getWifiName()); json.put("wifiPassword",mDeviceEntity.getWifiPassword()); @@ -113,7 +113,7 @@ public class DevicePresenter extends BasePresenter { * @param deviceEntity */ public void unBindDevice(WaterDeviceEntity deviceEntity) { - impl.deleteDevice(deviceEntity.getId(), new IndexContract.CallBack() { + impl.deleteDevice(deviceEntity.getDeviceNo(), new IndexContract.CallBack() { @Override public void success(BaseBean bean, int total) { if (DevicePresenter.this.getView() != null) { diff --git a/app/src/main/java/com/ckkj/water/network/Request.java b/app/src/main/java/com/ckkj/water/network/Request.java index 963b0d2..4cf6492 100644 --- a/app/src/main/java/com/ckkj/water/network/Request.java +++ b/app/src/main/java/com/ckkj/water/network/Request.java @@ -61,8 +61,8 @@ public interface Request { @POST("app/v1/addDevice") Observable addDevice(@HeaderMap Map headMap, @Body RequestBody requestBody); //获取设备详细信息 - @GET("app/v1/device/{id}") - Observable> getDeviceDetailInfo(@HeaderMap Map headMap, @Path("id") String id); + @GET("app/v1/device/{deviceNo}") + Observable> getDeviceDetailInfo(@HeaderMap Map headMap, @Path("deviceNo") String id); //开启/关闭设备 @PUT("app/v1/switchDevice") @@ -115,8 +115,8 @@ public interface Request { //删除设备 - @DELETE("app/v1/deleteDevice/{ids}") - Observable unBindDevice(@HeaderMap Map headMap, @Path("ids") String id); + @DELETE("app/v1/deleteDevice/{deviceNo}") + Observable unBindDevice(@HeaderMap Map headMap, @Path("deviceNo") String id); //排程解绑设备 @DELETE("app/v1/deleteScheduleDevice") diff --git a/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java b/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java index 882cb7b..8efe9c0 100644 --- a/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java +++ b/app/src/main/java/com/ckkj/water/plan/BindDeviceFragment.java @@ -73,7 +73,7 @@ public class BindDeviceFragment extends BaseFragment deviceIds; + private List deviceNos; private String status = "1"; private List details; diff --git a/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanPresenter.java b/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanPresenter.java index 4322446..0364b17 100644 --- a/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanPresenter.java +++ b/app/src/main/java/com/ckkj/water/plan/mvp/WaterPlanPresenter.java @@ -195,19 +195,19 @@ public class WaterPlanPresenter extends BasePresenter() { @Override public void success(BaseBean bean, int total) { @@ -288,7 +288,7 @@ public class WaterPlanPresenter extends BasePresenter map = new HashMap<>(); map.put("scheduleId",planID); - map.put("deviceId",deviceID); + map.put("deviceNo",deviceID); impl.planUnbindDevice(map, new WaterPlanContract.CallBack() { @Override public void success(BaseBean bean, int total) {