diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index ee3d7bf..c247950 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -53,7 +53,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { private Context context = this; @BindView(R.id.caseClassView) diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index ee3d7bf..c247950 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -53,7 +53,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { private Context context = this; @BindView(R.id.caseClassView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index e99d075..6f18c57 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, - IShopChangeView { + IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index ee3d7bf..c247950 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -53,7 +53,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { private Context context = this; @BindView(R.id.caseClassView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index e99d075..6f18c57 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, - IShopChangeView { + IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 69a8dcb..f5c5748 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.mvp.presenter.AuthenticatePresenterImpl; import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.view.ILoginInView; import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -38,7 +38,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginView { +public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginInView { private static final String TAG = "LoginActivity"; diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index ee3d7bf..c247950 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -53,7 +53,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { private Context context = this; @BindView(R.id.caseClassView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index e99d075..6f18c57 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, - IShopChangeView { + IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 69a8dcb..f5c5748 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.mvp.presenter.AuthenticatePresenterImpl; import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.view.ILoginInView; import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -38,7 +38,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginView { +public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginInView { private static final String TAG = "LoginActivity"; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java index 9f91f43..b1f2ebb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java @@ -13,10 +13,14 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.LightResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.LightListBean; +import com.casic.dcms.mvp.presenter.LightControlPresenterImpl; import com.casic.dcms.mvp.presenter.LightListPresenterImpl; +import com.casic.dcms.mvp.view.ILightControlView; import com.casic.dcms.mvp.view.ILightListView; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.widgets.LightDetailDialog; import com.qmuiteam.qmui.widget.QMUIEmptyView; @@ -31,7 +35,7 @@ import butterknife.BindView; -public class LightOnListFragment extends BaseFragment implements ILightListView { +public class LightOnListFragment extends BaseFragment implements ILightListView, ILightControlView { @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,9 @@ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; + private LightControlPresenterImpl controlPresenter; + private long lampId; + private int adapterPosition; @Override protected int initLayoutView() { @@ -65,6 +72,8 @@ lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); + + controlPresenter = new LightControlPresenterImpl(this); } @Override @@ -75,7 +84,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - lightListPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -123,7 +132,7 @@ LightOnListFragment fragment = reference.get(); if (msg.what == 20210623) { if (fragment.isRefresh || fragment.isLoadMore) { - fragment.adapter.notifyDataSetChanged(); + fragment.adapter.notifyItemRangeInserted(fragment.adapter.getItemCount(), Constant.PAGE_LIMIT); } else { //首次加载数据 if (fragment.dataBeans.size() == 0) { @@ -149,23 +158,68 @@ } }); fragment.adapter.setOnSwitchClickListener(new LightResultAdapter.OnSwitchClickListener() { + @Override public void onClick(int position) { - String statusName = fragment.dataBeans.get(position).getStatusName(); - Log.d(TAG, "onClick: " + statusName); + LightListBean.DataBean.RowsBean rowsBean = fragment.dataBeans.get(position); + fragment.lampId = Long.parseLong(rowsBean.getLampId()); + fragment.adapterPosition = position; + + List lampIds = new ArrayList<>(); + lampIds.add(fragment.lampId); + + String statusName = rowsBean.getStatusName(); + String controlType; + if (statusName.equals("离线")) { + controlType = "1"; + } else { + controlType = "0"; + } + fragment.controlPresenter.onReadyRetrofitRequest(lampIds, controlType); } }); } } + } else if (msg.what == 20210624) { + fragment.isRefresh = true; + fragment.pageIndex = 1; + fragment.lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, fragment.pageIndex); } } } @Override + public void showProgress() { + OtherUtils.showLoadingDialog(context, "处理中，请稍后..."); + } + + @Override + public void hideProgress() { + OtherUtils.dismissLoadingDialog(); + } + + @Override + public void obtainControlResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //开灯指令发下去之后，虽然返回成功，但仅仅表示app发送指令到后台成功，但是开没开灯无法确定，所以，只能延迟几秒再刷新列表 + Log.d(TAG, "APP发送指令到后台成功，3s后即将刷新列表"); + weakReferenceHandler.sendEmptyMessageDelayed(20210624, 3000); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (lightListPresenter != null) { lightListPresenter.disposeRetrofitRequest(); } + if (controlPresenter != null) { + controlPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index ee3d7bf..c247950 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -53,7 +53,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { private Context context = this; @BindView(R.id.caseClassView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index e99d075..6f18c57 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, - IShopChangeView { + IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 69a8dcb..f5c5748 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.mvp.presenter.AuthenticatePresenterImpl; import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.view.ILoginInView; import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -38,7 +38,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginView { +public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginInView { private static final String TAG = "LoginActivity"; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java index 9f91f43..b1f2ebb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java @@ -13,10 +13,14 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.LightResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.LightListBean; +import com.casic.dcms.mvp.presenter.LightControlPresenterImpl; import com.casic.dcms.mvp.presenter.LightListPresenterImpl; +import com.casic.dcms.mvp.view.ILightControlView; import com.casic.dcms.mvp.view.ILightListView; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.widgets.LightDetailDialog; import com.qmuiteam.qmui.widget.QMUIEmptyView; @@ -31,7 +35,7 @@ import butterknife.BindView; -public class LightOnListFragment extends BaseFragment implements ILightListView { +public class LightOnListFragment extends BaseFragment implements ILightListView, ILightControlView { @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,9 @@ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; + private LightControlPresenterImpl controlPresenter; + private long lampId; + private int adapterPosition; @Override protected int initLayoutView() { @@ -65,6 +72,8 @@ lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); + + controlPresenter = new LightControlPresenterImpl(this); } @Override @@ -75,7 +84,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - lightListPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -123,7 +132,7 @@ LightOnListFragment fragment = reference.get(); if (msg.what == 20210623) { if (fragment.isRefresh || fragment.isLoadMore) { - fragment.adapter.notifyDataSetChanged(); + fragment.adapter.notifyItemRangeInserted(fragment.adapter.getItemCount(), Constant.PAGE_LIMIT); } else { //首次加载数据 if (fragment.dataBeans.size() == 0) { @@ -149,23 +158,68 @@ } }); fragment.adapter.setOnSwitchClickListener(new LightResultAdapter.OnSwitchClickListener() { + @Override public void onClick(int position) { - String statusName = fragment.dataBeans.get(position).getStatusName(); - Log.d(TAG, "onClick: " + statusName); + LightListBean.DataBean.RowsBean rowsBean = fragment.dataBeans.get(position); + fragment.lampId = Long.parseLong(rowsBean.getLampId()); + fragment.adapterPosition = position; + + List lampIds = new ArrayList<>(); + lampIds.add(fragment.lampId); + + String statusName = rowsBean.getStatusName(); + String controlType; + if (statusName.equals("离线")) { + controlType = "1"; + } else { + controlType = "0"; + } + fragment.controlPresenter.onReadyRetrofitRequest(lampIds, controlType); } }); } } + } else if (msg.what == 20210624) { + fragment.isRefresh = true; + fragment.pageIndex = 1; + fragment.lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, fragment.pageIndex); } } } @Override + public void showProgress() { + OtherUtils.showLoadingDialog(context, "处理中，请稍后..."); + } + + @Override + public void hideProgress() { + OtherUtils.dismissLoadingDialog(); + } + + @Override + public void obtainControlResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //开灯指令发下去之后，虽然返回成功，但仅仅表示app发送指令到后台成功，但是开没开灯无法确定，所以，只能延迟几秒再刷新列表 + Log.d(TAG, "APP发送指令到后台成功，3s后即将刷新列表"); + weakReferenceHandler.sendEmptyMessageDelayed(20210624, 3000); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (lightListPresenter != null) { lightListPresenter.disposeRetrofitRequest(); } + if (controlPresenter != null) { + controlPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index c083000..beb5345 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -20,7 +20,6 @@ import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; import com.casic.dcms.bean.HomePageBean; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.bean.LightListBean; import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.bean.MaintainContentBean; @@ -35,7 +34,10 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.bean.UserBean; +import java.util.List; + import okhttp3.MultipartBody; +import okhttp3.ResponseBody; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; @@ -675,6 +677,17 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail(@Header("token") String token, - @Query("lampId") String lampId); + Observable obtainLightDetail(@Header("token") String token, + @Query("lampId") String lampId); + + /** + * 路灯列表数据 + *

+ * http://111.198.10.15:11409/lightCr/overview/lampControl + */ + @FormUrlEncoded + @POST("/lightCr/overview/lampControl") + Observable controlStreetLight(@Header("token") String token, + @Field("lampIds") List lampIds, + @Field("controlType") String controlType); } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index ee3d7bf..c247950 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -53,7 +53,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { private Context context = this; @BindView(R.id.caseClassView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index e99d075..6f18c57 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, - IShopChangeView { + IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 69a8dcb..f5c5748 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.mvp.presenter.AuthenticatePresenterImpl; import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.view.ILoginInView; import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -38,7 +38,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginView { +public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginInView { private static final String TAG = "LoginActivity"; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java index 9f91f43..b1f2ebb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java @@ -13,10 +13,14 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.LightResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.LightListBean; +import com.casic.dcms.mvp.presenter.LightControlPresenterImpl; import com.casic.dcms.mvp.presenter.LightListPresenterImpl; +import com.casic.dcms.mvp.view.ILightControlView; import com.casic.dcms.mvp.view.ILightListView; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.widgets.LightDetailDialog; import com.qmuiteam.qmui.widget.QMUIEmptyView; @@ -31,7 +35,7 @@ import butterknife.BindView; -public class LightOnListFragment extends BaseFragment implements ILightListView { +public class LightOnListFragment extends BaseFragment implements ILightListView, ILightControlView { @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,9 @@ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; + private LightControlPresenterImpl controlPresenter; + private long lampId; + private int adapterPosition; @Override protected int initLayoutView() { @@ -65,6 +72,8 @@ lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); + + controlPresenter = new LightControlPresenterImpl(this); } @Override @@ -75,7 +84,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - lightListPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -123,7 +132,7 @@ LightOnListFragment fragment = reference.get(); if (msg.what == 20210623) { if (fragment.isRefresh || fragment.isLoadMore) { - fragment.adapter.notifyDataSetChanged(); + fragment.adapter.notifyItemRangeInserted(fragment.adapter.getItemCount(), Constant.PAGE_LIMIT); } else { //首次加载数据 if (fragment.dataBeans.size() == 0) { @@ -149,23 +158,68 @@ } }); fragment.adapter.setOnSwitchClickListener(new LightResultAdapter.OnSwitchClickListener() { + @Override public void onClick(int position) { - String statusName = fragment.dataBeans.get(position).getStatusName(); - Log.d(TAG, "onClick: " + statusName); + LightListBean.DataBean.RowsBean rowsBean = fragment.dataBeans.get(position); + fragment.lampId = Long.parseLong(rowsBean.getLampId()); + fragment.adapterPosition = position; + + List lampIds = new ArrayList<>(); + lampIds.add(fragment.lampId); + + String statusName = rowsBean.getStatusName(); + String controlType; + if (statusName.equals("离线")) { + controlType = "1"; + } else { + controlType = "0"; + } + fragment.controlPresenter.onReadyRetrofitRequest(lampIds, controlType); } }); } } + } else if (msg.what == 20210624) { + fragment.isRefresh = true; + fragment.pageIndex = 1; + fragment.lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, fragment.pageIndex); } } } @Override + public void showProgress() { + OtherUtils.showLoadingDialog(context, "处理中，请稍后..."); + } + + @Override + public void hideProgress() { + OtherUtils.dismissLoadingDialog(); + } + + @Override + public void obtainControlResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //开灯指令发下去之后，虽然返回成功，但仅仅表示app发送指令到后台成功，但是开没开灯无法确定，所以，只能延迟几秒再刷新列表 + Log.d(TAG, "APP发送指令到后台成功，3s后即将刷新列表"); + weakReferenceHandler.sendEmptyMessageDelayed(20210624, 3000); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (lightListPresenter != null) { lightListPresenter.disposeRetrofitRequest(); } + if (controlPresenter != null) { + controlPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index c083000..beb5345 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -20,7 +20,6 @@ import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; import com.casic.dcms.bean.HomePageBean; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.bean.LightListBean; import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.bean.MaintainContentBean; @@ -35,7 +34,10 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.bean.UserBean; +import java.util.List; + import okhttp3.MultipartBody; +import okhttp3.ResponseBody; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; @@ -675,6 +677,17 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail(@Header("token") String token, - @Query("lampId") String lampId); + Observable obtainLightDetail(@Header("token") String token, + @Query("lampId") String lampId); + + /** + * 路灯列表数据 + *

+ * http://111.198.10.15:11409/lightCr/overview/lampControl + */ + @FormUrlEncoded + @POST("/lightCr/overview/lampControl") + Observable controlStreetLight(@Header("token") String token, + @Field("lampIds") List lampIds, + @Field("controlType") String controlType); } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fdd3747..f6f33c8 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -22,7 +22,6 @@ import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; import com.casic.dcms.bean.HomePageBean; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.bean.LightListBean; import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.bean.MaintainContentBean; @@ -43,12 +42,14 @@ import org.jetbrains.annotations.NotNull; import java.io.File; +import java.util.List; import java.util.concurrent.TimeUnit; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; import okhttp3.RequestBody; +import okhttp3.ResponseBody; import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory; @@ -691,10 +692,20 @@ /** * 路灯详情数据 + * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ - public static Observable getLightDetailResult(String lampId) { + public static Observable getLightDetailResult(String lampId) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.obtainLightDetail(AuthenticationHelper.getToken(), lampId); } + + /** + * 控制路灯开关 + */ + public static Observable getLightControlResult(List lampIds, String controlType) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); + } } diff --git a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java b/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java deleted file mode 100644 index f365679..0000000 --- a/app/src/main/java/com/casic/dcms/bean/LightDetailBean.java +++ /dev/null @@ -1,489 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class LightDetailBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - /** - * address : 东城路口 - * areaId : - * areaName : - * circuitCode : - * circuitGroupId : - * circuitGroupName : - * circuitId : - * circuitName : - * controllerCode : 732020010013 - * controllerGroupId : ["1354723273625702401","1355410925412814850","1356885044973264897"] - * controllerGroupName : ["全部设备","100台单灯","路灯组2"] - * controllerId : 1354708852077629441 - * controllerLine : - * controllerType : 1 - * controllerTypeName : 单灯控制器 - * deptId : 1344118138553909250 - * deptName : 路灯所 - * groupId : - * groupName : - * height : - * lampCode : ld-013-test - * lampId : 1354712301527764999 - * lampType : 1352138555168387073 - * lampTypeName : 默认路灯类型（开启报警） - * lamppostCode : DCL-DG-013 - * lamppostId : 1354365980753244162 - * lamppostName : 东城路灯杆13 - * lamppostType : 1 - * lamppostTypeName : 单灯头 - * latestActivePower : 345.654 - * latestElec : 1.639 - * latestPower : 345.654 - * latestReactivePower : 15.347 - * latestTime : 2021-05-28 01:59:12 - * latestVol : 219.44 - * latitude : 27.755515 - * longitude : 116.051247 - * postGroupId : - * postGroupName : - * power : - * status : 4 - * statusName : 离线 - * streetId : 1352827149776306178 - * streetName : 东城路 - */ - - private String address; - private String areaId; - private String areaName; - private String circuitCode; - private String circuitGroupId; - private String circuitGroupName; - private String circuitId; - private String circuitName; - private String controllerCode; - private String controllerId; - private String controllerLine; - private String controllerType; - private String controllerTypeName; - private String deptId; - private String deptName; - private String groupId; - private String groupName; - private String height; - private String lampCode; - private String lampId; - private String lampType; - private String lampTypeName; - private String lamppostCode; - private String lamppostId; - private String lamppostName; - private String lamppostType; - private String lamppostTypeName; - private double latestActivePower; - private double latestElec; - private double latestPower; - private double latestReactivePower; - private String latestTime; - private double latestVol; - private double latitude; - private double longitude; - private String postGroupId; - private String postGroupName; - private String power; - private String status; - private String statusName; - private String streetId; - private String streetName; - private List controllerGroupId; - private List controllerGroupName; - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAreaName() { - return areaName; - } - - public void setAreaName(String areaName) { - this.areaName = areaName; - } - - public String getCircuitCode() { - return circuitCode; - } - - public void setCircuitCode(String circuitCode) { - this.circuitCode = circuitCode; - } - - public String getCircuitGroupId() { - return circuitGroupId; - } - - public void setCircuitGroupId(String circuitGroupId) { - this.circuitGroupId = circuitGroupId; - } - - public String getCircuitGroupName() { - return circuitGroupName; - } - - public void setCircuitGroupName(String circuitGroupName) { - this.circuitGroupName = circuitGroupName; - } - - public String getCircuitId() { - return circuitId; - } - - public void setCircuitId(String circuitId) { - this.circuitId = circuitId; - } - - public String getCircuitName() { - return circuitName; - } - - public void setCircuitName(String circuitName) { - this.circuitName = circuitName; - } - - public String getControllerCode() { - return controllerCode; - } - - public void setControllerCode(String controllerCode) { - this.controllerCode = controllerCode; - } - - public String getControllerId() { - return controllerId; - } - - public void setControllerId(String controllerId) { - this.controllerId = controllerId; - } - - public String getControllerLine() { - return controllerLine; - } - - public void setControllerLine(String controllerLine) { - this.controllerLine = controllerLine; - } - - public String getControllerType() { - return controllerType; - } - - public void setControllerType(String controllerType) { - this.controllerType = controllerType; - } - - public String getControllerTypeName() { - return controllerTypeName; - } - - public void setControllerTypeName(String controllerTypeName) { - this.controllerTypeName = controllerTypeName; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getLampCode() { - return lampCode; - } - - public void setLampCode(String lampCode) { - this.lampCode = lampCode; - } - - public String getLampId() { - return lampId; - } - - public void setLampId(String lampId) { - this.lampId = lampId; - } - - public String getLampType() { - return lampType; - } - - public void setLampType(String lampType) { - this.lampType = lampType; - } - - public String getLampTypeName() { - return lampTypeName; - } - - public void setLampTypeName(String lampTypeName) { - this.lampTypeName = lampTypeName; - } - - public String getLamppostCode() { - return lamppostCode; - } - - public void setLamppostCode(String lamppostCode) { - this.lamppostCode = lamppostCode; - } - - public String getLamppostId() { - return lamppostId; - } - - public void setLamppostId(String lamppostId) { - this.lamppostId = lamppostId; - } - - public String getLamppostName() { - return lamppostName; - } - - public void setLamppostName(String lamppostName) { - this.lamppostName = lamppostName; - } - - public String getLamppostType() { - return lamppostType; - } - - public void setLamppostType(String lamppostType) { - this.lamppostType = lamppostType; - } - - public String getLamppostTypeName() { - return lamppostTypeName; - } - - public void setLamppostTypeName(String lamppostTypeName) { - this.lamppostTypeName = lamppostTypeName; - } - - public double getLatestActivePower() { - return latestActivePower; - } - - public void setLatestActivePower(double latestActivePower) { - this.latestActivePower = latestActivePower; - } - - public double getLatestElec() { - return latestElec; - } - - public void setLatestElec(double latestElec) { - this.latestElec = latestElec; - } - - public double getLatestPower() { - return latestPower; - } - - public void setLatestPower(double latestPower) { - this.latestPower = latestPower; - } - - public double getLatestReactivePower() { - return latestReactivePower; - } - - public void setLatestReactivePower(double latestReactivePower) { - this.latestReactivePower = latestReactivePower; - } - - public String getLatestTime() { - return latestTime; - } - - public void setLatestTime(String latestTime) { - this.latestTime = latestTime; - } - - public double getLatestVol() { - return latestVol; - } - - public void setLatestVol(double latestVol) { - this.latestVol = latestVol; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public String getPostGroupId() { - return postGroupId; - } - - public void setPostGroupId(String postGroupId) { - this.postGroupId = postGroupId; - } - - public String getPostGroupName() { - return postGroupName; - } - - public void setPostGroupName(String postGroupName) { - this.postGroupName = postGroupName; - } - - public String getPower() { - return power; - } - - public void setPower(String power) { - this.power = power; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public String getStreetName() { - return streetName; - } - - public void setStreetName(String streetName) { - this.streetName = streetName; - } - - public List getControllerGroupId() { - return controllerGroupId; - } - - public void setControllerGroupId(List controllerGroupId) { - this.controllerGroupId = controllerGroupId; - } - - public List getControllerGroupName() { - return controllerGroupName; - } - - public void setControllerGroupName(List controllerGroupName) { - this.controllerGroupName = controllerGroupName; - } - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java new file mode 100644 index 0000000..b3101c1 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IChangeShopInfoModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IChangeShopInfoModel { + Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java new file mode 100644 index 0000000..9a1da09 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IControlLightModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import java.util.List; + +import rx.Subscription; + +public interface IControlLightModel { + Subscription sendRetrofitRequest(List lampIds, String controlType); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java deleted file mode 100644 index 1a3681a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ILoginActionModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ILoginActionModel { - Subscription sendRetrofitRequest(String username, String password); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java new file mode 100644 index 0000000..6729c77 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ILoginInModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ILoginInModel { + Subscription sendRetrofitRequest(String username, String password); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java deleted file mode 100644 index 74b5bb8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopCaseSubmitModel.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopCaseSubmitModel { - Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java deleted file mode 100644 index fd56f29..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IShopChangeModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IShopChangeModel { - Subscription sendRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, String images); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java new file mode 100644 index 0000000..e6b088a --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ISubmitShopCaseModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ISubmitShopCaseModel { + Subscription sendRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java new file mode 100644 index 0000000..c2de87e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightControlModelImpl.java @@ -0,0 +1,52 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import java.util.List; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LightControlModelImpl implements IControlLightModel { + + private OnControlResultListener listener; + + public LightControlModelImpl(OnControlResultListener controlResultListener) { + this.listener = controlResultListener; + } + + public interface OnControlResultListener { + void onSuccess(ActionResultBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(List lampIds, String controlType) { + Observable observable = RetrofitServiceManager.getLightControlResult(lampIds, controlType); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(ActionResultBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java index d395650..79176b4 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/LightDetailModelImpl.java @@ -1,8 +1,10 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; +import java.io.IOException; + +import okhttp3.ResponseBody; import rx.Observable; import rx.Observer; import rx.Subscription; @@ -18,15 +20,15 @@ } public interface OnGetDetailListener { - void onSuccess(LightDetailBean resultBean); + void onSuccess(String resultJson); void onFailure(Throwable throwable); } @Override public Subscription sendRetrofitRequest(String lampId) { - Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + Observable observable = RetrofitServiceManager.getLightDetailResult(lampId); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,9 +42,13 @@ } @Override - public void onNext(LightDetailBean resultBean) { + public void onNext(ResponseBody resultBean) { if (resultBean != null) { - listener.onSuccess(resultBean); + try { + listener.onSuccess(resultBean.string()); + } catch (IOException e) { + listener.onFailure(e); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java deleted file mode 100644 index ab6c3a4..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/LoginActionModelImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.LoginResultBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class LoginActionModelImpl implements ILoginActionModel { - - private OnLoginListener loginListener; - - public LoginActionModelImpl(OnLoginListener listener) { - this.loginListener = listener; - } - - /** - * 数据回调接口 - */ - public interface OnLoginListener { - void onSuccess(LoginResultBean resultBean); - - void onFailure(Throwable throwable); - } - - - @Override - public Subscription sendRetrofitRequest(String username, String key) { - Observable observable = RetrofitServiceManager.getTokenData(username, key); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - loginListener.onFailure(e); - } - } - - @Override - public void onNext(LoginResultBean resultBean) { - if (resultBean != null) { - loginListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java new file mode 100644 index 0000000..44a5fc7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/LoginInModelImpl.java @@ -0,0 +1,54 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.LoginResultBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class LoginInModelImpl implements ILoginInModel { + + private OnLoginListener loginListener; + + public LoginInModelImpl(OnLoginListener listener) { + this.loginListener = listener; + } + + /** + * 数据回调接口 + */ + public interface OnLoginListener { + void onSuccess(LoginResultBean resultBean); + + void onFailure(Throwable throwable); + } + + + @Override + public Subscription sendRetrofitRequest(String username, String key) { + Observable observable = RetrofitServiceManager.getTokenData(username, key); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + loginListener.onFailure(e); + } + } + + @Override + public void onNext(LoginResultBean resultBean) { + if (resultBean != null) { + loginListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java index 0e33db5..18c7d45 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopCaseSubmitModelImpl.java @@ -14,7 +14,7 @@ * @Time: 2021/4/12 14:13 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitModelImpl implements IShopCaseSubmitModel { +public class ShopCaseSubmitModelImpl implements ISubmitShopCaseModel { private OnShopSubmitListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java index 68afc60..f3b810b 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/ShopChangeModelImpl.java @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class ShopChangeModelImpl implements IShopChangeModel { +public class ShopChangeModelImpl implements IChangeShopInfoModel { private OnShopChangeListener listener; diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java index 274bad3..9796aa6 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseSubmitPresenterImpl.java @@ -3,7 +3,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh @@ -12,10 +12,10 @@ **/ public class CaseSubmitPresenterImpl extends BasePresenter implements ICaseSubmitPresenter, CaseSubmitModelImpl.OnSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private CaseSubmitModelImpl actionModel; - public CaseSubmitPresenterImpl(ICaseSubmitCaseView submitCaseView) { + public CaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new CaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java new file mode 100644 index 0000000..48ff162 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IChangeShopInfoPresenter.java @@ -0,0 +1,8 @@ +package com.casic.dcms.mvp.presenter; + +public interface IChangeShopInfoPresenter { + void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, + String images); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java new file mode 100644 index 0000000..ea0d5a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IControlLightPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +import java.util.List; + +public interface IControlLightPresenter { + void onReadyRetrofitRequest(List lampIds, String controlType); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java new file mode 100644 index 0000000..ec615a3 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginInPresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ILoginInPresenter { + void onReadyRetrofitRequest(String username, String password); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java deleted file mode 100644 index 0a49a43..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ILoginPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ILoginPresenter { - void onReadyRetrofitRequest(String username, String password); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java deleted file mode 100644 index 89ebe93..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopCaseSubmitPresenter.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopCaseSubmitPresenter { - void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, - String source, String caseLevel, String areaCode, String streetCode, - String communityCode, String gridId, String description, String fieldintro, - String fileIdVerify, int bzhours, int bzminis, String shopId, - String shopkeeperName, String shopPhone); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java deleted file mode 100644 index e3fea71..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IShopChangePresenter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IShopChangePresenter { - void onReadyRetrofitRequest(String merchantId, String merchantName, String contactName, String contactPhone, - String images); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java new file mode 100644 index 0000000..8934de8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ISubmitShopCasePresenter.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.presenter; + +public interface ISubmitShopCasePresenter { + void onReadyRetrofitRequest(String isNeedVerify, String isNeedRevisit, String longitude, String latitude, + String source, String caseLevel, String areaCode, String streetCode, + String communityCode, String gridId, String description, String fieldintro, + String fileIdVerify, int bzhours, int bzminis, String shopId, + String shopkeeperName, String shopPhone); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java new file mode 100644 index 0000000..db71fee --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightControlPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.LightControlModelImpl; +import com.casic.dcms.mvp.view.ILightControlView; + +import java.util.List; + +public class LightControlPresenterImpl extends BasePresenter implements IControlLightPresenter, LightControlModelImpl.OnControlResultListener { + + private ILightControlView view; + private LightControlModelImpl actionModel; + + public LightControlPresenterImpl(ILightControlView lightControlView) { + this.view = lightControlView; + actionModel = new LightControlModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(List lampIds, String controlType) { + view.showProgress(); + addSubscription(actionModel.sendRetrofitRequest(lampIds, controlType)); + } + + @Override + public void onSuccess(ActionResultBean resultBean) { + view.hideProgress(); + view.obtainControlResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + view.hideProgress(); + view.obtainDataFail(); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java index d03ed90..3b6a5f5 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LightDetailPresenterImpl.java @@ -1,6 +1,5 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.LightDetailModelImpl; import com.casic.dcms.mvp.view.ILightDetailView; @@ -26,8 +25,8 @@ } @Override - public void onSuccess(LightDetailBean resultBean) { - view.obtainLightDetailBeanResult(resultBean); + public void onSuccess(String resultJson) { + view.obtainLightDetailResult(resultJson); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java index 9b2ac8b..f08e650 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/LoginPresenterImpl.java @@ -2,17 +2,17 @@ import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.LoginActionModelImpl; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.model.LoginInModelImpl; +import com.casic.dcms.mvp.view.ILoginInView; -public class LoginPresenterImpl extends BasePresenter implements ILoginPresenter, LoginActionModelImpl.OnLoginListener { +public class LoginPresenterImpl extends BasePresenter implements ILoginInPresenter, LoginInModelImpl.OnLoginListener { - private ILoginView view; - private LoginActionModelImpl actionModel; + private ILoginInView view; + private LoginInModelImpl actionModel; - public LoginPresenterImpl(ILoginView loginView) { - this.view = loginView; - actionModel = new LoginActionModelImpl(this); + public LoginPresenterImpl(ILoginInView loginInView) { + this.view = loginInView; + actionModel = new LoginInModelImpl(this); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java index feee738..d389463 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopCaseSubmitPresenterImpl.java @@ -3,20 +3,20 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopCaseSubmitModelImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; /** * @Author: Pengxh * @Time: 2021/4/12 13:29 * @Email: 290677893@qq.com **/ -public class ShopCaseSubmitPresenterImpl extends BasePresenter implements IShopCaseSubmitPresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { +public class ShopCaseSubmitPresenterImpl extends BasePresenter implements ISubmitShopCasePresenter, ShopCaseSubmitModelImpl.OnShopSubmitListener { - private ICaseSubmitCaseView view; + private ICaseSubmitView view; private ShopCaseSubmitModelImpl actionModel; - public ShopCaseSubmitPresenterImpl(ICaseSubmitCaseView caseTypeView) { - this.view = caseTypeView; + public ShopCaseSubmitPresenterImpl(ICaseSubmitView submitCaseView) { + this.view = submitCaseView; actionModel = new ShopCaseSubmitModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java index a250e77..9849eb9 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ShopChangePresenterImpl.java @@ -3,15 +3,15 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.ShopChangeModelImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; -public class ShopChangePresenterImpl extends BasePresenter implements IShopChangePresenter, ShopChangeModelImpl.OnShopChangeListener { +public class ShopChangePresenterImpl extends BasePresenter implements IChangeShopInfoPresenter, ShopChangeModelImpl.OnShopChangeListener { - private IShopChangeView view; + private IShopInfoChangeView view; private ShopChangeModelImpl actionModel; - public ShopChangePresenterImpl(IShopChangeView shopChangeView) { - this.view = shopChangeView; + public ShopChangePresenterImpl(IShopInfoChangeView changeShopView) { + this.view = changeShopView; actionModel = new ShopChangeModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java index 7722427..5f83c55 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/SubmitMaintainPresenterImpl.java @@ -3,14 +3,14 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.SubmitMaintainModelImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; public class SubmitMaintainPresenterImpl extends BasePresenter implements ISubmitMaintainPresenter, SubmitMaintainModelImpl.OnSubmitListener { - private ISubmitMaintainView view; + private IMaintainSubmitView view; private SubmitMaintainModelImpl actionModel; - public SubmitMaintainPresenterImpl(ISubmitMaintainView submitCaseView) { + public SubmitMaintainPresenterImpl(IMaintainSubmitView submitCaseView) { this.view = submitCaseView; actionModel = new SubmitMaintainModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java deleted file mode 100644 index bcca76a..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitCaseView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ICaseSubmitCaseView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java new file mode 100644 index 0000000..fee4ef2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICaseSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ICaseSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java new file mode 100644 index 0000000..be6a4db --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightControlView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface ILightControlView { + void showProgress(); + + void hideProgress(); + + void obtainControlResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java index 2e1bbb0..7239b5c 100644 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILightDetailView.java @@ -1,7 +1,5 @@ package com.casic.dcms.mvp.view; -import com.casic.dcms.bean.LightDetailBean; - public interface ILightDetailView { - void obtainLightDetailBeanResult(LightDetailBean resultBean); + void obtainLightDetailResult(String resultJson); } diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java new file mode 100644 index 0000000..ef61184 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ILoginInView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.LoginResultBean; + +public interface ILoginInView { + void showProgress(); + + void hideProgress(); + + void obtainLoginResult(LoginResultBean resultBean); + + void loginFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java b/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java deleted file mode 100644 index 7262877..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ILoginView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.LoginResultBean; - -public interface ILoginView { - void showProgress(); - - void hideProgress(); - - void obtainLoginResult(LoginResultBean resultBean); - - void loginFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java new file mode 100644 index 0000000..191c0d2 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IMaintainSubmitView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IMaintainSubmitView { + void showProgress(); + + void hideProgress(); + + void obtainSubmitResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java deleted file mode 100644 index ac48457..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IShopChangeView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface IShopChangeView { - void showProgress(); - - void hideProgress(); - - void obtainChangeResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java new file mode 100644 index 0000000..8e30200 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IShopInfoChangeView.java @@ -0,0 +1,13 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.ActionResultBean; + +public interface IShopInfoChangeView { + void showProgress(); + + void hideProgress(); + + void obtainChangeResult(ActionResultBean resultBean); + + void obtainDataFail(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java b/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java deleted file mode 100644 index 75a0629..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ISubmitMaintainView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.ActionResultBean; - -public interface ISubmitMaintainView { - void showProgress(); - - void hideProgress(); - - void obtainSubmitResult(ActionResultBean resultBean); - - void obtainDataFail(); -} diff --git a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java index 84b0eef..e596a36 100644 --- a/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/BridgeMaintainActivity.java @@ -16,7 +16,7 @@ import com.casic.dcms.base.BaseActivity; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.SubmitMaintainPresenterImpl; -import com.casic.dcms.mvp.view.ISubmitMaintainView; +import com.casic.dcms.mvp.view.IMaintainSubmitView; import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -36,7 +36,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, ISubmitMaintainView { +public class BridgeMaintainActivity extends BaseActivity implements View.OnClickListener, IMaintainSubmitView { private static final String TAG = "BridgeMaintainActivity"; private Context context = this; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 3e42c8a..2975f92 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -39,7 +39,7 @@ import com.casic.dcms.mvp.presenter.UploadVideoPresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.AudioRecodeHelper; import com.casic.dcms.utils.Constant; @@ -76,7 +76,7 @@ import cn.jzvd.JzvdStd; public class CaseUploadActivity extends BaseCaseActivity implements View.OnClickListener, View.OnTouchListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { @BindView(R.id.caseLayout) LinearLayout caseLayout; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 88a41e6..3e16a69 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopCaseSubmitPresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, - IUploadFileView, ICaseSubmitCaseView { + IUploadFileView, ICaseSubmitView { private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index ee3d7bf..c247950 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -26,7 +26,7 @@ import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; import com.casic.dcms.mvp.view.ICaseLargeClassView; import com.casic.dcms.mvp.view.ICaseSmallClassView; -import com.casic.dcms.mvp.view.ICaseSubmitCaseView; +import com.casic.dcms.mvp.view.ICaseSubmitView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -53,7 +53,7 @@ import butterknife.OnClick; public class CaseUploadQuicklyActivity extends BaseCaseActivity implements View.OnClickListener, - ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitCaseView, IUploadFileView { + ICaseLargeClassView, ICaseSmallClassView, ICaseSubmitView, IUploadFileView { private Context context = this; @BindView(R.id.caseClassView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index e99d075..6f18c57 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -20,7 +20,7 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.mvp.presenter.ShopChangePresenterImpl; import com.casic.dcms.mvp.presenter.UploadImagePresenterImpl; -import com.casic.dcms.mvp.view.IShopChangeView; +import com.casic.dcms.mvp.view.IShopInfoChangeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.FileUtils; @@ -46,7 +46,7 @@ import butterknife.OnClick; public class ChangeShopInfoActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, - IShopChangeView { + IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; private Context context = ChangeShopInfoActivity.this; diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 69a8dcb..f5c5748 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -18,7 +18,7 @@ import com.casic.dcms.mvp.presenter.AuthenticatePresenterImpl; import com.casic.dcms.mvp.presenter.LoginPresenterImpl; import com.casic.dcms.mvp.view.IAuthenticateView; -import com.casic.dcms.mvp.view.ILoginView; +import com.casic.dcms.mvp.view.ILoginInView; import com.casic.dcms.utils.AuthenticationHelper; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.OtherUtils; @@ -38,7 +38,7 @@ import butterknife.BindView; import butterknife.OnClick; -public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginView { +public class LoginActivity extends BaseActivity implements View.OnClickListener, IAuthenticateView, ILoginInView { private static final String TAG = "LoginActivity"; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java index 9f91f43..b1f2ebb 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnListFragment.java @@ -13,10 +13,14 @@ import com.casic.dcms.R; import com.casic.dcms.adapter.LightResultAdapter; import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.LightListBean; +import com.casic.dcms.mvp.presenter.LightControlPresenterImpl; import com.casic.dcms.mvp.presenter.LightListPresenterImpl; +import com.casic.dcms.mvp.view.ILightControlView; import com.casic.dcms.mvp.view.ILightListView; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.widgets.LightDetailDialog; import com.qmuiteam.qmui.widget.QMUIEmptyView; @@ -31,7 +35,7 @@ import butterknife.BindView; -public class LightOnListFragment extends BaseFragment implements ILightListView { +public class LightOnListFragment extends BaseFragment implements ILightListView, ILightControlView { @BindView(R.id.emptyView) QMUIEmptyView emptyView; @@ -48,6 +52,9 @@ private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; + private LightControlPresenterImpl controlPresenter; + private long lampId; + private int adapterPosition; @Override protected int initLayoutView() { @@ -65,6 +72,8 @@ lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); + + controlPresenter = new LightControlPresenterImpl(this); } @Override @@ -75,7 +84,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - lightListPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -123,7 +132,7 @@ LightOnListFragment fragment = reference.get(); if (msg.what == 20210623) { if (fragment.isRefresh || fragment.isLoadMore) { - fragment.adapter.notifyDataSetChanged(); + fragment.adapter.notifyItemRangeInserted(fragment.adapter.getItemCount(), Constant.PAGE_LIMIT); } else { //首次加载数据 if (fragment.dataBeans.size() == 0) { @@ -149,23 +158,68 @@ } }); fragment.adapter.setOnSwitchClickListener(new LightResultAdapter.OnSwitchClickListener() { + @Override public void onClick(int position) { - String statusName = fragment.dataBeans.get(position).getStatusName(); - Log.d(TAG, "onClick: " + statusName); + LightListBean.DataBean.RowsBean rowsBean = fragment.dataBeans.get(position); + fragment.lampId = Long.parseLong(rowsBean.getLampId()); + fragment.adapterPosition = position; + + List lampIds = new ArrayList<>(); + lampIds.add(fragment.lampId); + + String statusName = rowsBean.getStatusName(); + String controlType; + if (statusName.equals("离线")) { + controlType = "1"; + } else { + controlType = "0"; + } + fragment.controlPresenter.onReadyRetrofitRequest(lampIds, controlType); } }); } } + } else if (msg.what == 20210624) { + fragment.isRefresh = true; + fragment.pageIndex = 1; + fragment.lightListPresenter.onReadyRetrofitRequest(2 * Constant.PAGE_LIMIT, fragment.pageIndex); } } } @Override + public void showProgress() { + OtherUtils.showLoadingDialog(context, "处理中，请稍后..."); + } + + @Override + public void hideProgress() { + OtherUtils.dismissLoadingDialog(); + } + + @Override + public void obtainControlResult(ActionResultBean resultBean) { + if (resultBean.isSuccess()) { + //开灯指令发下去之后，虽然返回成功，但仅仅表示app发送指令到后台成功，但是开没开灯无法确定，所以，只能延迟几秒再刷新列表 + Log.d(TAG, "APP发送指令到后台成功，3s后即将刷新列表"); + weakReferenceHandler.sendEmptyMessageDelayed(20210624, 3000); + } + } + + @Override + public void obtainDataFail() { + ToastHelper.showToast("操作失败", ToastHelper.ERROR); + } + + @Override public void onDestroyView() { super.onDestroyView(); if (lightListPresenter != null) { lightListPresenter.disposeRetrofitRequest(); } + if (controlPresenter != null) { + controlPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index c083000..beb5345 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -20,7 +20,6 @@ import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; import com.casic.dcms.bean.HomePageBean; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.bean.LightListBean; import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.bean.MaintainContentBean; @@ -35,7 +34,10 @@ import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.bean.UserBean; +import java.util.List; + import okhttp3.MultipartBody; +import okhttp3.ResponseBody; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; @@ -675,6 +677,17 @@ * http://111.198.10.15:11409/lightCr/overview/lampDetail?lampId=1354712301527764999 */ @GET("/lightCr/overview/lampDetail") - Observable obtainLightDetail(@Header("token") String token, - @Query("lampId") String lampId); + Observable obtainLightDetail(@Header("token") String token, + @Query("lampId") String lampId); + + /** + * 路灯列表数据 + *

+ * http://111.198.10.15:11409/lightCr/overview/lampControl + */ + @FormUrlEncoded + @POST("/lightCr/overview/lampControl") + Observable controlStreetLight(@Header("token") String token, + @Field("lampIds") List lampIds, + @Field("controlType") String controlType); } diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index fdd3747..f6f33c8 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -22,7 +22,6 @@ import com.casic.dcms.bean.EventSourceBean; import com.casic.dcms.bean.HighEventBean; import com.casic.dcms.bean.HomePageBean; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.bean.LightListBean; import com.casic.dcms.bean.LoginResultBean; import com.casic.dcms.bean.MaintainContentBean; @@ -43,12 +42,14 @@ import org.jetbrains.annotations.NotNull; import java.io.File; +import java.util.List; import java.util.concurrent.TimeUnit; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; import okhttp3.RequestBody; +import okhttp3.ResponseBody; import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory; @@ -691,10 +692,20 @@ /** * 路灯详情数据 + * 因为返回的数据会出现结构不一致的问题，不能用实体类接收改为ResponseBody接收，然后在手动解析 */ - public static Observable getLightDetailResult(String lampId) { + public static Observable getLightDetailResult(String lampId) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); return service.obtainLightDetail(AuthenticationHelper.getToken(), lampId); } + + /** + * 控制路灯开关 + */ + public static Observable getLightControlResult(List lampIds, String controlType) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.controlStreetLight(AuthenticationHelper.getToken(), lampIds, controlType); + } } diff --git a/app/src/main/java/com/casic/dcms/widgets/LightDetailDialog.java b/app/src/main/java/com/casic/dcms/widgets/LightDetailDialog.java index 04af4ec..2bc7fd4 100644 --- a/app/src/main/java/com/casic/dcms/widgets/LightDetailDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/LightDetailDialog.java @@ -7,9 +7,12 @@ import androidx.appcompat.app.AlertDialog; import com.casic.dcms.R; -import com.casic.dcms.bean.LightDetailBean; import com.casic.dcms.mvp.presenter.LightDetailPresenterImpl; import com.casic.dcms.mvp.view.ILightDetailView; +import com.casic.dcms.utils.ToastHelper; + +import org.json.JSONException; +import org.json.JSONObject; public class LightDetailDialog extends AlertDialog implements ILightDetailView { @@ -60,15 +63,24 @@ } @Override - public void obtainLightDetailBeanResult(LightDetailBean resultBean) { - if (resultBean.isSuccess()) { - LightDetailBean.DataBean data = resultBean.getData(); - lightStateView.setText(data.getStatusName()); - lightAddressView.setText(data.getAddress()); - lightStreetView.setText(data.getStreetName()); - lightElecView.setText(String.valueOf(data.getLatestElec())); - lightVolView.setText(String.valueOf(data.getLatestVol())); - lightTimeView.setText(data.getLatestTime()); + public void obtainLightDetailResult(String resultJson) { + try { + JSONObject jsonObject = new JSONObject(resultJson); + int code = jsonObject.getInt("code"); + if (code == 200) { + JSONObject dataObject = jsonObject.getJSONObject("data"); + + lightStateView.setText(dataObject.getString("statusName")); + lightAddressView.setText(dataObject.getString("address")); + lightStreetView.setText(dataObject.getString("streetName")); + lightElecView.setText(String.valueOf(dataObject.getDouble("latestElec"))); + lightVolView.setText(String.valueOf(dataObject.getDouble("latestVol"))); + lightTimeView.setText(dataObject.getString("latestTime")); + } else { + ToastHelper.showToast("操作失败，请重试", ToastHelper.ERROR); + } + } catch (JSONException e) { + e.printStackTrace(); } }